[tuxdroid-svn] r5123 - in software_suite_v3/smart-core/smart-server/trunk: data/web_interface/user_01/xsl translation/wi_user

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-17 11:54:43 +0200 (Fri, 17 Jul 2009)
New Revision: 5123

Modified:
   software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
   software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
   software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
   software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po
   software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
Log:
* Updated "On demand" labels to "Favorites"
* Fixed filters order in the "gadgets" page. The first filter is now "Favorites".

Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl	2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl	2009-07-17 09:54:43 UTC (rev 5123)
@@ -113,7 +113,7 @@
             <xsl:when test="root/data/description/onDemandIsAble = 'true'">
                 <!-- BAR -->
                 <div class="gadgetConfTitleBarOnDemand">
-                    <span class="gadgetConfTitleBarLabel"><xsl:value-of select="root/translations/on_demand"/></span>
+                    <span class="gadgetConfTitleBarLabel"><xsl:value-of select="root/translations/on_demand_config_section"/></span>
                 </div>
                 <div class="gadgetConfTitleBarBottom2"></div>
                 <!-- Content -->

Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl	2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl	2009-07-17 09:54:43 UTC (rev 5123)
@@ -36,7 +36,7 @@
         <script type="text/javascript" src="/data/web_interface/user_01/js/lightbox.js"></script>
         <script language="javascript">
         <![CDATA[
-            var knowedGadgetsFilter = "all_gadgets";
+            var knowedGadgetsFilter = "on_demand";
             var knowedGadgetsDict = null;
             var knowedPlayingGadgetUuid1 = "0";
             var knowedPlayingGadgetUuid2 = "0";
@@ -52,7 +52,7 @@
                 translationStart = document.getElementById("translationStart").value;
                 translationStop = document.getElementById("translationStop").value;
                 translationDelete = document.getElementById("translationDelete").value;
-                fillGadgetRows("all_gadgets");
+                fillGadgetRows("on_demand");
                 updatePlayingGadgetUuid();
             }
 
@@ -533,6 +533,13 @@
             <div class="frame01TopSpace">
                 <div class="gadgetsVSpacer" style="width:35px;height:40px;"></div>
                 <xsl:element name="a">
+                    <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioEnable</xsl:attribute>
+                    <xsl:attribute name="id">gadgetsFilterRadioOnDemand</xsl:attribute>
+                    <xsl:attribute name="onclick">javascript:fillGadgetRows('on_demand');return false;</xsl:attribute>
+                    <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/on_demand"/>
+                </xsl:element>
+                <div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
+                <xsl:element name="a">
                     <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioActivate</xsl:attribute>
                     <xsl:attribute name="id">gadgetsFilterRadioAll</xsl:attribute>
                     <xsl:attribute name="onclick">javascript:fillGadgetRows('all_gadgets'); return false;</xsl:attribute>
@@ -541,13 +548,6 @@
                 <div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioEnable</xsl:attribute>
-                    <xsl:attribute name="id">gadgetsFilterRadioOnDemand</xsl:attribute>
-                    <xsl:attribute name="onclick">javascript:fillGadgetRows('on_demand');return false;</xsl:attribute>
-                    <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/on_demand"/>
-                </xsl:element>
-                <div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
-                <xsl:element name="a">
-                    <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioEnable</xsl:attribute>
                     <xsl:attribute name="id">gadgetsFilterRadioAlerts</xsl:attribute>
                     <xsl:attribute name="onclick">javascript:fillGadgetRows('alerts');return false;</xsl:attribute>
                     <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/alerts"/>

Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot	2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot	2009-07-17 09:54:43 UTC (rev 5123)
@@ -73,6 +73,9 @@
 msgid "my_use_of_the_gadget"
 msgstr ""
 
+msgid "on_demand_config_section"
+msgstr ""
+
 msgid "on_demand_description"
 msgstr ""
 

Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po	2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po	2009-07-17 09:54:43 UTC (rev 5123)
@@ -32,7 +32,7 @@
 msgstr "All"
 
 msgid "on_demand"
-msgstr "On demand"
+msgstr "Favorites"
 
 msgid "alerts"
 msgstr "Alerts"
@@ -73,8 +73,11 @@
 msgid "my_use_of_the_gadget"
 msgstr "My use of the gadget"
 
+msgid "on_demand_config_section"
+msgstr "Favorite"
+
 msgid "on_demand_description"
-msgstr "This gadget will be accessible with the remote control."
+msgstr "This gadget will be placed in the Favorites list."
 
 msgid "date"
 msgstr "Date"

Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po	2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po	2009-07-17 09:54:43 UTC (rev 5123)
@@ -32,7 +32,7 @@
 msgstr "Tous"
 
 msgid "on_demand"
-msgstr "A la demande"
+msgstr "Favoris"
 
 msgid "alerts"
 msgstr "Alertes"
@@ -73,8 +73,11 @@
 msgid "my_use_of_the_gadget"
 msgstr "Mon utilisation du gadget"
 
+msgid "on_demand_config_section"
+msgstr "Favori"
+
 msgid "on_demand_description"
-msgstr "Ce gadget sera accessible avec la télécommande."
+msgstr "Ce gadget sera placé dans la liste des favoris."
 
 msgid "date"
 msgstr "Date"