Author: remi
Date: 2009-07-01 17:21:29 +0200 (Wed, 01 Jul 2009)
New Revision: 4988
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window-ie6.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
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/07_web_interfaces/01_resourceWIUser01.py
Log:
* Added gadget name/icon and description in the notification hint.
* Fixed some font names
* Added battery state when dongle not found
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadget-configuration.css
2009-07-01 15:21:29 UTC (rev 4988)
@@ -48,7 +48,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetConfTitleBarBottom1{
@@ -115,7 +115,7 @@
vertical-align:middle;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetConfParamValue{
@@ -130,7 +130,7 @@
color:#000;
text-align:left;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-repeat:repeat;
}
@@ -148,7 +148,7 @@
text-align:left;
vertical-align:middle;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-repeat:repeat;
}
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/gadgets.css
2009-07-01 15:21:29 UTC (rev 4988)
@@ -124,7 +124,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetsBtnTitle{
@@ -145,7 +145,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetsBtnNoTitle{
@@ -272,7 +272,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.gadgetsFilterRadioEnable{
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
2009-07-01 15:21:29 UTC (rev 4988)
@@ -47,6 +47,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget02Name{
@@ -65,6 +66,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget03Name{
@@ -83,6 +85,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget04Name{
@@ -100,6 +103,7 @@
text-decoration:none;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget05Name{
@@ -118,6 +122,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget06Name{
@@ -136,6 +141,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.thumbnailBarGadget07Name{
@@ -154,6 +160,7 @@
text-align:center;
text-decoration:none;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
div.thumbnailBarGadgetDivFift{
@@ -314,6 +321,69 @@
float:left;
}
+div.notifyHintGadgetIcon{
+ top:0px;
+ left:0px;
+ width:30px;
+ height:30px;
+ margin-left:60px;
+ -margin-left:30px;
+ margin-top:8px;
+ display:table;
+ float:left;
+}
+
+.notifyHintGadgetName{
+ top:0px;
+ left:0px;
+ width:320px;
+ height:30px;
+ margin-left:10px;
+ margin-top:8px;
+ display:table;
+ float:left;
+ line-height:30px;
+ font-size:12px;
+ color:#FFFFFF;
+ text-align:left;
+ font-weight:bold;
+ overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
+}
+
+.notifyHintGadgetDescription{
+ top:0px;
+ left:0px;
+ width:360px;
+ height:22px;
+ margin-left:60px;
+ margin-top:0px;
+ _margin-top:5px;
+ display:table;
+ line-height:11px;
+ font-size:10px;
+ color:#FFFFFF;
+ text-align:center;
+ overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
+}
+
+div.notifyHintGadgetMessages{
+ left:0px;
+ top:5px;
+ margin-left:60px;
+ margin-top:5px;
+ width:358px;
+ _width:360px;
+ height:155px;
+ overflow-y:auto;
+ overflow-x:hidden;
+ border: 1px solid #FFF;
+ background-color:#6e6d6d;
+ text-align:left;
+ font-family:Verdana, Bitstream Vera Sans;
+}
+
div.notifyHintAlert{
position:absolute;
top:0px;
@@ -368,6 +438,7 @@
text-align:center;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
img.statusPicRadio{
@@ -457,6 +528,7 @@
text-align:center;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
img.statusBtnSoundOff{
@@ -485,6 +557,7 @@
text-align:center;
font-weight:bold;
overflow:hidden;
+ font-family:Verdana, Bitstream Vera Sans;
}
.leightbox {
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup-ie6.css
2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.popupBtn{
@@ -65,7 +65,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/popup_btn_enable.png);
}
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.css
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.css
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/popup.css
2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
.popupBtn{
@@ -65,7 +65,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/popup_btn_enable.png);
}
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window-ie6.css
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window-ie6.css
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window-ie6.css
2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
iframe.windowContentIFrame{
@@ -81,7 +81,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/window_btn_enable.png);
}
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/window.css
2009-07-01 15:21:29 UTC (rev 4988)
@@ -46,7 +46,7 @@
font-weight:bold;
overflow:hidden;
text-decoration:none;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
}
iframe.windowContentIFrame{
@@ -81,7 +81,7 @@
text-decoration:none;
display:table;
float:left;
- font-family:Verdana, Bitstream Vera Sans, Arial, Helvetica, sans-serif;
+ font-family:Verdana, Bitstream Vera Sans;
background-image:url(/data/web_interface/user_01/img/window_btn_enable.png);
}
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
2009-07-01 15:21:29 UTC (rev 4988)
@@ -17,7 +17,7 @@
<![CDATA[
var knowedDongleState = "off";
var knowedRadioState = "off";
- var knowedBatteryState = "0";
+ var knowedBatteryState = "nodongle";
var knowedSoundState = "off";
var knowedGadget01Name = null;
var knowedGadget01Icon = null;
@@ -31,6 +31,7 @@
var knowedGadget04Name = null;
var knowedGadget04Icon = null;
var knowedGadget04Uuid = null;
+ var knowedGadget04Description = null;
var knowedGadget05Name = null;
var knowedGadget05Icon = null;
var knowedGadget05Uuid = null;
@@ -80,7 +81,8 @@
{
updateCurrentGadget(gadgets.get("gadget_04_uuid"),
gadgets.get("gadget_04_name"),
- gadgets.get("gadget_04_icon"));
+ gadgets.get("gadget_04_icon"),
+ gadgets.get("gadget_04_description"));
updateGadgetThumb01(gadgets.get("gadget_01_uuid"),
gadgets.get("gadget_01_name"),
gadgets.get("gadget_01_icon"));
@@ -216,8 +218,12 @@
function showBatteryState(state)
{
- if (state == 'charge')
+ if (state == 'nodongle')
{
+ document.getElementById("statusPicBattery").src =
"/data/web_interface/user_01/img/status_battery_nodongle.png";
+ }
+ else if (state == 'charge')
+ {
document.getElementById("statusPicBattery").src =
"/data/web_interface/user_01/img/status_battery_oncharge.png";
}
else if (state == 'empty')
@@ -283,13 +289,14 @@
getRequest("/robot_content_interactions/stop_gadget", {});
}
- function updateCurrentGadget(uuid, name, icon)
+ function updateCurrentGadget(uuid, name, icon, description)
{
if ((knowedGadget04Name != name) || (knowedGadget04Uuid !=
uuid))
{
knowedGadget04Name = name;
knowedGadget04Uuid = uuid;
knowedGadget04Icon = icon;
+ knowedGadget04Description = description;
document.getElementById("thumbnailBarGadgetIcon04").src =
icon;
setpng(document.getElementById('thumbnailBarGadgetIcon04'));
document.getElementById('thumbnailBarGadgetIcon04').onclick = function() {
@@ -297,6 +304,10 @@
}
if (name.length > 20) {name = name.slice(0, 18) + "...";}
document.getElementById("thumbnailBarGadgetName04").firstChild.nodeValue = name;
+ document.getElementById("notifyHintGadgetIcon").src = icon;
+ setpng(document.getElementById('notifyHintGadgetIcon'));
+
document.getElementById("notifyHintGadgetName").firstChild.nodeValue = name;
+
document.getElementById("notifyHintGadgetDescription").firstChild.nodeValue =
description;
}
}
@@ -522,6 +533,18 @@
</xsl:element>
<!-- NOTIFIER HINT FRAME -->
<div class="notifyHintFrame">
+ <div class="notifyHintGadgetIcon">
+ <xsl:element name="img">
+ <xsl:attribute
name="id">notifyHintGadgetIcon</xsl:attribute>
+ <xsl:attribute
name="src">/data/web_interface/user_01/img/empty.png</xsl:attribute>
+ <xsl:attribute name="height">30</xsl:attribute>
+ <xsl:attribute name="width">30</xsl:attribute>
+ </xsl:element>
+ </div>
+ <span class="notifyHintGadgetName"
id="notifyHintGadgetName"> . </span>
+ <span class="notifyHintGadgetDescription"
id="notifyHintGadgetDescription"> . </span>
+ <div class="notifyHintGadgetMessages"
id="notifyHintGadgetMessages">
+ </div>
</div>
</div>
<div class="frame01Bottom"></div>
@@ -566,7 +589,7 @@
<xsl:element name="img">
<xsl:attribute
name="class">statusPicBattery</xsl:attribute>
<xsl:attribute name="id">statusPicBattery</xsl:attribute>
- <xsl:attribute
name="src">/data/web_interface/user_01/img/status_battery_empty.gif</xsl:attribute>
+ <xsl:attribute
name="src">/data/web_interface/user_01/img/status_battery_nodongle.png</xsl:attribute>
</xsl:element>
<!-- STATUS BTN SOUND ON -->
<xsl:element name="img">
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-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
2009-07-01 15:21:29 UTC (rev 4988)
@@ -461,6 +461,9 @@
self.__onDemandDictForThumbnailBar["gadget_%.2d_name" % number] =
ugc.getDescription().getName()
self.__onDemandDictForThumbnailBar["gadget_%.2d_uuid" % number] =
ugc.getDescription().getUuid()
self.__onDemandDictForThumbnailBar["gadget_%.2d_icon" % number] =
"/%s/icon.png" % ugc.getParentGadget().getDescription().getUuid()
+ if rel == 0:
+ self.__onDemandDictForThumbnailBar["gadget_%.2d_description" %
number] =
ugc.getParentGadget().getDescription().getDescription(ugc.getContainer().getLanguage())
+
fillByIndex(-3, 1)
fillByIndex(-2, 2)
fillByIndex(-1, 3)
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
===================================================================
---
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
2009-07-01 14:40:03 UTC (rev 4987)
+++
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
2009-07-01 15:21:29 UTC (rev 4988)
@@ -42,7 +42,7 @@
radioState = "off"
state =
eventsHandler.getEventHandler(ST_NAME_BATTERY_LEVEL).getLastState()
if state == None:
- batteryState = "empty"
+ batteryState = "nodongle"
else:
rndVal = int(state[0] / 333) * 333
if rndVal < 4995:
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
