* Improve About

* BodyContentChanelList is now name BodyContent!!!
* Please report if i broke something!

diff --git a/webinterface/src/WebComponents/Sources/About.py b/webinterface/src/WebComponents/Sources/About.py
index 290bf26..ba39764 100644 (file)
--- a/webinterface/src/WebComponents/Sources/About.py
+++ b/webinterface/src/WebComponents/Sources/About.py
@@ -52,18 +52,26 @@ class About( Source):
         #Get Tuner Info
         niminfo = ""
         for nim in nimmanager.nimList():
-            niminfo += "<e2nim>"+nim+"</e2nim>"
+            info = nim.split(":")
+            
+            niminfo += "\n\t\t\t<e2nim>\n"
+            niminfo += "\t\t\t\t<name>%s</name>\n" %(info[0])
+            niminfo += "\t\t\t\t<type>%s</type>\n" %(info[1])
+            niminfo += "\t\t\t</e2nim>"
+            
         list.append(niminfo)
 
         #Get HDD Info
         hdddata = Harddisk(0)
         if hdddata.model() != "":
-            hddinfo = "<model>"+hdddata.model()+"</model>"
-            hddinfo += "<capacity>"+hdddata.capacity()+"</capacity>"
-            hddinfo += "<free>"+str(hdddata.free())+" MB</free>"
+            hddinfo = "\n\t\t\t<model>"+hdddata.model()+"</model>\n"
+            hddinfo += "\t\t\t<capacity>"+hdddata.capacity()+"</capacity>\n"
+            hddinfo += "\t\t\t<free>"+str(hdddata.free())+" MB</free>"
             
         else:            
-            hddinfo = "no harddisc detected"
+            hddinfo = "\n\t\t\t<model>N/A</model>\n"
+            hddinfo += "\t\t\t<capacity>-</capacity>\n"
+            hddinfo += "\t\t\t<free>-</free>"
         list.append(hddinfo)
 
         #Get Service Info

diff --git a/webinterface/src/web-data/index.html b/webinterface/src/web-data/index.html
index d255f11..e5c38d2 100644 (file)
--- a/webinterface/src/web-data/index.html
+++ b/webinterface/src/web-data/index.html
@@ -94,7 +94,7 @@
                                <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"><img src="/webdata/gfx/signal.png" title="show SignalInfoPanel" onclick="openSignalDialog();" title="view Signal Info"></div>
+                       <div id="SignalPanel"><img src="/webdata/gfx/signal.png" alt="SP" onclick="openSignalDialog();" title="view Signal Info"></div>
                                <div id="StreaminterfaceButton"><a href="/webdata/streaminterface.html" target="_blank" ><img alt="Streaminterface" border="0" src="/webdata/gfx/screen.png" /></a></div>
                        <div id="CurrentTime" onclick="openHiddenFunctions();"></div>
                        </div>
@@ -121,7 +121,7 @@
                </div>
                <hr />
                
-               <div id="BodyContentChannellist" class="BodyContentChannellist"></div>
+               <div id="BodyContent" class="BodyContent"></div>
 
        </div>
 

diff --git a/webinterface/src/web-data/style.css b/webinterface/src/web-data/style.css
index 43d2685..d6e4db7 100644 (file)
--- a/webinterface/src/web-data/style.css
+++ b/webinterface/src/web-data/style.css
@@ -27,12 +27,18 @@ Make the ServiceList Table scrollable**************************
 ***************************************************************/
 
 /* define height and width of scrollable area. Add 16px to width for scrollbar          */
+div.BodyContent {
+       border: 1px solid #000;
+       height: 455px;
+       overflow: auto;
+       margin: 0px 9px 0px;
+       font-size: 12px;
+}
+
 div.BodyContentChannellist {
        clear: both;
-       border: 1px solid #000;
        height: 450px;
        overflow: auto;
-       margin: 0px 9px 0px;
 /*     width: 780px; */
 }
 
@@ -50,6 +56,7 @@ html>body div.BodyContentChannellist {
 div.BodyContentChannellist table {
        float: left;
        width: 760px;
+       height: 450px;
 }
 
 /* define width of table. Add 16px to width for scrollbar.           */
@@ -474,3 +481,54 @@ a.sListSLink:hover{
        color: #00BCBC;
        background-color: #DDD;
 }
+
+.pageHeader {
+       width:100%;
+       background-color: #0066CC;
+       color: #FFF;
+       font-weight:bold;
+}
+
+.aboutHeader {
+       width:100%;
+       color:#444444;
+       font-weight:bold;
+       background-color:#DDEEFF;
+}
+
+.about {
+       border: 1px solid #AAA;
+       width: 100%;
+}
+
+.fullwidth {
+       width: 100%;
+}
+
+.aboutSection{
+       width:100%;
+}
+
+.aboutSectionLeft{
+       width:50%;
+       vertical-align: top;
+}
+
+.aboutSectionRight{
+       width:50%;
+       vertical-align: top;
+}
+
+.aboutElement{
+       float: none;
+}
+
+.aboutElementLeft{
+       font-weight:bold;
+       width: 45%;
+       text-align: left;
+}
+
+.aboutElementRight{
+       width: 55%;
+}

diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js
index d05894d..74badb6 100644 (file)
--- a/webinterface/src/web-data/templates.js
+++ b/webinterface/src/web-data/templates.js
@@ -36,7 +36,8 @@ var tplEPGListItemExtend  = '%(shortTxt) ...<a nohref onclick="setComplete(\'ext
 var tplEPGListFooter = "</table>";
        
 // ServiceList Templates
-var tplServiceListHeader  = '<table border="0" cellpadding="0" cellspacing="0" class="BodyContentChannellist">\n';
+var tplServiceListHeader  = '<div class="BodyContentChannellist">\n';
+       tplServiceListHeader += '<table border="0" cellpadding="0" cellspacing="0" class="BodyContentChannellist">\n';
        tplServiceListHeader += '<thead class="fixedHeader">\n';
        tplServiceListHeader += '<tr>\n';
        tplServiceListHeader += '<th><div class="sListHeader">ServiceList</div>\n';
@@ -59,7 +60,7 @@ var tplServiceListItem  = '<tr id="%(servicereference)extend">\n';
        tplServiceListItem += '<td colspan="2"><div id="%(servicereference)EPGNOW"></div></td>\n';
        tplServiceListItem += '</tr>\n';
        
-var tplServiceListFooter = "</tbody></table>\n";
+var tplServiceListFooter = "</tbody>\n</table>\n</div>\n";
 //
 
 var    tplServiceListEPGItem  = '<div class="sListEPGTime">%(starttime)</div>\n';
@@ -304,38 +305,145 @@ var tplAddTimerFormOptions = '';
 var tplAddTimerFormCheckbox = '';
        tplAddTimerFormCheckbox += '<input type="checkbox" id="%(id)" name="%(name)" value="%(value)" %(checked)>&nbsp;%(txt)&nbsp;&nbsp;';
 
-var tplAbout  = '<table align="center" border="0" width="80%">\n';
-    tplAbout += '<tr><td align="left"><b>Box Info:</b></td></tr>\n';
-    tplAbout += '<tr><td align="left"><b>Enigma Version: </b>%(enigmaVersion)</td>\n';
-    tplAbout += '<td align="left"><b>Service Info:</b></td></tr>\n';
-    tplAbout += '<tr><td align="left"><b>Frontprozessor Version: </b>%(fpVersion)</td>\n';
-    tplAbout += '<td align="left">Name: %(serviceName)</td></tr>\n';
-    tplAbout += '<tr><td align="left"><b>Webinterface Version: </b>%(webifversion)</td>\n';
-    tplAbout += '<td align="left">Provider: %(serviceProvider)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">Videoformat: %(serviceAspect)</tr>\n';
-    tplAbout += '<tr><td align="left"><b>detected Tuner:<br></b>%(tunerInfo)</td>\n';
-    tplAbout += '<td align="left">Namespace: %(serviceNamespace)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td><td align="left"></br></td></tr>\n';
-    tplAbout += '<tr><td align="left"><b>Harddisc Details:<br></b></td>\n';
-    tplAbout += '<td align="left"><b>PIDs:</b></td></tr>\n';
-    tplAbout += '<tr><td align="left">%(hddInfo)</td>\n';
-    tplAbout += '<td align="left">VideoPID: %(vPIDh) (%(vPID)d)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">AudioPID: %(aPIDh) (%(aPID)d)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">PCRPID: %(pcrIDh) (%(pcrID)d)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">PMTPID: %(pmtPIDh) (%(pmtPID)d)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">TXTPID: %(txtPIDh) (%(txtPID)d)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">TSID: %(tsIDh) (%(tsID)d)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">ONID: %(onIDh) (%(onID)d)</td></tr>\n';
-    tplAbout += '<tr><td align="left"></br></td>\n';
-    tplAbout += '<td align="left">SID: %(sidh) (%(sid)d)</td></tr>\n';
-    tplAbout += '</table>\n';
+var tplAbout  = '<table class="aboutSection">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<th colspan="2" class="pageHeader">About</th>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n'; 
+       tplAbout += '<td class="aboutSectionLeft">\n';
+       tplAbout += '<table class="fullwidth">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="fullwidth">\n';
+       tplAbout += '<table cellspacing="0" class="about">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<th colspan="2" class="aboutHeader">Software</th>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Enigma Version:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(enigmaVersion)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Frontprozessor Version:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(fpVersion)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Webinterface Version:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(webifversion)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '</table>\n';
+       tplAbout += '</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="fullwidth">\n';
+       tplAbout += '<table cellspacing="0" class="about">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<th colspan="2" class="aboutHeader">Detected Tuners</th>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '%(tunerInfo)';
+       tplAbout += '</table>\n';
+       tplAbout += '</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="fullwidth">\n';
+       tplAbout += '<table cellspacing="0" class="about">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<th colspan="2" class="aboutHeader">Harddisk</th>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Model</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(hddmodel)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Capacity</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(hddcapacity)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';                                           
+       tplAbout += '<td class="aboutElementLeft">Free</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(hddfree)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '</table>\n';
+       tplAbout += '</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '</table>\n';
+       tplAbout += '</td>\n';
+       tplAbout += '<td class="aboutSectionRight">\n';
+       tplAbout += '<table class="fullwidth">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="fullwidth">\n';
+       tplAbout += '<table cellspacing="0" class="about">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<th colspan="2" class="aboutHeader">Serviceinfo</th>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Name:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(serviceName)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';   
+       tplAbout += '<td class="aboutElementLeft">Provider:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(serviceProvider)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Videoformat:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(serviceAspect)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">Namespace:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(serviceNamespace)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '</table>\n';
+       tplAbout += '</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="fullwidth">\n';
+       tplAbout += '<table cellspacing="0" class="about">\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<th colspan="2" class="aboutHeader">PIDs</th>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">VideoPID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(vPIDh) (%(vPID)d)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">AudioPID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(aPIDh) (%(aPID)d)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">PCRID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(pcrIDh) (%(pcrID)d)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">PMTPID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(pmtPIDh) (%(pmtPID)d)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">TXTPID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(txtPIDh) (%(txtPID)d)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">TSID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(tsIDh) (%(tsID)d)</td>\n';
+       tplAbout += '</tr>\n';  
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">ONID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(onIDh) (%(onID)d)</td>\n';
+       tplAbout += '</tr>\n';  
+       tplAbout += '<tr>\n';
+       tplAbout += '<td class="aboutElementLeft">SID:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(sidh) (%(sid)d)</td>\n';
+       tplAbout += '</tr>\n';                                                                  
+       tplAbout += '</table>\n';
+       tplAbout += '</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '</table>\n';
+       tplAbout += '</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '</table>\n';
+
+var tplAboutTuner  = '<tr>\n';
+       tplAboutTuner += '<td class="aboutElementLeft">%(name)</td>\n';
+       tplAboutTuner += '<td class="aboutElementRight">%(type)</td>\n';
+       tplAboutTuner += '</tr>\n';
+       
 
 var tplExtraHiddenFunctions  = '<ul style="list-style-type:disc">';
        tplExtraHiddenFunctions += '<li><div onclick="restartTwisted()">Restart Twisted</div></li>';

diff --git a/webinterface/src/web-data/timer.js b/webinterface/src/web-data/timer.js
index 7cd5e1c..e43977a 100644 (file)
--- a/webinterface/src/web-data/timer.js
+++ b/webinterface/src/web-data/timer.js
@@ -75,8 +75,8 @@ function incomingTimerList(request){
                        listerHtml += RND(tplTimerListItem, namespace);
                }
                listerHtml += tplTimerListFooter;
-               $('BodyContentChannellist').innerHTML = listerHtml;
-               setBodyMainContent('BodyContentChannellist');
+               $('BodyContent').innerHTML = listerHtml;
+               setBodyMainContent('BodyContent');
        }
 }
 function repeatedReadable(num) {
@@ -359,7 +359,7 @@ function loadTimerForm(){
                                'eventID': addTimerEditFormObject["eventID"]
                };
        var listerHtml = RND(tplAddTimerForm, namespace);
-       $('BodyContentChannellist').innerHTML = listerHtml;
+       $('BodyContent').innerHTML = listerHtml;
 
        // Empty some stuff, but keep others to have the performance
        var tmp1 = addTimerEditFormObject["RadioList"];

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index 1038dde..c31ff72 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -559,8 +559,8 @@ function incomingChannellist(request){
                        listerHtml += RND(tplServiceListItem, namespace);
                }               
                listerHtml += tplServiceListFooter;
-               $('BodyContentChannellist').innerHTML = listerHtml;
-               setBodyMainContent('BodyContentChannellist');
+               $('BodyContent').innerHTML = listerHtml;
+               setBodyMainContent('BodyContent');
                loadServiceEPGNowNext(servicereftoloadepgnow);
                debug("incomingChannellist " + typeof(loadedChannellist[servicereftoloadepgnow]));
        }
@@ -591,8 +591,8 @@ function incomingMovieList(request){
                        listerHtml += RND(tplMovieListItem, namespace);
                }
                listerHtml += tplMovieListFooter;
-               $('BodyContentChannellist').innerHTML = listerHtml;
-               setBodyMainContent('BodyContentChannellist');
+               $('BodyContent').innerHTML = listerHtml;
+               setBodyMainContent('BodyContent');
                
        }               
 }
@@ -628,7 +628,7 @@ function incomingDelMovieFileResult(request) {
 
 // send Messages
 function showMessageSendForm(){
-               $('BodyContentChannellist').innerHTML = tplMessageSendForm;
+               $('BodyContent').innerHTML = tplMessageSendForm;
 }
 function sendMessage(messagetext,messagetype,messagetimeout){
        if(!messagetext){
@@ -659,7 +659,7 @@ function incomingMessageResult(request){
 
 // PowerState Code
 function showPowerStateSendForm(){
-               $('BodyContentChannellist').innerHTML = tplPowerStateSendForm;
+               $('BodyContent').innerHTML = tplPowerStateSendForm;
 }
 function sendPowerState(newState){
        doRequest(url_powerstate+'?newstate='+newState, incomingPowerStateResult, false);
@@ -671,9 +671,9 @@ function incomingPowerStateResult(request){
                var result = b.item(0).getElementsByTagName('e2result').item(0).firstChild.data;
                var resulttext = b.item(0).getElementsByTagName('e2resulttext').item(0).firstChild.data;
                var tplPowerStateSendForm2 = '<h1>PowerState is changing to:'+resulttext+ '</h1>' + tplPowerStateSendForm;
-               $('BodyContentChannellist').innerHTML = tplPowerStateSendForm2;
+               $('BodyContent').innerHTML = tplPowerStateSendForm2;
        } else {
-               $('BodyContentChannellist').innerHTML = "<h1>some unknown error</h1>" + tplPasswordSendForm;
+               $('BodyContent').innerHTML = "<h1>some unknown error</h1>" + tplPasswordSendForm;
        }
 }
 
@@ -690,8 +690,8 @@ function sendRemoteControlRequest(command){
        }
 }
 function openGrabPicture() {
-       if($('BodyContentChannellist').innerHTML != tplRCGrab) {
-               $('BodyContentChannellist').innerHTML = tplRCGrab;
+       if($('BodyContent').innerHTML != tplRCGrab) {
+               $('BodyContent').innerHTML = tplRCGrab;
        }
        debug("openGrabPicture");
        var buffer = new Image();
@@ -703,7 +703,7 @@ function openGrabPicture() {
        downloadStart = new Date().getTime();
        buffer.src = '/grab?' + downloadStart;
        $('grabPageIMG').height(400);
-       tplRCGrab = $('BodyContentChannellist').innerHTML;
+       tplRCGrab = $('BodyContent').innerHTML;
 }
 function incomingRemoteControlResult(request){
        if(request.readyState == 4){
@@ -905,10 +905,10 @@ function inserteSizes() {
         * 1600x1280
        if(screenH == 800) {
                debug("size 1");
-               $("BodyContentChannellist").style.height = '20%';
+               $("BodyContent").style.height = '20%';
        } else if(screenH == 1024) {
                debug("1024")
-               $("BodyContentChannellist").style.height = '760px';
+               $("BodyContent").style.height = '760px';
                
        } else {
                alert("unsupported screensize");
@@ -945,19 +945,23 @@ function incomingAbout(request) {
                                var tunerinfo = "";
                                
                                var nims = xml.getElementsByTagName('e2tunerinfo').item(0).getElementsByTagName("e2nim");
+                               debug("nims: "+nims.length);
                                for(var i=0;i< nims.length;i++){
-                                       tunerinfo += nims.item(i).firstChild.data+"<br>";
+                                       
+                                       name = nims.item(i).getElementsByTagName("name").item(0).firstChild.data;
+                                       type = nims.item(i).getElementsByTagName("type").item(0).firstChild.data;
+                                       debug(name);
+                                       debug(type);
+                                       var ns = { 'name' : name, 'type' : type};
+                                       tunerinfo += RND(tplAboutTuner, ns);
+                                       
                                }
                                
                                var hdddata = xml.getElementsByTagName('e2hddinfo').item(0);
-                               var hddinfo = "";
-                               if(hdddata.firstChild.data != "None"){
-                                       hddinfo += "Model: "+hdddata.getElementsByTagName("model").item(0).firstChild.data;
-                                       hddinfo += "<br>Capacity: "+hdddata.getElementsByTagName("capacity").item(0).firstChild.data;
-                                       hddinfo += "<br>Free: "+hdddata.getElementsByTagName("free").item(0).firstChild.data;
-                               }else{
-                                       hddinfo +="no Harddisc";
-                               }
+                               
+                               var hddmodel    = hdddata.getElementsByTagName("model").item(0).firstChild.data;
+                               var hddcapacity = hdddata.getElementsByTagName("capacity").item(0).firstChild.data;
+                               var hddfree             = hdddata.getElementsByTagName("free").item(0).firstChild.data;
 
                                var namespace = {
                                        'enigmaVersion': xml.getElementsByTagName('e2enigmaversion').item(0).firstChild.data
@@ -971,7 +975,9 @@ function incomingAbout(request) {
                                        ,'fpVersion': fptext
                                        ,'webifversion': xml.getElementsByTagName('e2webifversion').item(0).firstChild.data
                                        ,'tunerInfo': tunerinfo
-                                       ,'hddInfo': hddinfo
+                                       ,'hddmodel': hddmodel
+                                       ,'hddcapacity': hddcapacity
+                                       ,'hddfree': hddfree
                                        ,'serviceName': xml.getElementsByTagName('e2servicename').item(0).firstChild.data
                                        ,'serviceProvider': xml.getElementsByTagName('e2serviceprovider').item(0).firstChild.data
                                        ,'serviceAspect': xml.getElementsByTagName('e2serviceaspect').item(0).firstChild.data
@@ -993,8 +999,8 @@ function incomingAbout(request) {
                                        ,'sid': xml.getElementsByTagName('e2sid').item(0).firstChild.data
                                         ,'sidh': parseInt(ownLazyNumber(xml.getElementsByTagName('e2sid').item(0).firstChild.data),16)+" "
                                  };                              
-                               $('BodyContentChannellist').innerHTML = RND(tplAbout, namespace);
-                               setBodyMainContent('BodyContentChannellist');
+                               $('BodyContent').innerHTML = RND(tplAbout, namespace);
+                               setBodyMainContent('BodyContent');
                                
                        } catch (e) {
                                debug("About parsing Error" + e);

diff --git a/webinterface/src/web/about.xml b/webinterface/src/web/about.xml
index 02e0bb9..a561cad 100644 (file)
--- a/webinterface/src/web/about.xml
+++ b/webinterface/src/web/about.xml
@@ -1,32 +1,34 @@
-<e2:screen name="AboutWebScreen">&lt;?xml version="1.0" encoding="UTF-8"?>\r
-&lt;e2abouts><e2:element source="About" ><e2:convert type="web:ListFiller" >\r
-       &lt;e2about>\r
-               &lt;e2enigmaversion><e2:item name="enigmaVersion"  filter="xml"/>&lt;/e2enigmaversion>\r
-<!--\r
-               &lt;e2landhcp><e2:item name="lanDHCP"  filter="xml"/>&lt;/e2landhcp>\r
-               &lt;e2lanip><e2:item name="lanIP"  filter="xml"/>&lt;/e2lanip>\r
-               &lt;e2lanmask><e2:item name="lanMask" filter="xml"/>&lt;/e2lanmask>\r
-               &lt;e2langw><e2:item name="lanGW"  filter="xml"/>&lt;/e2langw>\r
-               &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
-               &lt;e2serviceprovider><e2:item name="serviceProvider"  filter="xml"/>  &lt;/e2serviceprovider>\r
-               &lt;e2serviceaspect><e2:item name="serviceAspect"  filter="xml"/>&lt;/e2serviceaspect>\r
-               &lt;e2servicenamespace><e2:item name="serviceNamespace"  filter="xml"/>&lt;/e2servicenamespace>\r
-               &lt;e2vpid><e2:item name="vPID"  filter="xml"/>&lt;/e2vpid>\r
-               &lt;e2apid><e2:item name="aPID"  filter="xml"/>&lt;/e2apid>\r
-               &lt;e2pcrid><e2:item name="pcrID"  filter="xml"/>&lt;/e2pcrid>\r
-               &lt;e2pmtpid><e2:item name="pmtPID"  filter="xml"/>&lt;/e2pmtpid>\r
-               &lt;e2txtpid><e2:item name="txtPID"  filter="xml"/>&lt;/e2txtpid>\r
-               &lt;e2tsid><e2:item name="tsID"  filter="xml"/>&lt;/e2tsid>\r
-               &lt;e2onid><e2:item name="onID"  filter="xml"/>&lt;/e2onid>\r
-               &lt;e2sid><e2:item name="sid"  filter="xml"/>&lt;/e2sid>\r
-       &lt;/e2about>\r
-       </e2:convert>\r
-       <e2:convert type="web:TextToHTML" /></e2:element>\r
-&lt;/e2abouts>\r
+<e2:screen name="AboutWebScreen">&lt;?xml version="1.0" encoding="UTF-8"?>
+&lt;e2abouts><e2:element source="About" ><e2:convert type="web:ListFiller" >
+       &lt;e2about>
+               &lt;e2enigmaversion><e2:item name="enigmaVersion"  filter="xml"/>&lt;/e2enigmaversion>
+<!--
+               &lt;e2landhcp><e2:item name="lanDHCP"  filter="xml"/>&lt;/e2landhcp>
+               &lt;e2lanip><e2:item name="lanIP"  filter="xml"/>&lt;/e2lanip>
+               &lt;e2lanmask><e2:item name="lanMask" filter="xml"/>&lt;/e2lanmask>
+               &lt;e2langw><e2:item name="lanGW"  filter="xml"/>&lt;/e2langw>
+               &lt;e2landns><e2:item name="lanDNS"  filter="xml"/>&lt;/e2landns>
+-->
+               &lt;e2fpversion><e2:item name="fpVersion"  filter="xml"/>&lt;/e2fpversion>
+               &lt;e2webifversion><e2:item name="WebIfVersion" />&lt;/e2webifversion>
+               &lt;e2tunerinfo><e2:item name="tunerInfo" />
+               &lt;/e2tunerinfo>
+               &lt;e2hddinfo><e2:item name="hddInfo"  />
+               &lt;/e2hddinfo>
+               &lt;e2servicename><e2:item name="serviceName"  filter="xml"/>&lt;/e2servicename>
+               &lt;e2serviceprovider><e2:item name="serviceProvider"  filter="xml"/>  &lt;/e2serviceprovider>
+               &lt;e2serviceaspect><e2:item name="serviceAspect"  filter="xml"/>&lt;/e2serviceaspect>
+               &lt;e2servicenamespace><e2:item name="serviceNamespace"  filter="xml"/>&lt;/e2servicenamespace>
+               &lt;e2vpid><e2:item name="vPID"  filter="xml"/>&lt;/e2vpid>
+               &lt;e2apid><e2:item name="aPID"  filter="xml"/>&lt;/e2apid>
+               &lt;e2pcrid><e2:item name="pcrID"  filter="xml"/>&lt;/e2pcrid>
+               &lt;e2pmtpid><e2:item name="pmtPID"  filter="xml"/>&lt;/e2pmtpid>
+               &lt;e2txtpid><e2:item name="txtPID"  filter="xml"/>&lt;/e2txtpid>
+               &lt;e2tsid><e2:item name="tsID"  filter="xml"/>&lt;/e2tsid>
+               &lt;e2onid><e2:item name="onID"  filter="xml"/>&lt;/e2onid>
+               &lt;e2sid><e2:item name="sid"  filter="xml"/>&lt;/e2sid>
+       &lt;/e2about>
+       </e2:convert>
+       <e2:convert type="web:TextToHTML" /></e2:element>
+&lt;/e2abouts>
 </e2:screen>
\ No newline at end of file

diff --git a/wirelesslan/src/Wlan.py b/wirelesslan/src/Wlan.py
index f9994b2..3daa9cc 100644 (file)
--- a/wirelesslan/src/Wlan.py
+++ b/wirelesslan/src/Wlan.py
@@ -91,9 +91,9 @@ class Wlan:
                                
                                print result.quality.getSignallevel()
                                
-                               if result.quality.sl is 0:
+                               if result.quality.sl is 0 and len(extra) > 0:
                                        begin = extra[0].find('SignalStrength=')+15
-                                                                               
+                                                                       
                                        done = False
                                        end = begin+1
                                        
@@ -177,10 +177,10 @@ class WlanList(HTMLComponent, GUIComponent):
                
                e = encrypted and _("Yes") or _("No")
                res.append( MultiContentEntryText(pos=(0, 0), size=(470, 35), font=0, flags=RT_HALIGN_LEFT, text=essid) )
-               res.append( MultiContentEntryText(pos=(480, 0), size=(90, 35), font=0, flags=RT_HALIGN_RIGHT, text=signal+"%") )
-               res.append( MultiContentEntryText(pos=(0, 40), size=(180, 20), font=1, flags=RT_HALIGN_LEFT, text=_("Max. Bitrate: ")+maxrate) )
-               res.append( MultiContentEntryText(pos=(190, 40), size=(180, 20), font=1, flags=RT_HALIGN_CENTER, text=_("Encrypted: ")+e) )
-               res.append( MultiContentEntryText(pos=(380, 40), size=(190, 20), font=1, flags=RT_HALIGN_RIGHT, text=_("Interface: ")+iface) )
+               res.append( MultiContentEntryText(pos=(480, 0), size=(90, 35), font=0, flags=RT_HALIGN_RIGHT, text="%s%" %signal))
+               res.append( MultiContentEntryText(pos=(0, 40), size=(180, 20), font=1, flags=RT_HALIGN_LEFT, text=_("Max. Bitrate: %s") %maxrate ))
+               res.append( MultiContentEntryText(pos=(190, 40), size=(180, 20), font=1, flags=RT_HALIGN_CENTER, text=_("Encrypted: %s") %e ))
+               res.append( MultiContentEntryText(pos=(380, 40), size=(190, 20), font=1, flags=RT_HALIGN_RIGHT, text=_("Interface: %s") %iface ))
                return res