diff options
| author | Jezz <jezzx2@gmail.com> | 2012-05-31 15:08:52 -0700 |
|---|---|---|
| committer | Jezz <jezzx2@gmail.com> | 2012-05-31 15:08:52 -0700 |
| commit | d895a90930a508cd8dab8983aa970e5e8eeed5fe (patch) | |
| tree | ea1dcf46bba91faa90db98ae4e21a5148017e0e4 /addons | |
| parent | 89094082c3d8505f129efe54244aa4a9581d115d (diff) | |
| parent | 1ad8f53b09cae0a7bd4859848f63ebf8f691e96e (diff) | |
Merge pull request #990 from JezzX/Skin.Current_Change
Don't Localize Skin.CurrentTheme and Skin.CurrentColourTheme
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/IncludesBackgroundBuilding.xml | 6 | ||||
| -rw-r--r-- | addons/skin.confluence/backgrounds/SKINDEFAULT.jpg (renamed from addons/skin.confluence/backgrounds/background.jpg) | bin | 125107 -> 125107 bytes |
2 files changed, 1 insertions, 5 deletions
diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index b9a645796c..27873bb6eb 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -1,8 +1,4 @@ <includes> - <variable name="BackgroundImage"> - <value condition="stringcompare(Skin.CurrentTheme,$LOCALIZE[15109])">special://skin/backgrounds/background.jpg</value> - <value condition="!stringcompare(Skin.CurrentTheme,$LOCALIZE[15109])">special://skin/backgrounds/$INFO[Skin.CurrentTheme].jpg</value> - </variable> <include name="CommonBackground"> <control type="Image"> <posx>0</posx> @@ -10,7 +6,7 @@ <width>1280</width> <height>720</height> <aspectratio>scale</aspectratio> - <texture>$VAR[BackgroundImage]</texture> + <texture>$INFO[Skin.CurrentTheme,special://skin/backgrounds/,.jpg]</texture> </control> <control type="image"> <posx>0</posx> diff --git a/addons/skin.confluence/backgrounds/background.jpg b/addons/skin.confluence/backgrounds/SKINDEFAULT.jpg Binary files differindex 3d5b572bd4..3d5b572bd4 100644 --- a/addons/skin.confluence/backgrounds/background.jpg +++ b/addons/skin.confluence/backgrounds/SKINDEFAULT.jpg |
