Updated: [Confluence] the rest of the side bars to the new designs

1 files changed, 42 insertions, 55 deletions

diff --git a/addons/skin.confluence/720p/MyPrograms.xml b/addons/skin.confluence/720p/MyPrograms.xml
index b920b92d5b..7fc5b50c35 100644
--- a/addons/skin.confluence/720p/MyPrograms.xml
+++ b/addons/skin.confluence/720p/MyPrograms.xml
@@ -84,82 +84,69 @@
 		<include>BehindDialogFadeOut</include>
 		<include>ScrollOffsetLabel</include>
 		<control type="group">
-			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">Conditional</animation>
-			<animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | Control.HasFocus(8999)">WindowClose</animation>
-			<control type="button" id="8999">
-				<description>Fake button for mouse control</description>
-				<posx>-250</posx>
-				<posy>0</posy>
-				<width>265</width>
-				<height>720</height>
-				<label>-</label>
-				<font>-</font>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
-				<visible>true</visible>
-			</control>
+			<posx>-250</posx>
 			<include>SideBladeLeft</include>
-			<control type="image">
-				<description>LOGO</description>
-				<posx>-230</posx>
-				<posy>50</posy>
-				<width>220</width>
-				<height>80</height>
-				<aspectratio>keep</aspectratio>
-				<texture>Confluence_Logo.png</texture>
-			</control>
-			<control type="group" id="9000">
-				<posx>-250</posx>
-				<posy>130</posy>
-				<include>CommonNowPlaying</include>
+			<control type="grouplist" id="9000">
+				<posx>0</posx>
+				<posy>110</posy>
+				<width>250</width>
+				<height>550</height>
+				<onleft>9000</onleft>
+				<onright>50</onright>
+				<onup>9000</onup>
+				<ondown>9000</ondown>
+				<itemgap>0</itemgap>
+				<control type="label" id="200">
+					<width>250</width>
+					<height>45</height>
+					<font>font12caps</font>
+					<label>View Options</label>
+					<textcolor>blue</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+				</control>
 				<control type="button" id="2">
 					<description>View As button</description>
-					<posx>0</posx>
-					<posy>0</posy>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
 					<label>-</label>
-					<onleft>50</onleft>
-					<onright>50</onright>
-					<onup>611</onup>
-					<ondown>3</ondown>
 				</control>
 				<control type="button" id="3">
 					<description>Sort by button</description>
-					<posx>0</posx>
-					<posy>40</posy>
 					<include>ButtonCommonValues</include>
 					<label>103</label>
-					<onleft>50</onleft>
-					<onright>4</onright>
-					<onup>2</onup>
-					<ondown>610</ondown>
 				</control>
 				<control type="togglebutton" id="4">
 					<description>Sort asc</description>
-					<posx>220</posx>
-					<posy>53</posy>
-					<label>-</label>
-					<onleft>3</onleft>
-					<onright>50</onright>
-					<onup>2</onup>
-					<ondown>610</ondown>
+					<include>ButtonCommonValues</include>
+					<alttexturefocus border="5">button-focus.png</alttexturefocus>
+					<alttexturenofocus>-</alttexturenofocus>
+					<label>31051</label>
+					<altlabel>31050</altlabel>
+					<usealtlabel>Container.SortDirection(Ascending)</usealtlabel>
+				</control>
+				<control type="label" id="201">
+					<width>250</width>
+					<height>45</height>
+					<font>font12caps</font>
+					<label>31026</label>
+					<textcolor>blue</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+				</control>
+				<control type="radiobutton" id="19">
+					<description>Filter</description>
+					<textwidth>170</textwidth>
+					<include>ButtonCommonValues</include>
+					<label>587</label>
 				</control>
 				<control type="button" id="610">
 					<description>Fake Button to fix Player Controls Navigation</description>
-					<onup>3</onup>
-					<ondown>603</ondown>
 					<visible>false</visible>
 				</control>
-				<control type="group">
-					<posx>0</posx>
-					<posy>260</posy>
-					<include>CommonNowPlaying_Controls</include>
-				</control>
+				<include>CommonNowPlaying_Controls</include>
 				<control type="button" id="611">
 					<description>Fake Button to fix Player Controls Navigation</description>
-					<onup>608</onup>
-					<ondown>2</ondown>
 					<visible>false</visible>
 				</control>
 			</control>