* Mon May 12 2025 Brian Read <brianr@koozali.org> 11.0.0-1.sme

- Adding SM2 panel [SME: 13004]
- Upgrade to phpsysinfo 3.4.4
- Add code to delete inline styles and add css to make it look better.
- version saved / built uses the static version, which means no drops downs and choices.

root/opt/phpsysinfo/plugins/bat/bat_bootstrap.html

@@ -1,61 +1,23 @@
-<div class="col-lg-6" id="block_bat" style="display:none">
-    <div class="panel panel-primary">
-        <div class="panel-heading">Battery Status</div>
-        <div class="panel-body">
-            <table id="bat" class="table table-hover table-condensed">
-                <thead>
-                <tr>
-                    <th>Items</th>
-                    <th>Values</th>
-                    <th></th>
-                </tr>
-                </thead>
-                <tr id="bat_DesignCapacity" style="display:none">
-                    <th>Design capacity</th>
-                    <td><span data-bind="DesignCapacity"></span></td>
-                    <td></td>
-                </tr>
-                <tr id="bat_RemainingCapacity" style="display:none">
-                    <th>Remaining capacity</th>
-                    <td><span data-bind="RemainingCapacity"></span></td>
-                    <td><span data-bind="RemainingCapacityBar"></span></td>
-                </tr>
-                <tr id="bat_ChargingState" style="display:none">
-                    <th>Charging state</th>
-                    <td><span data-bind="ChargingState"></span></td>
-                    <td></td>
-                </tr>
-                <tr id="bat_DesignVoltage" style="display:none">
-                    <th>Design voltage</th>
-                    <td><span data-bind="DesignVoltage"></span></td>
-                    <td><span data-bind="DesignVoltageMax"></span></td>
-                </tr>
-                <tr id="bat_PresentVoltage" style="display:none">
-                    <th>Present voltage</th>
-                    <td><span data-bind="PresentVoltage"></span></td>
-                    <td></td>
-                </tr>
-                <tr id="bat_BatteryType" style="display:none">
-                    <th>Battery Type</th>
-                    <td><span data-bind="BatteryType"></span></td>
-                    <td></td>
-                </tr>
-                <tr id="bat_BatteryTemperature" style="display:none">
-                    <th>Battery Temperature</th>
-                    <td><span data-bind="BatteryTemperature"></span></td>
-                    <td></td>
-                </tr>
-                <tr id="bat_BatteryCondition" style="display:none">
-                    <th>Battery Condition</th>
-                    <td><span data-bind="BatteryCondition"></span></td>
-                    <td></td>
-                </tr>
-                <tr id="bat_CycleCount" style="display:none">
-                    <th>Cycle Count</th>
-                    <td><span data-bind="CycleCount"></span></td>
-                    <td></td>
-                </tr>
-            </table>
+<div class="col-lg-6" id="block_bat" style="display:none;">
+    <div class="card" id="panel_bat" style="display:none;">
+        <div class="card-header"><span class="lang_plugin_bat_001">Battery Status</span>
+            <span class="hostname_bat"></span>
+            <div id="reload_bat" class="reload" title="reload"></div>
+        </div>
+        <div class="card-body">
+            <div class="table-responsive">
+                <table id="bat" class="table table-hover table-sm">
+                    <thead>
+                        <tr>
+                            <th><span class="lang_plugin_bat_006">Battery</span></th>
+                            <th><span class="lang_plugin_bat_007">Value</span></th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tbody id="bat-data">
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
 </div>

root/opt/phpsysinfo/plugins/bat/js/bat.js

@@ -21,25 +21,48 @@
 // $Id: bat.js 661 2012-08-27 11:26:39Z namiltd $
 //
 
-/*global $, jQuery, buildBlock, datetime, plugin_translate, genlang, createBar */
+/*global $, jQuery, buildBlock, datetime, plugin_translate, genlang */
 
 "use strict";
 
-var bat_show = false, bat_table;
+var bat_show = false;
+
 /**
- * insert content into table
+ * build the table where content is inserted
  * @param {jQuery} xml plugin-XML
  */
-function bat_populate(xml) {
+function bat_buildTable(xml) {
+    var html = "", tree = [], closed = [], batcount = 0, index = 0, hostname = "";
 
-    bat_table.fnClearTable();
+    $("#Plugin_BAT #Plugin_BATTable").remove();
 
-    $("Plugins Plugin_BAT Bat", xml).each(function bat_getitem(idp) {
-        var DesignCapacity = "", DesignVoltage = "",  BatteryType = "",RemainingCapacity = "", PresentVoltage = "", ChargingState = "", BatteryTemperature = "", BatteryCondition = "", CapacityUnit = "", CycleCount = "", DesignVoltageMax = "";
-        DesignCapacity = $(this).attr("DesignCapacity");
+    hostname = $("Plugins Plugin_BAT", xml).attr('Hostname');
+    if (hostname !== undefined) {
+        $('span[class=Hostname_BAT]').html(hostname);
+    }
+
+    html += "  <div style=\"overflow-x:auto;\">\n";
+    html += "   <table id=\"Plugin_BATTable\" class=\"tablemain\">\n";
+    html += "    <thead>\n";
+    html += "     <tr>\n";
+    html += "      <th>" + genlang(6, "BAT") + "</th>\n";
+    html += "      <th style=\"width:31%;\">" + genlang(7, "BAT") + "</th>\n";
+    html += "      <th></th>\n";
+    html += "     </tr>\n";
+    html += "    </thead>\n";
+    html += "    <tbody class=\"tree\">\n";
+
+    $("Plugins Plugin_Bat Bat", xml).each(function bat_getbats(id) {
+        var name = "", DesignCapacity = 0, FullCapacity = 0, DesignVoltage = "",  BatteryType = "", RemainingCapacity = 0, PresentVoltage = "", ChargingState = "", BatteryTemperature = "", BatteryCondition = "", CapacityUnit = "", CycleCount = "", DesignVoltageMax = "", Manufacturer = "", Model = "", SerialNumber = "";
+        name = $(this).attr("Name");
+        if (name === undefined) {
+            name = "Battery"+(batcount++);
+        }
+        DesignCapacity = parseInt($(this).attr("DesignCapacity"), 10);
+        FullCapacity = parseInt($(this).attr("FullCapacity"), 10);
         DesignVoltage = $(this).attr("DesignVoltage");
         BatteryType = $(this).attr("BatteryType");
-        RemainingCapacity = $(this).attr("RemainingCapacity");
+        RemainingCapacity = parseInt($(this).attr("RemainingCapacity"), 10);
         PresentVoltage = $(this).attr("PresentVoltage");
         ChargingState = $(this).attr("ChargingState");
         BatteryTemperature = $(this).attr("BatteryTemperature");
@@ -47,77 +70,126 @@ function bat_populate(xml) {
         CapacityUnit = $(this).attr("CapacityUnit");
         CycleCount = $(this).attr("CycleCount");
         DesignVoltageMax = $(this).attr("DesignVoltageMax");
+        Manufacturer = $(this).attr("Manufacturer");
+        Model = $(this).attr("Model");
+        SerialNumber = $(this).attr("SerialNumber");
 
-        if (CapacityUnit == undefined) {
+        html += "     <tr><td colspan=\"3\"><div class=\"treediv\"><span class=\"treespanbold\">" + name + "</div></span></td></tr>\n";
+        index = tree.push(0);
+
+        if (Model !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(15, "BAT") + "</div></span></td><td>" + Model +"</td><td></td></tr>\n";
+            tree.push(index);
+        }
+        if (Manufacturer !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(14, "BAT") + "</div></span></td><td>" + Manufacturer +"</td><td></td></tr>\n";
+            tree.push(index);
+        }
+        if (SerialNumber !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(16, "BAT") + "</div></span></td><td>" + SerialNumber +"</td><td></td></tr>\n";
+            tree.push(index);
+        }
+        if (CapacityUnit === undefined) {
             CapacityUnit = "mWh";
         }
-
-        if ((CapacityUnit == "%") && (RemainingCapacity != undefined)) {
-            bat_table.fnAddData([genlang(4, true, "BAT"), createBar(round(parseInt(RemainingCapacity, 10),0)), '&nbsp;']);
-        } else if (DesignCapacity == undefined) {
-            if (RemainingCapacity != undefined) bat_table.fnAddData([genlang(4, true, "BAT"), RemainingCapacity+' '+CapacityUnit, '&nbsp;']);
-        } else {
-            bat_table.fnAddData([genlang(3, true, "BAT"), DesignCapacity+' '+CapacityUnit, '&nbsp;']);
-            if (RemainingCapacity != undefined) bat_table.fnAddData([genlang(4, true, "BAT"), RemainingCapacity+' '+CapacityUnit, createBar(parseInt(DesignCapacity, 10) != 0 ? round(parseInt(RemainingCapacity, 10) / parseInt(DesignCapacity, 10) * 100, 0) : 0)]);
-        }
-        if (ChargingState != undefined) {
-            bat_table.fnAddData([genlang(9, true, "BAT"), ChargingState, '&nbsp;']);
-        }
-        if (DesignVoltage != undefined) {
-            if (DesignVoltageMax != undefined) {
-                bat_table.fnAddData([genlang(5, true, "BAT"), DesignVoltage+' mV', DesignVoltageMax+' mV']);
-            } else {
-                bat_table.fnAddData([genlang(5, true, "BAT"), DesignVoltage+' mV', '&nbsp;']);
+        if ((CapacityUnit == "%") && ($(this).attr("RemainingCapacity") !== undefined)) {
+           if (!isNaN(RemainingCapacity)) {
+                html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(3, "BAT") + "</div></span></td><td>" + createBar(RemainingCapacity) +"</td><td></td></tr>\n";
+                tree.push(index);
+            }
+        } else {
+            if (!isNaN(DesignCapacity)) {
+                html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(2, "BAT") + "</div></span></td><td>" + DesignCapacity+' '+CapacityUnit +"</td><td></td></tr>\n";
+                tree.push(index);
+            }
+            if (isNaN(FullCapacity)) {
+                if (!isNaN(RemainingCapacity)) {
+                    html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(3, "BAT") + "</div></span></td><td>" + RemainingCapacity+' '+CapacityUnit +"</td><td></td></tr>\n";
+                    tree.push(index);
+                }
+            } else {
+                if (isNaN(DesignCapacity)) {
+                    html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(13, "BAT") + "</div></span></td><td>" + FullCapacity+' '+CapacityUnit +"</td><td></td></tr>\n";
+                    tree.push(index);
+                } else {
+                    html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(13, "BAT") + "</div></span></td><td>" + FullCapacity+' '+CapacityUnit +"</td><td>" + createBar(DesignCapacity !== 0 ? round(FullCapacity / DesignCapacity * 100, 0) : 0) + "</td></tr>\n";
+                    tree.push(index);
+                }
+                if (!isNaN(RemainingCapacity)) {
+                    html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(3, "BAT") + "</div></span></td><td>" + RemainingCapacity+' '+CapacityUnit +"</td><td>" + createBar(FullCapacity !== 0 ? round(RemainingCapacity / FullCapacity * 100, 0) : 0) + "</td></tr>\n";
+                    tree.push(index);
+                }
             }
-        } else if (DesignVoltageMax != undefined) {
-            bat_table.fnAddData([genlang(5, true, "BAT"), DesignVoltageMax+' mV', '&nbsp;']);
         }
-        if (PresentVoltage != undefined) {
-            bat_table.fnAddData([genlang(6, true, "BAT"), PresentVoltage+' mV', '&nbsp;']);
+        if (ChargingState !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(8, "BAT") + "</div></span></td><td>" + ChargingState +"</td><td></td></tr>\n";
+            tree.push(index);
         }
-        if (BatteryType != undefined) {
-            bat_table.fnAddData([genlang(10, true, "BAT"), BatteryType, '&nbsp;']);
+        if (DesignVoltage !== undefined) {
+            if (DesignVoltageMax !== undefined) {
+                html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(4, "BAT") + "</div></span></td><td>" + DesignVoltage+' mV' +"</td><td>" + DesignVoltageMax+' mV'+ "</td></tr>\n";
+                tree.push(index);
+            } else {
+                html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(4, "BAT") + "</div></span></td><td>" + DesignVoltage+' mV' +"</td><td></td></tr>\n";
+                tree.push(index);
+            }
+        } else if (DesignVoltageMax !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(4, "BAT") + "</div></span></td><td>" + DesignVoltageMax+' mV' +"</td><td></td></tr>\n";
+            tree.push(index);
         }
-        if (BatteryTemperature != undefined) {
-            bat_table.fnAddData([genlang(11, true, "BAT"), formatTemp(BatteryTemperature, xml), '&nbsp;']);
+        if (PresentVoltage !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(5, "BAT") + "</div></span></td><td>" + PresentVoltage+' mV' +"</td><td></td></tr>\n";
+            tree.push(index);
         }
-        if (BatteryCondition != undefined) {
-            bat_table.fnAddData([genlang(12, true, "BAT"), BatteryCondition, '&nbsp;']);
+        if (BatteryType !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(9, "BAT") + "</div></span></td><td>" + BatteryType +"</td><td></td></tr>\n";
+            tree.push(index);
         }
-        if (CycleCount != undefined) {
-            bat_table.fnAddData([genlang(13, true, "BAT"), CycleCount, '&nbsp;']);
+        if (BatteryTemperature !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(10, "BAT") + "</div></span></td><td>" + formatTemp(BatteryTemperature, xml) +"</td><td></td></tr>\n";
+            tree.push(index);
+        }
+        if (BatteryCondition !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(11, "BAT") + "</div></span></td><td>" + BatteryCondition +"</td><td></td></tr>\n";
+            tree.push(index);
+        }
+        if (CycleCount !== undefined) {
+            html += "     <tr><td><div class=\"treediv\"><span class=\"treespan\">" + genlang(12, "BAT") + "</div></span></td><td>" + CycleCount +"</td><td></td></tr>\n";
+            tree.push(index);
         }
 
         bat_show = true;
     });
-}
 
-/**
- * fill the plugin block with table structure
- */
-function bat_buildTable() {
-    var html = "";
-
-    html += "<table id=\"Plugin_BATTable\" style=\"border-spacing:0;\">\n";
-    html += "  <thead>\n";
-    html += "    <tr>\n";
-    html += "      <th>" + genlang(7, true, "BAT") + "</th>\n";
-    html += "      <th>" + genlang(8, true, "BAT") + "</th>\n";
-    html += "      <th>&nbsp;</th>\n";
-    html += "    </tr>\n";
-    html += "  </thead>\n";
-    html += "  <tbody>\n";
-    html += "  </tbody>\n";
-    html += "</table>\n";
+    html += "    </tbody>\n";
+    html += "   </table>\n";
+    html += "  </div>\n";
 
     $("#Plugin_BAT").append(html);
 
+    $("#Plugin_BATTable").jqTreeTable(tree, {
+        openImg: "./gfx/treeTable/tv-collapsable.gif",
+        shutImg: "./gfx/treeTable/tv-expandable.gif",
+        leafImg: "./gfx/treeTable/tv-item.gif",
+        lastOpenImg: "./gfx/treeTable/tv-collapsable-last.gif",
+        lastShutImg: "./gfx/treeTable/tv-expandable-last.gif",
+        lastLeafImg: "./gfx/treeTable/tv-item-last.gif",
+        vertLineImg: "./gfx/treeTable/vertline.gif",
+        blankImg: "./gfx/treeTable/blank.gif",
+        collapse: closed,
+        column: 0,
+        striped: true,
+        highlight: false,
+        state: false
+    });
+
 }
 
 /**
  * load the xml via ajax
  */
 function bat_request() {
+    $("#Reload_BATTable").attr("title", "reload");
     $.ajax({
         url: "xml.php?plugin=BAT",
         dataType: "xml",
@@ -126,7 +198,7 @@ function bat_request() {
         },
         success: function bat_buildblock(xml) {
             populateErrors(xml);
-            bat_populate(xml);
+            bat_buildTable(xml);
             if (bat_show) {
                 plugin_translate("BAT");
                 $("#Plugin_BAT").show();
@@ -137,32 +209,12 @@ function bat_request() {
 
 $(document).ready(function bat_buildpage() {
     $("#footer").before(buildBlock("BAT", 1, true));
-    $("#Plugin_BAT").css("width", "451px");
-
-    bat_buildTable();
-
-    bat_table = $("#Plugin_BATTable").dataTable({
-        "bPaginate": false,
-        "bLengthChange": false,
-        "bFilter": false,
-        "bSort": false,
-        "bInfo": false,
-        "bProcessing": true,
-        "bAutoWidth": false,
-        "bStateSave": true,
-        "aoColumns": [{
-            "sType": 'span-string'
-        }, {
-            "sType": 'span-string'
-        }, {
-            "sType": 'span-string'
-        }]
-    });
+    $("#Plugin_BAT").addClass("halfsize");
 
     bat_request();
 
     $("#Reload_BATTable").click(function bat_reload(id) {
         bat_request();
-        $("#Reload_BATTable").attr("title",datetime());
+        $(this).attr("title", datetime());
     });
 });

root/opt/phpsysinfo/plugins/bat/js/bat_bootstrap.js

@@ -1,29 +1,47 @@
 function renderPlugin_bat(data) {
-
+    var batcount = 0;
     var directives = {
-        RemainingCapacity: {
-            html: function () {
-                var CapacityUnit = (this["CapacityUnit"] !== undefined) ? this["CapacityUnit"] : 'mWh';
-                if ( CapacityUnit === "%" ) {
-                    return '<div class="progress"><div class="progress-bar progress-bar-info" style="width: ' + round(this["RemainingCapacity"],0) + '%;"></div>' +
-                        '</div><div class="percent">' + round(this["RemainingCapacity"],0) + '%</div>';
-                } else {
-                    return this["RemainingCapacity"] + String.fromCharCode(160) + CapacityUnit;
-                }
+        Name: {
+            text: function () {
+                return (this.Name !== undefined) ? this.Name : 'Battery'+(batcount++);
             }
         },
         DesignCapacity: {
             html: function () {
-                var CapacityUnit = (this["CapacityUnit"] !== undefined) ? this["CapacityUnit"] : 'mWh';
-                return this["DesignCapacity"] + String.fromCharCode(160) + CapacityUnit;
+                return this.DesignCapacity + String.fromCharCode(160) + this.CapacityUnit;
+            }
+        },
+        FullCapacity: {
+            html: function () {
+                return this.FullCapacity + String.fromCharCode(160) + this.CapacityUnit;
+            }
+        },
+        FullCapacityBar: {
+            html: function () {
+                if (( this.CapacityUnit !== "%" ) && (this.DesignCapacity !== undefined)){
+                    var percent = (this.DesignCapacity > 0) ? round(100*this.FullCapacity/this.DesignCapacity, 0) : 0;
+                    return '<div class="progress"><div class="progress-bar progress-bar-info" style="width:' + percent + '%;"></div>' +
+                        '</div><div class="percent">' + percent + '%</div>';
+                } else {
+                    return '';
+                }
+            }
+        },
+        RemainingCapacity: {
+            html: function () {
+                if ( this.CapacityUnit === "%" ) {
+                    return '<div class="progress"><div class="progress-bar progress-bar-info" style="width:' + this.RemainingCapacity + '%;"></div>' +
+                        '</div><div class="percent">' + this.RemainingCapacity + '%</div>';
+                } else {
+                    return this.RemainingCapacity + String.fromCharCode(160) + this.CapacityUnit;
+                }
             }
         },
         RemainingCapacityBar: {
             html: function () {
-                var CapacityUnit = (this["CapacityUnit"] !== undefined) ? this["CapacityUnit"] : 'mWh';
-                if (( CapacityUnit !== "%" ) && (this["DesignCapacity"] !== undefined)){
-                    var percent = (this["DesignCapacity"] != 0) ? round(100*this["RemainingCapacity"]/this["DesignCapacity"],0) : 0;
-                    return '<div class="progress"><div class="progress-bar progress-bar-info" style="width: ' + percent + '%;"></div>' +
+                if (( this.CapacityUnit !== "%" ) && (this.FullCapacity !== undefined)){
+                    var percent = (this.FullCapacity > 0) ? round(100*this.RemainingCapacity/this.FullCapacity, 0) : 0;
+                    return '<div class="progress"><div class="progress-bar progress-bar-info" style="width:' + percent + '%;"></div>' +
                         '</div><div class="percent">' + percent + '%</div>';
                 } else {
                     return '';
@@ -32,38 +50,106 @@ function renderPlugin_bat(data) {
         },
         PresentVoltage: {
             text: function () {
-                return this['PresentVoltage'] + String.fromCharCode(160) + 'mV';
+                return this.PresentVoltage + String.fromCharCode(160) + 'mV';
             }
         },
         BatteryTemperature: {
-            text: function () {
-                return formatTemp(this["BatteryTemperature"], data["Options"]["@attributes"]["tempFormat"]);
+            html: function () {
+                return formatTemp(this.BatteryTemperature, data.Options["@attributes"].tempFormat);
             }
         },
         DesignVoltage: {
             text: function () {
-                return this['DesignVoltage']+String.fromCharCode(160) + 'mV';
+                return this.DesignVoltage + String.fromCharCode(160) + 'mV';
             }
         },
         DesignVoltageMax: {
             text: function () {
-                return (this["DesignVoltageMax"] !== undefined) ? this['DesignVoltageMax']+String.fromCharCode(160) + 'mV' : '';
+                return (this.DesignVoltageMax !== undefined) ? this.DesignVoltageMax + String.fromCharCode(160) + 'mV' : '';
             }
         }
     };
 
-    if ((data['Plugins']['Plugin_BAT'] !== undefined) && (data['Plugins']['Plugin_BAT']["Bat"] !== undefined) && (data['Plugins']['Plugin_BAT']["Bat"]["@attributes"] !== undefined)){
-        $('#bat').render(data['Plugins']['Plugin_BAT']["Bat"]["@attributes"], directives);
-        var attr = data['Plugins']['Plugin_BAT']["Bat"]["@attributes"];
-        for (bat_param in {DesignCapacity:0,RemainingCapacity:1,ChargingState:2,DesignVoltage:3,PresentVoltage:4,BatteryType:5,BatteryTemperature:6,BatteryCondition:7,CycleCount:8}) {
-            if (attr[bat_param] !== undefined) {
-                $('#bat_' + bat_param).show();
+    if (data.Plugins.Plugin_BAT !== undefined) {
+        var bats = items(data.Plugins.Plugin_BAT.Bat);
+        if (bats.length > 0) {
+            var html = "";
+            var paramlist = {Model:15,Manufacturer:14,SerialNumber:16,DesignCapacity:2,FullCapacity:13,RemainingCapacity:3,ChargingState:8,DesignVoltage:4,PresentVoltage:5,BatteryType:9,BatteryTemperature:10,BatteryCondition:11,CycleCount:12};
+            var paramlis2 = {FullCapacity:'FullCapacityBar',RemainingCapacity:'RemainingCapacityBar',DesignVoltage:'DesignVoltageMax'};
+            var i, proc_param;
+
+            for (i = 0; i < bats.length; i++) {
+                if (bats[i]["@attributes"].CapacityUnit === undefined) {
+                    bats[i]["@attributes"].CapacityUnit = 'mWh';
+                } else if ((bats[i]["@attributes"].CapacityUnit === '%') && (bats[i]["@attributes"].RemainingCapacity !== undefined)) {
+                   if (bats[i]["@attributes"].DesignCapacity !== undefined) {
+                       delete bats[i]["@attributes"].DesignCapacity;
+                   }
+                   if (bats[i]["@attributes"].FullCapacity !== undefined) {
+                       delete bats[i]["@attributes"].FullCapacity;
+                   }
+                }
+
+                if ((bats[i]["@attributes"].DesignCapacity !== undefined) && isNaN(bats[i]["@attributes"].DesignCapacity = parseInt(bats[i]["@attributes"].DesignCapacity, 10))) {
+                    delete bats[i]["@attributes"].DesignCapacity;
+                }
+                if ((bats[i]["@attributes"].FullCapacity !== undefined) && isNaN(bats[i]["@attributes"].FullCapacity = parseInt(bats[i]["@attributes"].FullCapacity, 10))) {
+                    delete bats[i]["@attributes"].FullCapacity;
+                }
+                if ((bats[i]["@attributes"].RemainingCapacity !== undefined) && isNaN(bats[i]["@attributes"].RemainingCapacity = parseInt(bats[i]["@attributes"].RemainingCapacity, 10))) {
+                    delete bats[i]["@attributes"].RemainingCapacity;
+                }
+
+                try {
+                    html+="<tr id=\"bat-" + i + "\" class=\"treegrid-bat-" + i + "\" style=\"display:none;\" >";
+                    html+="<td colspan=\"3\"><span class=\"treegrid-spanbold\" data-bind=\"Name\"></span></td>";
+                    html+="</tr>";
+                    for (proc_param in paramlist) {
+                        if (bats[i]["@attributes"][proc_param] !== undefined) {
+                            html+="<tr id=\"bat-" + i + "-" + proc_param + "\" class=\"treegrid-parent-bat-" + i + "\">";
+                            html+="<td><span class=\"treegrid-spanbold\">" + genlang(paramlist[proc_param], 'bat') + "</span></td>";
+                            html+="<td><span data-bind=\"" + proc_param + "\"></span></td>";
+                            if (paramlis2[proc_param] !== undefined) {
+                                html+="<td class=\"rightCell\"><span data-bind=\"" + paramlis2[proc_param] + "\"></span></td>";
+                            } else {
+                                html+="<td></td>";
+                            }
+                            html+="</tr>";
+                        }
+                    }
+                }
+                catch (err) {
+                   $("#bat-" + i).hide();
+                }
             }
+
+            $("#bat-data").empty().append(html);
+
+            for (i = 0; i < bats.length; i++) {
+                try {
+                    $('#bat-'+ i).render(bats[i]["@attributes"], directives);
+                    $("#bat-" + i).show();
+                    for (proc_param in paramlist) {
+                        if (bats[i]["@attributes"][proc_param] !== undefined) {
+                            $('#bat-'+ i+ "-" + proc_param).render(bats[i]["@attributes"], directives);
+                        }
+                    }
+                }
+                catch (err) {
+                   $("#bat-" + i).hide();
+                }
+            }
+
+            $('#bat').treegrid({
+                initialState: 'expanded',
+                expanderExpandedClass: 'normalicon normalicon-down',
+                expanderCollapsedClass: 'normalicon normalicon-right'
+            });
+
+            $('#block_bat').show();
+        } else {
+            $('#block_bat').hide();
         }
-        if (attr["CapacityUnit"] === "%") {
-            $('#bat_DesignCapacity').hide();
-        }
-        $('#block_bat').show();
     } else {
         $('#block_bat').hide();
     }

root/opt/phpsysinfo/plugins/bat/lang/cz.xml

@@ -9,40 +9,49 @@
   <expression id="plugin_bat_001" name="bat_title">
     <exp>Stav baterie</exp>
   </expression>
-  <expression id="plugin_bat_002" name="bat_date">
-    <exp>Aktualizováno</exp>
-  </expression>
-  <expression id="plugin_bat_003" name="bat_design_capacity">
+  <expression id="plugin_bat_002" name="bat_design_capacity">
     <exp>Konstrukční kapacita</exp>
   </expression>
-  <expression id="plugin_bat_004" name="bat_remaining_capacity">
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
     <exp>Zbývající kapacita</exp>
   </expression>
-  <expression id="plugin_bat_005" name="bat_design_voltage">
+  <expression id="plugin_bat_004" name="bat_design_voltage">
     <exp>Konstrukční napětí</exp>
   </expression>
-  <expression id="plugin_bat_006" name="bat_present_voltage">
+  <expression id="plugin_bat_005" name="bat_present_voltage">
     <exp>Aktuální napětí</exp>
   </expression>
-  <expression id="plugin_bat_007" name="bat_item">
-    <exp>Položky</exp>
+  <expression id="plugin_bat_006" name="bat_battery">
+    <exp>Baterie</exp>
   </expression>
-  <expression id="plugin_bat_008" name="bat_value">
-    <exp>Hodnoty</exp>
+  <expression id="plugin_bat_007" name="bat_value">
+    <exp>Hodnota</exp>
   </expression>
-  <expression id="plugin_bat_009" name="bat_charging_state">
+  <expression id="plugin_bat_008" name="bat_charging_state">
     <exp>Stav nabíjení</exp>
   </expression>
-  <expression id="plugin_bat_010" name="bat_battery_type">
+  <expression id="plugin_bat_009" name="bat_battery_type">
     <exp>Battery Type</exp>
   </expression>
-  <expression id="plugin_bat_011" name="bat_battery_temperature">
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
     <exp>Battery Temperature</exp>
   </expression>
-  <expression id="plugin_bat_012" name="bat_battery_condition">
+  <expression id="plugin_bat_011" name="bat_battery_condition">
     <exp>Battery Condition</exp>
   </expression>
-  <expression id="plugin_bat_013" name="bat_cycle_count">
+  <expression id="plugin_bat_012" name="bat_cycle_count">
     <exp>Cycle Count</exp>
   </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Plná kapacita</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Manufacturer</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Model</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Serial Number</exp>
+  </expression>
 </tns:translationPlugin>

root/opt/phpsysinfo/plugins/bat/lang/de.xml

@@ -9,40 +9,49 @@
   <expression id="plugin_bat_001" name="bat_title">
     <exp>Akku-Status</exp>
   </expression>
-  <expression id="plugin_bat_002" name="bat_date">
-    <exp>Letzte Aktualisierung</exp>
-  </expression>
-  <expression id="plugin_bat_003" name="bat_design_capacity">
+  <expression id="plugin_bat_002" name="bat_design_capacity">
     <exp>Bemeskapazität</exp>
   </expression>
-  <expression id="plugin_bat_004" name="bat_remaining_capacity">
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
     <exp>Übrige Kapazität</exp>
   </expression>
-  <expression id="plugin_bat_005" name="bat_design_voltage">
+  <expression id="plugin_bat_004" name="bat_design_voltage">
     <exp>Bemessungsspannung</exp>
   </expression>
-  <expression id="plugin_bat_006" name="bat_present_voltage">
+  <expression id="plugin_bat_005" name="bat_present_voltage">
     <exp>Momentane Spannung</exp>
   </expression>
-  <expression id="plugin_bat_007" name="bat_item">
-    <exp>Dinge</exp>
+  <expression id="plugin_bat_006" name="bat_battery">
+    <exp>Akku</exp>
   </expression>
-  <expression id="plugin_bat_008" name="bat_value">
-    <exp>Werte</exp>
+  <expression id="plugin_bat_007" name="bat_value">
+    <exp>Wert</exp>
   </expression>
-  <expression id="plugin_bat_009" name="bat_charging_state">
+  <expression id="plugin_bat_008" name="bat_charging_state">
     <exp>Ladezustand</exp>
   </expression>
-  <expression id="plugin_bat_010" name="bat_battery_type">
+  <expression id="plugin_bat_009" name="bat_battery_type">
     <exp>Akku-Typ</exp>
   </expression>
-  <expression id="plugin_bat_011" name="bat_battery_temperature">
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
     <exp>Akku-Temperatur</exp>
   </expression>
-  <expression id="plugin_bat_012" name="bat_battery_condition">
+  <expression id="plugin_bat_011" name="bat_battery_condition">
     <exp>Akku-Zustand</exp>
   </expression>
-  <expression id="plugin_bat_013" name="bat_cycle_count">
+  <expression id="plugin_bat_012" name="bat_cycle_count">
     <exp>Cycle Count</exp>
   </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Volle Kapazität</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Manufacturer</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Model</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Serial Number</exp>
+  </expression>
 </tns:translationPlugin>

root/opt/phpsysinfo/plugins/bat/lang/en.xml

@@ -9,40 +9,49 @@
   <expression id="plugin_bat_001" name="bat_title">
     <exp>Battery Status</exp>
   </expression>
-  <expression id="plugin_bat_002" name="bat_date">
-    <exp>Last refresh</exp>
-  </expression>
-  <expression id="plugin_bat_003" name="bat_design_capacity">
+  <expression id="plugin_bat_002" name="bat_design_capacity">
     <exp>Design capacity</exp>
   </expression>
-  <expression id="plugin_bat_004" name="bat_remaining_capacity">
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
     <exp>Remaining capacity</exp>
   </expression>
-  <expression id="plugin_bat_005" name="bat_design_voltage">
+  <expression id="plugin_bat_004" name="bat_design_voltage">
     <exp>Design voltage</exp>
   </expression>
-  <expression id="plugin_bat_006" name="bat_present_voltage">
+  <expression id="plugin_bat_005" name="bat_present_voltage">
     <exp>Present voltage</exp>
   </expression>
-  <expression id="plugin_bat_007" name="bat_item">
-    <exp>Items</exp>
+  <expression id="plugin_bat_006" name="bat_battery">
+    <exp>Battery</exp>
   </expression>
-  <expression id="plugin_bat_008" name="bat_value">
-    <exp>Values</exp>
+  <expression id="plugin_bat_007" name="bat_value">
+    <exp>Value</exp>
   </expression>
-  <expression id="plugin_bat_009" name="bat_charging_state">
+  <expression id="plugin_bat_008" name="bat_charging_state">
     <exp>Charging state</exp>
   </expression>
-  <expression id="plugin_bat_010" name="bat_battery_type">
+  <expression id="plugin_bat_009" name="bat_battery_type">
     <exp>Battery Type</exp>
   </expression>
-  <expression id="plugin_bat_011" name="bat_battery_temperature">
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
     <exp>Battery Temperature</exp>
   </expression>
-  <expression id="plugin_bat_012" name="bat_battery_condition">
+  <expression id="plugin_bat_011" name="bat_battery_condition">
     <exp>Battery Condition</exp>
   </expression>
-  <expression id="plugin_bat_013" name="bat_cycle_count">
+  <expression id="plugin_bat_012" name="bat_cycle_count">
     <exp>Cycle Count</exp>
   </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Full capacity</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Manufacturer</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Model</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Serial Number</exp>
+  </expression>
 </tns:translationPlugin>

root/opt/phpsysinfo/plugins/bat/lang/fr.xml

@@ -9,40 +9,49 @@
   <expression id="plugin_bat_001" name="bat_title">
     <exp>Etat des batteries</exp>
   </expression>
-  <expression id="plugin_bat_002" name="bat_date">
-    <exp>Dernière actualisation</exp>
-  </expression>
-  <expression id="plugin_bat_003" name="bat_design_capacity">
+  <expression id="plugin_bat_002" name="bat_design_capacity">
     <exp>Capacité d'origine</exp>
   </expression>
-  <expression id="plugin_bat_004" name="bat_remaining_capacity">
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
     <exp>Capacité restante</exp>
   </expression>
-  <expression id="plugin_bat_005" name="bat_design_voltage">
+  <expression id="plugin_bat_004" name="bat_design_voltage">
     <exp>Tension d'origine</exp>
   </expression>
-  <expression id="plugin_bat_006" name="bat_present_voltage">
+  <expression id="plugin_bat_005" name="bat_present_voltage">
     <exp>Tension actuelle</exp>
   </expression>
-  <expression id="plugin_bat_007" name="bat_item">
+  <expression id="plugin_bat_006" name="bat_battery">
     <exp>Elements</exp>
   </expression>
-  <expression id="plugin_bat_008" name="bat_value">
-    <exp>Valeurs</exp>
+  <expression id="plugin_bat_007" name="bat_value">
+    <exp>Valeur</exp>
   </expression>
-  <expression id="plugin_bat_009" name="bat_charging_state">
+  <expression id="plugin_bat_008" name="bat_charging_state">
     <exp>Etat</exp>
   </expression>
-  <expression id="plugin_bat_010" name="bat_battery_type">
+  <expression id="plugin_bat_009" name="bat_battery_type">
     <exp>Battery Type</exp>
   </expression>
-  <expression id="plugin_bat_011" name="bat_battery_temperature">
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
     <exp>Battery Temperature</exp>
   </expression>
-  <expression id="plugin_bat_012" name="bat_battery_condition">
+  <expression id="plugin_bat_011" name="bat_battery_condition">
     <exp>Battery Condition</exp>
   </expression>
-  <expression id="plugin_bat_013" name="bat_cycle_count">
+  <expression id="plugin_bat_012" name="bat_cycle_count">
     <exp>Cycle Count</exp>
   </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Capacité pleine</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Manufacturer</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Model</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Serial Number</exp>
+  </expression>
 </tns:translationPlugin>

root/opt/phpsysinfo/plugins/bat/lang/gr.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <!-- $Id: gr.xml 661 2012-08-27 11:26:39Z namiltd $ -->
+  <!--
+    phpSysInfo language file Language: Greek Created by: ChriZathens
+  -->
+<tns:translationPlugin language="greek" charset="utf-8"
+  xmlns:tns="http://phpsysinfo.sourceforge.net/translation-plugin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://phpsysinfo.sourceforge.net/translation-plugin ../../../language/translation-plugin.xsd">
+  <expression id="plugin_bat_001" name="bat_title">
+    <exp>Κατάσταση Μπαταρίας</exp>
+  </expression>
+  <expression id="plugin_bat_002" name="bat_design_capacity">
+    <exp>Εργοστασιακή χωρητικότητα</exp>
+  </expression>
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
+    <exp>Εναπομείνουσα χωρητικότητα</exp>
+  </expression>
+  <expression id="plugin_bat_004" name="bat_design_voltage">
+    <exp>Εργοστασιακή τάση</exp>
+  </expression>
+  <expression id="plugin_bat_005" name="bat_present_voltage">
+    <exp>Τρέχουσα τάση</exp>
+  </expression>
+  <expression id="plugin_bat_006" name="bat_battery">
+    <exp>Μπαταρία</exp>
+  </expression>
+  <expression id="plugin_bat_007" name="bat_value">
+    <exp>Τιμή</exp>
+  </expression>
+  <expression id="plugin_bat_008" name="bat_charging_state">
+    <exp>Κατάσταση φόρτισης</exp>
+  </expression>
+  <expression id="plugin_bat_009" name="bat_battery_type">
+    <exp>Τύπος Μπαταρίας</exp>
+  </expression>
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
+    <exp>Θερμοκρασία Μπαταρίας</exp>
+  </expression>
+  <expression id="plugin_bat_011" name="bat_battery_condition">
+    <exp>Κατάσταση Μπαταρίας</exp>
+  </expression>
+  <expression id="plugin_bat_012" name="bat_cycle_count">
+    <exp>Κύκλοι φόρτισης</exp>
+  </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Πλήρης χωρητικότητα</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Κατασκευαστής</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Μοντέλο</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Σειριακός Αριθμός</exp>
+  </expression>
+</tns:translationPlugin>

root/opt/phpsysinfo/plugins/bat/lang/pl.xml

@@ -9,40 +9,49 @@
   <expression id="plugin_bat_001" name="bat_title">
     <exp>Status Baterii</exp>
   </expression>
-  <expression id="plugin_bat_002" name="bat_date">
-    <exp>Ostatnie odświeżenie</exp>
-  </expression>
-  <expression id="plugin_bat_003" name="bat_design_capacity">
+  <expression id="plugin_bat_002" name="bat_design_capacity">
     <exp>Pojemność znamionowa</exp>
   </expression>
-  <expression id="plugin_bat_004" name="bat_remaining_capacity">
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
     <exp>Pojemność aktualna</exp>
   </expression>
-  <expression id="plugin_bat_005" name="bat_design_voltage">
+  <expression id="plugin_bat_004" name="bat_design_voltage">
     <exp>Napięcie znamionowe</exp>
   </expression>
-  <expression id="plugin_bat_006" name="bat_present_voltage">
+  <expression id="plugin_bat_005" name="bat_present_voltage">
     <exp>Napięcie aktualne</exp>
   </expression>
-  <expression id="plugin_bat_007" name="bat_item">
-    <exp>Parametry</exp>
+  <expression id="plugin_bat_006" name="bat_battery">
+    <exp>Bateria</exp>
   </expression>
-  <expression id="plugin_bat_008" name="bat_value">
-    <exp>Wartości</exp>
+  <expression id="plugin_bat_007" name="bat_value">
+    <exp>Wartość</exp>
   </expression>
-  <expression id="plugin_bat_009" name="bat_charging_state">
+  <expression id="plugin_bat_008" name="bat_charging_state">
     <exp>Stan ładowania</exp>
   </expression>
-  <expression id="plugin_bat_010" name="bat_battery_type">
+  <expression id="plugin_bat_009" name="bat_battery_type">
     <exp>Typ ogniw</exp>
   </expression>
-  <expression id="plugin_bat_011" name="bat_battery_temperature">
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
     <exp>Temperatura ogniw</exp>
   </expression>
-  <expression id="plugin_bat_012" name="bat_battery_condition">
+  <expression id="plugin_bat_011" name="bat_battery_condition">
     <exp>Kondycja ogniw</exp>
   </expression>
-  <expression id="plugin_bat_013" name="bat_cycle_count">
+  <expression id="plugin_bat_012" name="bat_cycle_count">
     <exp>Cykli ładowania</exp>
   </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Pojemność pełna</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Producent</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Model</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Numer seryjny</exp>
+  </expression>
 </tns:translationPlugin>

root/opt/phpsysinfo/plugins/bat/lang/ro.xml

@@ -9,40 +9,49 @@
   <expression id="plugin_bat_001" name="bat_title">
     <exp>Stare Baterie</exp>
   </expression>
-  <expression id="plugin_bat_002" name="bat_date">
-    <exp>Ultimul refresh</exp>
-  </expression>
-  <expression id="plugin_bat_003" name="bat_design_capacity">
+  <expression id="plugin_bat_002" name="bat_design_capacity">
     <exp>Capacitate Design</exp>
   </expression>
-  <expression id="plugin_bat_004" name="bat_remaining_capacity">
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
     <exp>Capacitate rămasă</exp>
   </expression>
-  <expression id="plugin_bat_005" name="bat_design_voltage">
+  <expression id="plugin_bat_004" name="bat_design_voltage">
     <exp>Voltaj design</exp>
   </expression>
-  <expression id="plugin_bat_006" name="bat_present_voltage">
+  <expression id="plugin_bat_005" name="bat_present_voltage">
     <exp>Voltaj prezent</exp>
   </expression>
-  <expression id="plugin_bat_007" name="bat_item">
-    <exp>Elemente</exp>
+  <expression id="plugin_bat_006" name="bat_battery">
+    <exp>Baterie</exp>
   </expression>
-  <expression id="plugin_bat_008" name="bat_value">
-    <exp>Valori</exp>
+  <expression id="plugin_bat_007" name="bat_value">
+    <exp>valoare</exp>
   </expression>
-  <expression id="plugin_bat_009" name="bat_charging_state">
+  <expression id="plugin_bat_008" name="bat_charging_state">
     <exp>Stare de Încărcare</exp>
   </expression>
-  <expression id="plugin_bat_010" name="bat_battery_type">
+  <expression id="plugin_bat_009" name="bat_battery_type">
     <exp>Tip Baterie</exp>
   </expression>
-  <expression id="plugin_bat_011" name="bat_battery_temperature">
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
     <exp>Temperatura Baterie</exp>
   </expression>
-  <expression id="plugin_bat_012" name="bat_battery_condition">
+  <expression id="plugin_bat_011" name="bat_battery_condition">
     <exp>Condiții Baterie</exp>
   </expression>
-  <expression id="plugin_bat_013" name="bat_cycle_count">
+  <expression id="plugin_bat_012" name="bat_cycle_count">
     <exp>Cycle Count</exp>
   </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Capacitate maximă</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Manufacturer</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Model</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Serial Number</exp>
+  </expression>
 </tns:translationPlugin>

root/opt/phpsysinfo/plugins/bat/lang/ru.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <!-- $Id: en.xml 661 2012-08-27 11:26:39Z namiltd $ -->
+  <!-- $Id: ru.xml 661 2012-08-27 11:26:39Z namiltd $ -->
   <!--
     phpSysInfo language file Language: Russian Created by: Denis Sevostyanov (den007)
   -->
@@ -9,40 +9,49 @@
   <expression id="plugin_bat_001" name="bat_title">
     <exp>Состояние батареи</exp>
   </expression>
-  <expression id="plugin_bat_002" name="bat_date">
-    <exp>Последние обновление</exp>
-  </expression>
-  <expression id="plugin_bat_003" name="bat_design_capacity">
+  <expression id="plugin_bat_002" name="bat_design_capacity">
     <exp>Проектная мощность</exp>
   </expression>
-  <expression id="plugin_bat_004" name="bat_remaining_capacity">
+  <expression id="plugin_bat_003" name="bat_remaining_capacity">
     <exp>Оставшийся объем</exp>
   </expression>
-  <expression id="plugin_bat_005" name="bat_design_voltage">
+  <expression id="plugin_bat_004" name="bat_design_voltage">
     <exp>Проектное напряжение</exp>
   </expression>
-  <expression id="plugin_bat_006" name="bat_present_voltage">
+  <expression id="plugin_bat_005" name="bat_present_voltage">
     <exp>Фактическое напряжение</exp>
   </expression>
-  <expression id="plugin_bat_007" name="bat_item">
-    <exp>Элементы</exp>
+  <expression id="plugin_bat_006" name="bat_battery">
+    <exp>Aккумулятор</exp>
   </expression>
-  <expression id="plugin_bat_008" name="bat_value">
+  <expression id="plugin_bat_007" name="bat_value">
     <exp>Значение</exp>
   </expression>
-  <expression id="plugin_bat_009" name="bat_charging_state">
+  <expression id="plugin_bat_008" name="bat_charging_state">
     <exp>Состояние зарядки</exp>
   </expression>
-  <expression id="plugin_bat_010" name="bat_battery_type">
+  <expression id="plugin_bat_009" name="bat_battery_type">
     <exp>Тип батареи</exp>
   </expression>
-  <expression id="plugin_bat_011" name="bat_battery_temperature">
+  <expression id="plugin_bat_010" name="bat_battery_temperature">
     <exp>Температура батареи</exp>
   </expression>
-  <expression id="plugin_bat_012" name="bat_battery_condition">
+  <expression id="plugin_bat_011" name="bat_battery_condition">
     <exp>Состояние аккумулятора</exp>
   </expression>
-  <expression id="plugin_bat_013" name="bat_cycle_count">
+  <expression id="plugin_bat_012" name="bat_cycle_count">
     <exp>Циклы</exp>
   </expression>
+  <expression id="plugin_bat_013" name="bat_full_capacity">
+    <exp>Полная мощность</exp>
+  </expression>
+  <expression id="plugin_bat_014" name="bat_manufacturer">
+    <exp>Manufacturer</exp>
+  </expression>
+  <expression id="plugin_bat_015" name="bat_model">
+    <exp>Model</exp>
+  </expression>
+  <expression id="plugin_bat_016" name="bat_serialnumber">
+    <exp>Serial Number</exp>
+  </expression>
 </tns:translationPlugin>