WebSVN – ALCASAR – Diff – /web/acc/phpsysinfo/js/phpSysInfo/phpsysinfo_bootstrap.js

 /**
  * generate a span tag
  * @param {Number} id translation id in the xml file
  * @param {String} [plugin] name of the plugin for which the tag should be generated
+ * @param {String} [defaultvalue] default value
  * @return {String} string which contains generated span tag for translation string
  */
-function genlang(id, plugin) {
+function genlang(id, plugin, defaultvalue) {
     var html = "", idString = "", plugname = "",
         langarrId = current_language + "_";
     if (plugin === undefined) {
         plugname = "";
     html += "<span class=\"lang_" + idString + "\">";
     if ((langxml[langarrId] !== undefined) && (langarr[langarrId] !== undefined)) {
         html += langarr[langarrId][idString];
+    } else if (defaultvalue !== undefined) {
+        html += defaultvalue;
+    }
     html += "</span>";
     return html;
         Processes: {
             html: function () {
                 var processes = "", p111 = 0, p112 = 0, p113 = 0, p114 = 0, p115 = 0, p116 = 0;
                 var not_first = false;
                 processes = parseInt(this.Processes, 10);
+                if (processes > 0) {
-                if (this.ProcessesRunning !== undefined) {
+                    if (this.ProcessesRunning !== undefined) {
-                    p111 = parseInt(this.ProcessesRunning, 10);
+                        p111 = parseInt(this.ProcessesRunning, 10);
-                }
+                    }
-                if (this.ProcessesSleeping !== undefined) {
+                    if (this.ProcessesSleeping !== undefined) {
-                    p112 = parseInt(this.ProcessesSleeping, 10);
+                        p112 = parseInt(this.ProcessesSleeping, 10);
-                }
+                    }
-                if (this.ProcessesStopped !== undefined) {
+                    if (this.ProcessesStopped !== undefined) {
-                    p113 = parseInt(this.ProcessesStopped, 10);
+                        p113 = parseInt(this.ProcessesStopped, 10);
-                }
+                    }
-                if (this.ProcessesZombie !== undefined) {
+                    if (this.ProcessesZombie !== undefined) {
-                    p114 = parseInt(this.ProcessesZombie, 10);
+                        p114 = parseInt(this.ProcessesZombie, 10);
-                }
+                    }
-                if (this.ProcessesWaiting !== undefined) {
+                    if (this.ProcessesWaiting !== undefined) {
-                    p115 = parseInt(this.ProcessesWaiting, 10);
+                        p115 = parseInt(this.ProcessesWaiting, 10);
-                }
+                    }
-                if (this.ProcessesOther !== undefined) {
+                    if (this.ProcessesOther !== undefined) {
-                    p116 = parseInt(this.ProcessesOther, 10);
+                        p116 = parseInt(this.ProcessesOther, 10);
-                }
+                    }
-                if (p111 || p112 || p113 || p114 || p115 || p116) {
+                    if (p111 || p112 || p113 || p114 || p115 || p116) {
-                    processes += " (";
+                        processes += " (";
-                    for (var proc_type in {111:0,112:1,113:2,114:3,115:4,116:5}) {
+                        for (var proc_type in {111:0,112:1,113:2,114:3,115:4,116:5}) {
-                        if (eval("p" + proc_type)) {
+                            if (eval("p" + proc_type)) {
-                            if (not_first) {
+                                if (not_first) {
-                                processes += ", ";
+                                    processes += ", ";
+                                }
+                                processes += eval("p" + proc_type) + String.fromCharCode(160) + genlang(proc_type);
+                                not_first = true;
+                            }
-                            processes += eval("p" + proc_type) + String.fromCharCode(160) + genlang(proc_type);
-                            not_first = true;
+                        }
+                        processes += ")";
+                    }
-                    processes += ")";
+                }
                 return processes;
+            }
+        }
     };
         Cputemp: {
             html: function () {
                 return formatTemp(this.Cputemp, data.Options["@attributes"].tempFormat);
+            }
         },
+        Voltage: {
+            html: function() {
+                return round(this.Voltage, 2) + ' V';
+            }
+        },
         Bogomips: {
             text: function () {
                 return parseInt(this.Bogomips, 10);
+            }
         },
+        }
     };
     var html="";
+    if (data.Hardware["@attributes"] !== undefined) {
-    if ((data.Hardware["@attributes"] !== undefined) && (data.Hardware["@attributes"].Name !== undefined)) {
+        if (data.Hardware["@attributes"].Name !== undefined) {
-        html+="<tr id=\"hardware-Machine\">";
+            html+="<tr id=\"hardware-Machine\">";
-        html+="<th style=\"width:8%;\">"+genlang(107)+"</th>"; //Machine
+            html+="<th style=\"width:8%;\">"+genlang(107)+"</th>"; //Machine
-        html+="<td colspan=\"2\"><span data-bind=\"Name\"></span></td>";
+            html+="<td colspan=\"2\"><span data-bind=\"Name\"></span></td>";
+            html+="</tr>";
+        }
+        if (data.Hardware["@attributes"].Virtualizer !== undefined) {
+            html+="<tr id=\"hardware-Virtualizer\">";
+            html+="<th style=\"width:8%;\">"+genlang(134)+"</th>"; //Virtualizer
+            html+="<td colspan=\"2\"><span data-bind=\"Virtualizer\"></span></td>";
-        html+="</tr>";
+            html+="</tr>";
+        }
+    }
-    var paramlist = {CpuSpeed:13,CpuSpeedMax:100,CpuSpeedMin:101,Cache:15,Virt:94,BusSpeed:14,Bogomips:16,Cputemp:51,Manufacturer:122,Load:9};
+    var paramlist = {CpuSpeed:13,CpuSpeedMax:100,CpuSpeedMin:101,Cache:15,Virt:94,BusSpeed:14,Voltage:52,Bogomips:16,Cputemp:51,Manufacturer:122,Load:9};
     try {
         datas = items(data.Hardware.CPU.CpuCore);
         for (i = 0; i < datas.length; i++) {
              if (i === 0) {
                 html+="<tr id=\"hardware-CPU\" class=\"treegrid-CPU\">";
+        }
+    }
     $("#hardware-data").empty().append(html);
+    if (data.Hardware["@attributes"] !== undefined) {
-    if ((data.Hardware["@attributes"] !== undefined) && (data.Hardware["@attributes"].Name !== undefined)) {
+        if (data.Hardware["@attributes"].Name !== undefined) {
-        $('#hardware-Machine').render(data.Hardware["@attributes"]);
+            $('#hardware-Machine').render(data.Hardware["@attributes"]);
+        }
+        if (data.Hardware["@attributes"].Virtualizer !== undefined) {
+            $('#hardware-Virtualizer').render(data.Hardware["@attributes"]);
+        }
+    }
     try {
         datas = items(data.Hardware.CPU.CpuCore);
         for (i = 0; i < datas.length; i++) {

Subversion Repositories ALCASAR

(root)/web/acc/phpsysinfo/js/phpSysInfo/phpsysinfo_bootstrap.js – Rev 2976 → 3037