[tuxdroid-svn] r5414 - in software_suite_v3/smart-core/smart-server/branches/user_mode: data/web_i
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r5414 - in software_suite_v3/smart-core/smart-server/branches/user_mode: data/web_interface/user_01/img data/web_interface/user_01/xsl resources/03_content_servers
|
From: ks156 <c2m...@c2...> - 2009-09-16 13:28:33
|
Author: ks156
Date: 2009-09-16 15:28:19 +0200 (Wed, 16 Sep 2009)
New Revision: 5414
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_2.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_3.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_3.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_4.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_activate.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_disable.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_enable.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py
Log:
* Merged rev 5393 to 5413 from trunk into user_mode
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_2.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_3.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_3.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_4.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_activate.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_disable.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_enable.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-16 13:23:57 UTC (rev 5413)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-16 13:28:19 UTC (rev 5414)
@@ -167,14 +167,14 @@
htmlContent += '<div class="attitunesRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
htmlContent += '<span class="attitunesRowName">' + name + '</span>';
- htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
+ htmlContent += '<div class="attitunesVSpacer" style="width:26px;"></div>';
htmlContent += '<a class="attitunesBtnTitle attitunesBtnStartEnable" id="startId_' + name + '" onclick="javascript:startAttitune(\''+name+'\');return false;" href="#">' + translationStart + '</a>';
htmlContent += '<div class="attitunesVSpacer" style="width:8px;"></div>';
htmlContent += '<a class="attitunesBtnTitle attitunesBtnStopEnable" id="stopId_' + name + '" onclick="javascript:stopAttitune(\''+name+'\');return false;" href="#">' + translationStop + '</a>';
htmlContent += '<div class="attitunesVSpacer" style="width:18px;"></div>';
htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnEdit" id="editId_' + name + '" onclick="javascript:setLastAttituneInAction(\''+name+'\');editAttitune();return false;" href="#"></a>';
htmlContent += '<div class="attitunesVSpacer" style="width:18px;"></div>';
- htmlContent += '<a class="attitunesBtnTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete">' + translationDelete + '</a>';
+ htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
htmlContent += '<div class="frame01Sep2"></div>';
return htmlContent;
}
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-16 13:23:57 UTC (rev 5413)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-16 13:28:19 UTC (rev 5414)
@@ -202,7 +202,7 @@
htmlContent += '<div class="gadgetsRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
htmlContent += '<span class="gadgetsRowName">' + name + '</span>';
- htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
+ htmlContent += '<div class="gadgetsVSpacer" style="width:26px;"></div>';
if (ondemand == 'true')
{
htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnStartEnable" id="startId_' + uuid + '" onclick="javascript:startGadget(\''+uuid+'\');return false;" href="#">' + translationStart + '</a>';
@@ -227,7 +227,7 @@
htmlContent += '<div class="gadgetsVSpacer" style="width:8px;"></div>';
htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDuplicate" id="duplicateId_' + uuid + '" onclick="javascript:setLastGadgetInAction(\''+uuid+'\');duplicateUgc();return false;" href="#"></a>';
htmlContent += '<div class="gadgetsVSpacer" style="width:18px;"></div>';
- htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete">' + translationDelete + '</a>';
+ htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
htmlContent += '<div class="frame01Sep2"></div>';
return htmlContent;
}
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py 2009-09-16 13:23:57 UTC (rev 5413)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py 2009-09-16 13:28:19 UTC (rev 5414)
@@ -148,6 +148,7 @@
self.__ugcContainer, self.__ugcContainer.getLanguage(),
resourcesManager)
self.insertTemporaryServedUgcInContainer(ugcUrl)
+ time.sleep(0.015)
def removeGadgetsWithoutChildren(self):
"""Remove the gadgets without UGC children.
|
