projects / vuplus_dvbapp-plugin / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b6d7092)
moved Version-Tag out of pagetitle into About
authorRico Schulte <ricoschulte@users.schwerkraft.elitedvb.net>
Sun, 27 May 2007 14:56:59 +0000 (14:56 +0000)
committerRico Schulte <ricoschulte@users.schwerkraft.elitedvb.net>
Sun, 27 May 2007 14:56:59 +0000 (14:56 +0000)
now configurable via config

webinterface/src/WebComponents/Sources/About.py patch | blob | history
webinterface/src/plugin.py patch | blob | history
webinterface/src/web-data/index.html patch | blob | history
webinterface/src/web/about.xml patch | blob | history

diff --git a/webinterface/src/WebComponents/Sources/About.py b/webinterface/src/WebComponents/Sources/About.py
index 6d134de..290bf26 100644 (file)
--- a/webinterface/src/WebComponents/Sources/About.py
+++ b/webinterface/src/WebComponents/Sources/About.py
@@ -110,10 +110,14 @@ class About( Source):
             list.append("N/A")
             list.append("N/A")
             
+        ## webifversion
+        list.append(config.plugins.Webinterface.version.value)
+        
         #please remove unneeded debugoutpu while commiting #print list
         
         listR = []
         listR.append(list)
+        
         return listR
 
     text = property(command)        
@@ -140,5 +144,6 @@ class About( Source):
            ,"tsID": 13
            ,"onID": 14
            ,"sid": 15
+           ,"WebIfVersion": 16
            }
 
diff --git a/webinterface/src/plugin.py b/webinterface/src/plugin.py
index 6b0b9d8..19de484 100644 (file)
--- a/webinterface/src/plugin.py
+++ b/webinterface/src/plugin.py
@@ -1,5 +1,5 @@
 Version = '$Header$';
-
+__version__ = "Beta 0.5"
 from Plugins.Plugin import PluginDescriptor
 
 from twisted.internet import reactor, defer
@@ -19,7 +19,7 @@ import webif
 import WebIfConfig  
 import os
 
-from Components.config import config, ConfigSubsection, ConfigInteger,ConfigYesNo
+from Components.config import config, ConfigSubsection, ConfigInteger,ConfigYesNo,ConfigText
 
 config.plugins.Webinterface = ConfigSubsection()
 config.plugins.Webinterface.enable = ConfigYesNo(default = True)
@@ -27,7 +27,8 @@ config.plugins.Webinterface.port = ConfigInteger(80,limits = (1, 65536))
 config.plugins.Webinterface.includehdd = ConfigYesNo(default = False)
 config.plugins.Webinterface.useauth = ConfigYesNo(default = False) # False, because a std. images hasnt a rootpasswd set and so no login. and a login with a empty pwd makes no sense
 config.plugins.Webinterface.debug = ConfigYesNo(default = False) # False by default, not confgurable in GUI. Edit settingsfile directly if needed
-
+config.plugins.Webinterface.version = ConfigText(__version__) # used to make the versioninfo accessible enigma2-wide, not confgurable in GUI. 
+ 
 sessions = [ ]
 
 """
diff --git a/webinterface/src/web-data/index.html b/webinterface/src/web-data/index.html
index 4ec8cd4..78f520f 100644 (file)
--- a/webinterface/src/web-data/index.html
+++ b/webinterface/src/web-data/index.html
@@ -1,164 +1,164 @@
-<html>
-<head>
-<!-- 
-       Version = '$Header$';
--->
-       <meta content="text/html; charset=UTF-8" http-equiv="content-type"></meta>
-       <title>Enigma 2 Webinterface (Beta 0.5)</title>
-       
-       <!-- load everything for prototype and prototype window //-->
-       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/prototype.js" ></script>
-       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/effects.js" ></script>
-       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/window.js" ></script>
-       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/debug.js"> </script>
-
-       <script type="text/javascript" src="/webdata/lib/rico.js"></script>
-
-       <link href="/webdata/lib/ptwindow/themes/default.css" rel="stylesheet" type="text/css" ></link>
-       <link href="/webdata/lib/ptwindow/themes/alphacube.css" rel="stylesheet" type="text/css" ></link>
-       
-       <!-- link href="/webdata/lib/ptwindow/themes/debug.css" rel="stylesheet" type="text/css" ></link -->
-       
-       <!-- our stuff //-->
-       <script type="text/javascript" src="/webdata/templates.js" ></script>
-       <script type="text/javascript" src="/webdata/objects.js" ></script>
-       <script type="text/javascript" src="/webdata/config.js" ></script>
-       <script type="text/javascript" src="/webdata/tools.js" ></script>
-       <script type="text/javascript" src="/webdata/timer.js" ></script>
-       
-       <link href="/webdata/style.css" type="text/css" rel="stylesheet" ></link>
-       <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico"></link>
-
-       <!-- Live RSS Feeds //-->
-       <link rel="alternate" type="application/rss+xml" title="Movie List" href="/web/movielist.rss" ></link>
-</head>
-
-<body>
-<div id="Main">
-       <div id="nav">  
-               <div id="NavHd"><span id="RequestIndicator" style="display:none;"><img alt="R" src="/webdata/gfx/progress.gif" />loading... </span></div>
-               
-               <div id="navTable">
-                       <div class="NavEl">
-                               <!-- START BODY MENUE //-->
-                               <div id="accordionMenue">
-                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelTV">
-                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderTV">TV</div>
-                                               <div class="navMenuContent" id="accordionMenueBouquetContentTV">please wait, loading...</div>
-                                       </div>
-                                       
-                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelRadio">
-                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderRadio">Radio</div>
-                                               <div class="navMenuContent" id="accordionMenueBouquetContentRadio">please wait, loading...</div>
-                                       </div>
-                                       
-                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelProviderTV">
-                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderProviderTV">Provider TV</div>
-                                               <div class="navMenuContent" id="accordionMenueBouquetContentProviderTV">please wait, loading...</div>
-                                       </div>
-                                       
-                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelProviderRadio">
-                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderProviderRadio">Provider Radio</div>
-                                               <div class="navMenuContent" id="accordionMenueBouquetContentProviderRadio">please wait, loading...</div>
-                                       </div>
-                                       
-                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelMovieTimer">
-                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderMovieTimer">Movie/Timer</div>
-                                               <div class="navMenuContent" id="accordionMenueBouquetContentMovieTimer">
-                                                       <div onclick="loadMovieList()">Movies</div>
-                                                       <div onclick="loadTimerList()">Timers</div>
-                                                       <div onclick="loadTimerFormNow()">Add Timer</div>
-                                               </div>
-                                       </div>
-                                               
-                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelExtras">
-                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderExtras">Extras</div>
-                                               <div class="navMenuContent" id="accordionMenueBouquetContentExtras">
-                                                       <div onclick="showMessageSendForm()">Message</div>
-                                                       <div onclick="showRemoteControllSendForm()">Remote Control</div>
-                                                       <div onclick="showPowerStateSendForm()">Power</div>
-                                                       <div onclick="showAbout()">About</div>
-                                               </div>
-                                       </div>          
-                               </div>
-                       </div>
-               </div>
-       </div>
-       
-       <div id="Content">
-               <div id="EventNowNext" class="bgMain">
-
-                   <div id="ServiceInfo">
-                               <div id="CurrentService"></div>
-                               <div id="VolumePanel"></div>
-                               <div id="RecordButton"><img alt="Record" src="/webdata/gfx/record.gif" onclick="recordingPushed();" /></div>
-                       <div id="SignalPanel"></div>
-                               <div id="CurrentTime" onclick="openHiddenFunctions();"></div>
-                       </div>
-                   
-                   <div class="divblock">
-                               <div style="width:5%; float:left;" onclick="showhide('Event_Now_Extended_Description')" class="event" id="Event_Now_Begin"></div>
-                               <div style="width:65%; float:left;" onclick="showhide('Event_Now_Extended_Description')" class="event" id="Event_Now_Name"></div>
-                               <div style="width:30%; float:left;" onclick="showhide('Event_Now_Extended_Description')" class="eventRA" id="Event_Now_Remaining"></div>
-                   </div>
-           
-                   <div class="divblock">
-                               <div class="eventExtDesc" id="Event_Now_Extended_Description"></div>
-                   </div>
-                   
-                   <div class="divblock" onclick="showhide('Event_Next_Extended_Description');">
-                               <div style="width:5%; float:left;" class="event" id="Event_Next_Begin"></div>
-                               <div style="width:65%; float:left;" class="event" id="Event_Next_Name"></div>
-                               <div style="width:30%; float:left;" class="eventRA" id="Event_Next_Remaining"></div>
-                   </div>
-                   
-                   <div class="divblock">
-                               <div class="eventExtDesc" id="Event_Next_Extended_Description"></div>
-                   </div>
-               </div>
-               <hr />
-               
-               <div id="BodyContentChannellist" class="BodyContentChannellist"></div>
-
-       </div>
-       <div></div>
-</div>
-<div>
-<!-- START LIVEUPDATESTREAM  is used to enable the liveupdatestream in MS Internet Explorer //-->
-<div id="UpdateStreamReaderIEFixPanel"></div>
-<!-- END LIVEUPDATESTREAM//-->
-
-<div id="ServiceListBouqetReference"  style="display:none;" ></div>
-</div>
-<script type="text/javascript" >
-
-var debugWin = null;
-if(DBG) { debugWin = openWindow("DEBUG", "", 300, 300, "debugWindow"); }
-
-
-var accordionOptions = {
-       expandedBg : 'transparent',
-       hoverBg : 'CCCCCC',
-       collapsedBg : 'transparent',
-       expandedTextColor : '#000000',
-       expandedFontWeight : 'bold',
-       hoverTextColor : '#000000',
-       collapsedTextColor : '#000000',
-       collapsedFontWeight : 'normal',
-       borderColor : '#EEEEEE',
-       border : '0',
-       panelHeight : 150
-}
-
-new Rico.Accordion( $('accordionMenue'), accordionOptions );
-
-// do things to do at startup
-initVolumePanel();
-initSignalPanel();
-initChannelList();
-//setBodyMainContent('BodyContentChannellist');
-UpdateStreamReaderStart();
-showhide('Event_Next_Extended_Description');
-</script>
-</body>
+<html>\r
+<head>\r
+<!-- \r
+       Version = '$Header$';\r
+-->\r
+       <meta content="text/html; charset=UTF-8" http-equiv="content-type"></meta>\r
+       <title>Enigma 2 Webinterface</title>\r
+       \r
+       <!-- load everything for prototype and prototype window //-->\r
+       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/prototype.js" ></script>\r
+       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/effects.js" ></script>\r
+       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/window.js" ></script>\r
+       <script type="text/javascript" src="/webdata/lib/ptwindow/javascripts/debug.js"> </script>\r
+\r
+       <script type="text/javascript" src="/webdata/lib/rico.js"></script>\r
+\r
+       <link href="/webdata/lib/ptwindow/themes/default.css" rel="stylesheet" type="text/css" ></link>\r
+       <link href="/webdata/lib/ptwindow/themes/alphacube.css" rel="stylesheet" type="text/css" ></link>\r
+       \r
+       <!-- link href="/webdata/lib/ptwindow/themes/debug.css" rel="stylesheet" type="text/css" ></link -->\r
+       \r
+       <!-- our stuff //-->\r
+       <script type="text/javascript" src="/webdata/templates.js" ></script>\r
+       <script type="text/javascript" src="/webdata/objects.js" ></script>\r
+       <script type="text/javascript" src="/webdata/config.js" ></script>\r
+       <script type="text/javascript" src="/webdata/tools.js" ></script>\r
+       <script type="text/javascript" src="/webdata/timer.js" ></script>\r
+       \r
+       <link href="/webdata/style.css" type="text/css" rel="stylesheet" ></link>\r
+       <link rel="shortcut icon" type="image/x-icon" href="/webdata/gfx/favicon.ico"></link>\r
+\r
+       <!-- Live RSS Feeds //-->\r
+       <link rel="alternate" type="application/rss+xml" title="Movie List" href="/web/movielist.rss" ></link>\r
+</head>\r
+\r
+<body>\r
+<div id="Main">\r
+       <div id="nav">  \r
+               <div id="NavHd"><span id="RequestIndicator" style="display:none;"><img alt="R" src="/webdata/gfx/progress.gif" />loading... </span></div>\r
+               \r
+               <div id="navTable">\r
+                       <div class="NavEl">\r
+                               <!-- START BODY MENUE //-->\r
+                               <div id="accordionMenue">\r
+                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelTV">\r
+                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderTV">TV</div>\r
+                                               <div class="navMenuContent" id="accordionMenueBouquetContentTV">please wait, loading...</div>\r
+                                       </div>\r
+                                       \r
+                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelRadio">\r
+                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderRadio">Radio</div>\r
+                                               <div class="navMenuContent" id="accordionMenueBouquetContentRadio">please wait, loading...</div>\r
+                                       </div>\r
+                                       \r
+                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelProviderTV">\r
+                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderProviderTV">Provider TV</div>\r
+                                               <div class="navMenuContent" id="accordionMenueBouquetContentProviderTV">please wait, loading...</div>\r
+                                       </div>\r
+                                       \r
+                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelProviderRadio">\r
+                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderProviderRadio">Provider Radio</div>\r
+                                               <div class="navMenuContent" id="accordionMenueBouquetContentProviderRadio">please wait, loading...</div>\r
+                                       </div>\r
+                                       \r
+                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelMovieTimer">\r
+                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderMovieTimer">Movie/Timer</div>\r
+                                               <div class="navMenuContent" id="accordionMenueBouquetContentMovieTimer">\r
+                                                       <div onclick="loadMovieList()">Movies</div>\r
+                                                       <div onclick="loadTimerList()">Timers</div>\r
+                                                       <div onclick="loadTimerFormNow()">Add Timer</div>\r
+                                               </div>\r
+                                       </div>\r
+                                               \r
+                                       <div class="navMenuPanel" id="accordionMenueBouquetPanelExtras">\r
+                                               <div class="navMenuHeader" id="accordionMenueBouquetHeaderExtras">Extras</div>\r
+                                               <div class="navMenuContent" id="accordionMenueBouquetContentExtras">\r
+                                                       <div onclick="showMessageSendForm()">Message</div>\r
+                                                       <div onclick="showRemoteControllSendForm()">Remote Control</div>\r
+                                                       <div onclick="showPowerStateSendForm()">Power</div>\r
+                                                       <div onclick="showAbout()">About</div>\r
+                                               </div>\r
+                                       </div>          \r
+                               </div>\r
+                       </div>\r
+               </div>\r
+       </div>\r
+       \r
+       <div id="Content">\r
+               <div id="EventNowNext" class="bgMain">\r
+\r
+                   <div id="ServiceInfo">\r
+                               <div id="CurrentService"></div>\r
+                               <div id="VolumePanel"></div>\r
+                               <div id="RecordButton"><img alt="Record" src="/webdata/gfx/record.gif" onclick="recordingPushed();" /></div>\r
+                       <div id="SignalPanel"></div>\r
+                               <div id="CurrentTime" onclick="openHiddenFunctions();"></div>\r
+                       </div>\r
+                   \r
+                   <div class="divblock">\r
+                               <div style="width:5%; float:left;" onclick="showhide('Event_Now_Extended_Description')" class="event" id="Event_Now_Begin"></div>\r
+                               <div style="width:65%; float:left;" onclick="showhide('Event_Now_Extended_Description')" class="event" id="Event_Now_Name"></div>\r
+                               <div style="width:30%; float:left;" onclick="showhide('Event_Now_Extended_Description')" class="eventRA" id="Event_Now_Remaining"></div>\r
+                   </div>\r
+           \r
+                   <div class="divblock">\r
+                               <div class="eventExtDesc" id="Event_Now_Extended_Description"></div>\r
+                   </div>\r
+                   \r
+                   <div class="divblock" onclick="showhide('Event_Next_Extended_Description');">\r
+                               <div style="width:5%; float:left;" class="event" id="Event_Next_Begin"></div>\r
+                               <div style="width:65%; float:left;" class="event" id="Event_Next_Name"></div>\r
+                               <div style="width:30%; float:left;" class="eventRA" id="Event_Next_Remaining"></div>\r
+                   </div>\r
+                   \r
+                   <div class="divblock">\r
+                               <div class="eventExtDesc" id="Event_Next_Extended_Description"></div>\r
+                   </div>\r
+               </div>\r
+               <hr />\r
+               \r
+               <div id="BodyContentChannellist" class="BodyContentChannellist"></div>\r
+\r
+       </div>\r
+       <div></div>\r
+</div>\r
+<div>\r
+<!-- START LIVEUPDATESTREAM  is used to enable the liveupdatestream in MS Internet Explorer //-->\r
+<div id="UpdateStreamReaderIEFixPanel"></div>\r
+<!-- END LIVEUPDATESTREAM//-->\r
+\r
+<div id="ServiceListBouqetReference"  style="display:none;" ></div>\r
+</div>\r
+<script type="text/javascript" >\r
+\r
+var debugWin = null;\r
+if(DBG) { debugWin = openWindow("DEBUG", "", 300, 300, "debugWindow"); }\r
+\r
+\r
+var accordionOptions = {\r
+       expandedBg : 'transparent',\r
+       hoverBg : 'CCCCCC',\r
+       collapsedBg : 'transparent',\r
+       expandedTextColor : '#000000',\r
+       expandedFontWeight : 'bold',\r
+       hoverTextColor : '#000000',\r
+       collapsedTextColor : '#000000',\r
+       collapsedFontWeight : 'normal',\r
+       borderColor : '#EEEEEE',\r
+       border : '0',\r
+       panelHeight : 150\r
+}\r
+\r
+new Rico.Accordion( $('accordionMenue'), accordionOptions );\r
+\r
+// do things to do at startup\r
+initVolumePanel();\r
+initSignalPanel();\r
+initChannelList();\r
+//setBodyMainContent('BodyContentChannellist');\r
+UpdateStreamReaderStart();\r
+showhide('Event_Next_Extended_Description');\r
+</script>\r
+</body>\r
 </html>
\ No newline at end of file
diff --git a/webinterface/src/web/about.xml b/webinterface/src/web/about.xml
index 3f7bc62..fcdad86 100644 (file)
--- a/webinterface/src/web/about.xml
+++ b/webinterface/src/web/about.xml
@@ -10,6 +10,7 @@
                &lt;e2landns><e2:item name="lanDNS"  filter="xml"/>&lt;/e2landns>\r
 -->\r
                &lt;e2fpversion><e2:item name="fpVersion"  filter="xml"/>&lt;/e2fpversion>\r
+               &lt;e2webifversion><e2:item name="WebIfVersion" />&lt;/e2webifversion>\r
                &lt;e2tunerinfo><e2:item name="tunerInfo" />&lt;/e2tunerinfo>\r
                &lt;e2hddinfo><e2:item name="hddInfo"  />&lt;/e2hddinfo>\r
                &lt;e2servicename><e2:item name="serviceName"  filter="xml"/>&lt;/e2servicename>\r
dvbapp plugins repository.