Browse files

Changed: [Confluence] Don't rely on Global search script and only sho…

…w the search button in home if its actually installed and enabled
  • Loading branch information...
1 parent 6f1c7b4 commit 172e5a2acd403a329ab09e45e202a9af8a362b6f @JezzX committed Apr 26, 2012
Showing with 12 additions and 5 deletions.
  1. +4 −1 addons/skin.confluence/720p/Home.xml
  2. +8 −4 addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
View
5 addons/skin.confluence/720p/Home.xml
@@ -275,6 +275,7 @@
<height>35</height>
<colordiffuse>CCFFFFFF</colordiffuse>
<texture flipy="true" border="0,5,0,0" flipx="true">HomeSubEnd.png</texture>
+ <animation effect="slide" start="0,0" end="145,0" time="0" condition="!System.HasAddon(script.globalsearch)">Conditional</animation>
</control>
<control type="radiobutton" id="608">
<colordiffuse>CCFFFFFF</colordiffuse>
@@ -301,6 +302,7 @@
<onright>601</onright>
<onup>9003</onup>
<ondown>9000</ondown>
+ <visible>System.HasAddon(script.globalsearch)</visible>
</control>
<control type="group" id="600">
<posx>180</posx>
@@ -520,7 +522,8 @@
<height>60</height>
<onleft>9000</onleft>
<onright>9000</onright>
- <onup>608</onup>
+ <onup condition="System.HasAddon(script.globalsearch)">608</onup>
+ <onup condition="!System.HasAddon(script.globalsearch)">603</onup>
<ondown>9001</ondown>
<pagecontrol>-</pagecontrol>
<scrolltime>300</scrolltime>
View
12 addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
@@ -2,7 +2,8 @@
<include name="HomeRecentlyAddedInfo">
<control type="group" id="9003">
<onup>20</onup>
- <ondown>608</ondown>
+ <ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+ <ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
<visible>!Window.IsVisible(Favourites)</visible>
<include>VisibleFadeEffect</include>
<animation effect="fade" time="300" delay="1000">WindowOpen</animation>
@@ -38,7 +39,8 @@
<onleft>8000</onleft>
<onright>8000</onright>
<onup>20</onup>
- <ondown>608</ondown>
+ <ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+ <ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
<viewtype label="535">list</viewtype>
<pagecontrol>-</pagecontrol>
<scrolltime>200</scrolltime>
@@ -269,7 +271,8 @@
<onleft>8001</onleft>
<onright>8001</onright>
<onup>20</onup>
- <ondown>608</ondown>
+ <ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+ <ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
<viewtype label="535">list</viewtype>
<pagecontrol>-</pagecontrol>
<scrolltime>200</scrolltime>
@@ -531,7 +534,8 @@
<onleft>8002</onleft>
<onright>8002</onright>
<onup>20</onup>
- <ondown>608</ondown>
+ <ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
+ <ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
<viewtype label="535">list</viewtype>
<pagecontrol>-</pagecontrol>
<scrolltime>200</scrolltime>

0 comments on commit 172e5a2

Please sign in to comment.