[tuxdroid-svn] r4681 - in software_suite_v3/smart-core/smart-server/trunk: . data data/web_interfa
Status: Beta
Brought to you by:
ks156
Author: remi
Date: 2009-05-26 19:07:03 +0200 (Tue, 26 May 2009)
New Revision: 4681
Added:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/clients.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/log.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu_resources.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/resource.xsl
Removed:
software_suite_v3/smart-core/smart-server/trunk/data/xsl/
Modified:
software_suite_v3/smart-core/smart-server/trunk/TuxDroidServer.py
software_suite_v3/smart-core/smart-server/trunk/resources/00_smart_server_base/04_resourceMenu.py
Log:
* moved xsl files of the base server menu
Modified: software_suite_v3/smart-core/smart-server/trunk/TuxDroidServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/TuxDroidServer.py 2009-05-26 16:43:41 UTC (rev 4680)
+++ software_suite_v3/smart-core/smart-server/trunk/TuxDroidServer.py 2009-05-26 17:07:03 UTC (rev 4681)
@@ -58,7 +58,7 @@
"""
# Load and start the resources manager
resourcesManager.load(TDS_RESOURCES_PATH)
- resourcesManager.addDirectoryToServe("/data/xsl/")
+ resourcesManager.addDirectoryToServe("/data/web_interface/server_menu/xsl/")
resourcesManager.addFileToServe(os.path.join(TDS_APPLICATION_PATH,
"data", "favicon", "favicon.ico"), "/favicon.ico")
# Load wiky scripts
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/clients.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/clients.xsl (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/clients.xsl 2009-05-26 17:07:03 UTC (rev 4681)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<html xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
+ <body style="font-family:Arial;font-size:12pt;background-color:#FFFFFF">
+ <div style="margin-bottom:1em;margin-top:1em;font-size:14pt;font-weight:bold;background-color:#CCCCCC">
+ <span style="font-weight:bold"><xsl:value-of select="root/title"/></span>
+ </div>
+ <div style="margin-left:10px;margin-bottom:1em;font-size:12pt">
+ <span style="font-weight:bold;font-style:italic">
+ <xsl:value-of select="root/section"/> :
+ </span>
+ </div>
+ <xsl:for-each select="root/clients/*">
+ <div style="margin-left:20px;margin-bottom:1em;margin-top:1em;font-size:12pt;background-color:#FFFFFF">
+ <span style="font-weight:bold;text-decoration:underline">
+ <xsl:value-of select="position()"/>) <xsl:value-of select="name()"/>
+ </span>
+ </div>
+ <div style="margin-left:40px;font-size:10pt;background-color:#FFFFFF">
+ - Communication type : <xsl:value-of select="type"/>
+ </div>
+ <div style="margin-left:40px;font-size:10pt;background-color:#FFFFFF">
+ - Level : <xsl:value-of select="level"/>
+ </div>
+ </xsl:for-each>
+ </body>
+</html>
\ No newline at end of file
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/clients.xsl
___________________________________________________________________
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/log.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/log.xsl (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/log.xsl 2009-05-26 17:07:03 UTC (rev 4681)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<html xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
+ <body style="font-family:Arial;font-size:12pt;background-color:#FFFFFF">
+
+ <xsl:for-each select="root/data">
+
+ <div style="margin-bottom:1em;margin-top:1em;font-size:14pt;font-weight:bold;background-color:#CCCCCC">
+ <span style="font-weight:bold"><xsl:value-of select="log_file_path"/></span>
+ </div>
+
+ <xsl:for-each select="log_text/*">
+ <div style="margin-left:60px;font-size:10pt">
+ <span style="margin-left:3em;"><xsl:value-of select="."/></span>
+ </div>
+ </xsl:for-each>
+
+ </xsl:for-each>
+
+ </body>
+</html>
\ No newline at end of file
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/log.xsl
___________________________________________________________________
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu.xsl (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu.xsl 2009-05-26 17:07:03 UTC (rev 4681)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<html xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
+ <body style="font-family:Arial;font-size:12pt;background-color:#FFFFFF">
+ <div style="margin-bottom:1em;margin-top:1em;font-size:14pt;font-weight:bold;background-color:#CCCCCC">
+ <span style="font-weight:bold"><xsl:value-of select="root/title"/></span>
+ </div>
+ <div style="margin-left:10px;margin-bottom:1em;font-size:12pt">
+ <span style="font-weight:bold;font-style:italic">
+ <xsl:value-of select="root/section"/> :
+ </span>
+ </div>
+ <xsl:for-each select="root/items/*">
+ <div style="margin-left:20px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF">
+ <xsl:value-of select="position()"/>)
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ <xsl:value-of select="name()"/>
+ </xsl:element>
+ </div>
+ </xsl:for-each>
+ </body>
+</html>
\ No newline at end of file
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu.xsl
___________________________________________________________________
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu_resources.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu_resources.xsl (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu_resources.xsl 2009-05-26 17:07:03 UTC (rev 4681)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<html xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
+ <body style="font-family:Arial;font-size:12pt;background-color:#FFFFFF">
+ <div style="margin-bottom:1em;margin-top:1em;font-size:14pt;font-weight:bold;background-color:#CCCCCC">
+ <span style="font-weight:bold"><xsl:value-of select="root/title"/></span>
+ </div>
+ <div style="margin-left:10px;margin-bottom:1em;font-size:12pt">
+ <span style="font-weight:bold;font-style:italic">
+ <xsl:value-of select="root/section"/> :
+ </span>
+ </div>
+ <xsl:for-each select="root/items/*">
+ <xsl:if test="count(*)>0">
+ <div style="margin-left:20px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF;text-decoration:underline">
+ <xsl:value-of select="position()"/>) <xsl:value-of select="name()"/>
+ </div>
+ <xsl:for-each select="*">
+ <div style="margin-left:30px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF">
+ -
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ <xsl:value-of select="name()"/>
+ </xsl:element>
+ </div>
+ </xsl:for-each>
+ </xsl:if>
+ </xsl:for-each>
+ </body>
+</html>
\ No newline at end of file
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/menu_resources.xsl
___________________________________________________________________
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/resource.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/resource.xsl (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/resource.xsl 2009-05-26 17:07:03 UTC (rev 4681)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<html xsl:version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
+ <body style="font-family:Arial;font-size:12pt;background-color:#FFFFFF">
+ <div style="margin-bottom:1em;margin-top:1em;font-size:14pt;font-weight:bold;background-color:#CCCCCC">
+ <span style="font-weight:bold"><xsl:value-of select="root/title"/></span>
+ </div>
+
+ <div style="margin-left:0px;margin-bottom:1em;margin-top:1em;font-size:12pt;background-color:#EEEEEE">
+ <span style="font-weight:bold">
+ <xsl:value-of select="root/section"/>
+ </span>
+ </div>
+
+ <div style="margin-left:20px;margin-bottom:1em;margin-top:1em;font-size:12pt;background-color:#FFFFFF;font-weight:bold">
+ About this resource :
+ </div>
+
+ <div style="margin-left:20px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF">
+ <xsl:value-of select="root/comment"/>
+ </div>
+
+ <xsl:if test="count(root/shared_methods/*)>0">
+ <div style="margin-left:20px;margin-bottom:1em;margin-top:1em;font-size:12pt;background-color:#FFFFFF;font-weight:bold">
+ Provided functionalities :
+ </div>
+ </xsl:if>
+
+ <xsl:for-each select="root/shared_methods/*">
+ <div style="margin-left:30px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF">
+ <span style="font-weight:bold;text-decoration:underline">
+ <xsl:value-of select="position()"/>) <xsl:value-of select="name"/>
+ </span>
+ </div>
+ <xsl:for-each select="doc/*">
+ <xsl:if test="position()=1">
+ <div style="margin-left:40px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF">
+ <xsl:value-of select="."/>
+ </div>
+ </xsl:if>
+ <xsl:if test="position()>1">
+ <div style="margin-left:45px;margin-right:45px;font-size:10pt;background-color:#EEEEEE">
+ <xsl:value-of select="."/>
+ </div>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:for-each>
+
+ <xsl:if test="count(root/services/*)>0">
+ <div style="margin-left:20px;margin-bottom:1em;margin-top:1em;font-size:12pt;background-color:#FFFFFF;font-weight:bold">
+ REST Services List :
+ </div>
+ </xsl:if>
+
+ <xsl:for-each select="root/services/*">
+ <div style="margin-left:30px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF">
+ <span style="font-weight:bold;text-decoration:underline">
+ <xsl:value-of select="position()"/>) <xsl:value-of select="name()"/>
+ </span>
+ </div>
+ <div style="margin-left:40px;margin-bottom:1em;margin-top:1em;font-size:10pt;background-color:#FFFFFF">
+ <xsl:value-of select="comment"/>
+ </div>
+ <div style="margin-left:45px;margin-right:45px;font-size:10pt;background-color:#EEEEEE">
+ - Service access is exclusive : <xsl:value-of select="exclusiveExecution"/>
+ </div>
+ <div style="margin-left:45px;margin-right:45px;font-size:10pt;background-color:#EEEEEE">
+ - Minimal client level to use this service : <xsl:value-of select="minimalUserLevel"/>
+ </div>
+ <div style="margin-left:45px;margin-right:45px;font-size:10pt;background-color:#EEEEEE">
+ - Command prototype :
+ </div>
+ <div style="margin-left:45px;margin-right:45px;margin-top:1em;font-size:10pt;font-style:italic;background-color:#DDDDDD">
+ <xsl:value-of select="commandPrototype"/>
+ </div>
+ </xsl:for-each>
+
+ </body>
+</html>
\ No newline at end of file
Property changes on: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/server_menu/xsl/resource.xsl
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/00_smart_server_base/04_resourceMenu.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/00_smart_server_base/04_resourceMenu.py 2009-05-26 16:43:41 UTC (rev 4680)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/00_smart_server_base/04_resourceMenu.py 2009-05-26 17:07:03 UTC (rev 4681)
@@ -33,7 +33,7 @@
self.name = "index"
self.comment = "Main menu of the server."
self.haveXsl = True
- self.xslPath = "/data/xsl/menu.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/menu.xsl"
def execute(self, id, parameters):
headersStruct = self.getDefaultHeadersStruct()
@@ -71,7 +71,7 @@
self.name = "resources"
self.comment = "Resources menu."
self.haveXsl = True
- self.xslPath = "/data/xsl/menu.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/menu.xsl"
def execute(self, id, parameters):
headersStruct = self.getDefaultHeadersStruct()
@@ -84,7 +84,7 @@
return headersStruct, contentStruct
def __createXmlIndex(self):
- self.xslPath = "/data/xsl/menu_resources.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/menu_resources.xsl"
contentStruct = {
'title' : 'Tux Droid Server V %s' % serverVersion,
'section' : 'Resources',
@@ -105,7 +105,7 @@
return contentStruct
def __createXmlResource(self, resourceName):
- self.xslPath = "/data/xsl/resource.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/resource.xsl"
resource = resourcesManager.getResource(resourceName)
if resource == None:
result = {}
@@ -141,7 +141,7 @@
self.name = "logs"
self.comment = "Logs menu."
self.haveXsl = True
- self.xslPath = "/data/xsl/menu.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/menu.xsl"
if os.name == 'nt':
self.__logPath = os.path.expanduser("~")
else:
@@ -156,7 +156,7 @@
return headersStruct, contentStruct
def __createXmlIndex(self):
- self.xslPath = "/data/xsl/menu.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/menu.xsl"
contentStruct = {
'title' : 'Tux Droid Server V %s' % serverVersion,
'section' : 'Logs',
@@ -172,7 +172,7 @@
return contentStruct
def __createXmlLog(self, logName):
- self.xslPath = "/data/xsl/log.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/log.xsl"
filePath = os.path.join(self.__logPath, "%s.log" % logName)
if not os.path.isfile(filePath):
return {}
@@ -204,7 +204,7 @@
self.name = "clients"
self.comment = "Clients index."
self.haveXsl = True
- self.xslPath = "/data/xsl/clients.xsl"
+ self.xslPath = "/data/web_interface/server_menu/xsl/clients.xsl"
def execute(self, id, parameters):
headersStruct = self.getDefaultHeadersStruct()
|