[tuxdroid-svn] r4936 - in software_suite_v3/smart-core/smart-server/trunk: data/web_interface/user
Status: Beta
Brought to you by:
ks156
|
From: ks156 <c2m...@c2...> - 2009-06-29 13:00:58
|
Author: ks156
Date: 2009-06-29 15:00:39 +0200 (Mon, 29 Jun 2009)
New Revision: 4936
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/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
Log:
* Changed the filter name 'all' by 'all_gadgets'. Linux seems to not love much
the word 'all'. We don't know why.
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-06-29 10:51:21 UTC (rev 4935)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-06-29 13:00:39 UTC (rev 4936)
@@ -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";
+ var knowedGadgetsFilter = "all_gadgets";
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");
+ fillGadgetRows("all_gadgets");
updatePlayingGadgetUuid();
}
@@ -166,7 +166,7 @@
setpng(document.getElementById(iconId));
}
// Show correct filter radio button
- if (filter == 'all')
+ if (filter == 'all_gadgets')
{
document.getElementById("gadgetsFilterRadioAll").className = "gadgetsFilterRadio gadgetsFilterRadioActivate";
document.getElementById("gadgetsFilterRadioOnDemand").className = "gadgetsFilterRadio gadgetsFilterRadioEnable";
@@ -511,7 +511,7 @@
<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');return false;</xsl:attribute>
+ <xsl:attribute name="onclick">javascript:fillGadgetRows('all_gadgets'); return false;</xsl:attribute>
<xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/all"/>
</xsl:element>
<div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-29 10:51:21 UTC (rev 4935)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-06-29 13:00:39 UTC (rev 4936)
@@ -1406,7 +1406,7 @@
filter = parameters['filter']
if filter == 'on_demand':
contentStruct['root']['data'] = resourceRobotContentInteractions.getPguContextsManager().getGadgetsDictOnDemand()
- elif filter == 'all':
+ elif filter == 'all_gadgets':
contentStruct['root']['data'] = resourceRobotContentInteractions.getPguContextsManager().getGadgetsDictAll()
elif filter == 'alerts':
contentStruct['root']['data'] = resourceRobotContentInteractions.getPguContextsManager().getGadgetsDictAlerts()
|