OP task #616 | fixed info

web_interface/src/wui-3/info.html

@@ -54,22 +54,6 @@
       <td>Серийный номер</td>
       <td id="serno"></td>
     </tr>
-    <tr>
-      <td>Название устройства</td>
-      <td><input type="text" name="sysname" id="sysname" class="form-control" maxlength="19"></td>
-    </tr>
-    <tr>
-      <td>Владелец</td>
-      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="49"></td>
-    </tr>
-    <tr>
-      <td>Местоположение</td>
-      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="109"></td>
-    </tr>
-    <tr>
-      <td>Комментарии</td>
-      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="109"></td>
-    </tr>
   </tbody>
   <thead>
     <tr>
@@ -95,7 +79,6 @@
     </tr>
   </tbody>
 </table>
-  <button type="button" onclick="submitInfo(); return false;" class="btn btn-primary">Сохранить</button>
 </form>
 <!--END-->
 </div>

web_interface/src/wui-3/main.js

@@ -962,14 +962,50 @@ function infoGet() {
     $('fwversion').innerHTML = data.fwversion;
     $('macaddr').innerHTML   = data.macaddr;
     $('serno').innerHTML     = data.serno;
-    $('sysname').value       = data.sysname;
-    $('owner').value         = data.owner;
-    $('location').value      = data.sysLocation;
-    $('comment').value       = data.comment;
-    $('ups_fwversion').innerHTML       = data.ups_fwversion;
-    $('ups_sn').innerHTML       = data.ups_sn;
-    $('ups_model').innerHTML       = data.ups_model;
-    // utcParam                 = data.utc;
+
+    $('ups_fwversion').innerHTML = data.ups_fwversion;
+    $('ups_sn').innerHTML        = data.ups_sn;
+    $('ups_model').innerHTML     = data.ups_model;
+
+    var info_labels = {
+      sysname: ['Название устройства', data.sysname,     19],
+      owner:   ['Владелец',            data.owner,       49],
+      location:['Местоположение',      data.sysLocation, 109],
+      comment: ['Комментарии',         data.comment,     109]
+    };
+
+    for (var i in info_labels) {
+      var row = document.createElement('tr');
+      var label = document.createElement('td');
+      label.innerHTML = info_labels[i][0];
+      var val = document.createElement('td');
+      val.id = i+'_wr';
+      if (getCookie('role') <= 1) {
+        var inp = document.createElement('input');
+        inp.type = 'text';
+        inp.id = i;
+        inp.name = i;
+        inp.className = 'form-control';
+        inp.maxLength = info_labels[i][2];
+        inp.value = info_labels[i][1];
+        val.appendChild(inp);
+      } else {
+        val.innerHTML = info_labels[i][1];
+      }
+      row.appendChild(label);
+      row.appendChild(val);
+      $('ctrl_info').appendChild(row);
+    }
+
+    if (getCookie('role') <= 1) {
+      var sbmt = document.createElement('button');
+      sbmt.className = 'btn btn-primary-inverted';
+      sbmt.type = 'button';
+      sbmt.setAttribute('onclick', 'submitInfo(); return false;');
+      sbmt.innerHTML = 'Сохранить';
+      $('SNMPinfo').appendChild(sbmt);
+    }
+
     window.setCookie('netsettings_changed', data.netsettings_changed);
     checkNotify();
   }, function() {

web_interface/src/wui-7/info.html

@@ -54,22 +54,6 @@
       <td>Серийный номер</td>
       <td id="serno"></td>
     </tr>
-    <tr>
-      <td>Название устройства</td>
-      <td><input type="text" name="sysname" id="sysname" class="form-control" maxlength="19"></td>
-    </tr>
-    <tr>
-      <td>Владелец</td>
-      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="49"></td>
-    </tr>
-    <tr>
-      <td>Местоположение</td>
-      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="109"></td>
-    </tr>
-    <tr>
-      <td>Комментарии</td>
-      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="109"></td>
-    </tr>
   </tbody>
   <thead>
     <tr>
@@ -91,7 +75,6 @@
     </tr>
   </tbody>
 </table>
-  <button type="button" onclick="submitInfo(); return false;" class="btn btn-primary">Сохранить</button>
 </form>
 <!--END-->
 </div>

web_interface/src/wui-7/main.js

@@ -949,13 +949,50 @@ function infoGet() {
     $('fwversion').innerHTML = data.fwversion;
     $('macaddr').innerHTML   = data.macaddr;
     $('serno').innerHTML     = data.serno;
-    $('sysname').value       = data.sysname;
-    $('owner').value         = data.owner;
-    $('location').value      = data.sysLocation;
-    $('comment').value       = data.comment;
-    $('ups_fwversion').innerHTML       = data.ups_fwversion;
-    $('ups_model').innerHTML       = data.ups_model;
-    // utcParam                 = data.utc;
+
+    $('comment').value           = data.comment;
+    $('ups_fwversion').innerHTML = data.ups_fwversion;
+    $('ups_model').innerHTML     = data.ups_model;
+
+    var info_labels = {
+      sysname: ['Название устройства', data.sysname,     19],
+      owner:   ['Владелец',            data.owner,       49],
+      location:['Местоположение',      data.sysLocation, 109],
+      comment: ['Комментарии',         data.comment,     109]
+    };
+
+    for (var i in info_labels) {
+      var row = document.createElement('tr');
+      var label = document.createElement('td');
+      label.innerHTML = info_labels[i][0];
+      var val = document.createElement('td');
+      val.id = i+'_wr';
+      if (getCookie('role') <= 1) {
+        var inp = document.createElement('input');
+        inp.type = 'text';
+        inp.id = i;
+        inp.name = i;
+        inp.className = 'form-control';
+        inp.maxLength = info_labels[i][2];
+        inp.value = info_labels[i][1];
+        val.appendChild(inp);
+      } else {
+        val.innerHTML = info_labels[i][1];
+      }
+      row.appendChild(label);
+      row.appendChild(val);
+      $('ctrl_info').appendChild(row);
+    }
+
+    if (getCookie('role') <= 1) {
+      var sbmt = document.createElement('button');
+      sbmt.className = 'btn btn-primary-inverted';
+      sbmt.type = 'button';
+      sbmt.setAttribute('onclick', 'submitInfo(); return false;');
+      sbmt.innerHTML = 'Сохранить';
+      $('SNMPinfo').appendChild(sbmt);
+    }
+
     window.setCookie('netsettings_changed', data.netsettings_changed);
     checkNotify();
   }, function() {

web_interface/src/wui-9/info.html

@@ -29,7 +29,7 @@
       <th colspan="2">Контроллер мониторинга</th>
     </tr>
   </thead>
-  <tbody>
+  <tbody id="ctrl_info">
     <tr>
       <td class="none-border">Время работы</td>
       <td class="none-border" id="uptime"></td>
@@ -54,7 +54,7 @@
       <td>Серийный номер</td>
       <td id="serno"></td>
     </tr>
-    <tr>
+<!--     <tr>
       <td>Название устройства</td>
       <td><input type="text" name="sysname" id="sysname" class="form-control" maxlength="19"></td>
     </tr>
@@ -69,7 +69,7 @@
     <tr>
       <td>Комментарии</td>
       <td><input type="text" name="comment" id="comment" class="form-control" maxlength="109"></td>
-    </tr>
+    </tr> -->
   </tbody>
   <thead>
     <tr>
@@ -95,7 +95,7 @@
     </tr>
   </tbody>
 </table>
-  <button type="button" onclick="submitInfo(); return false;" class="btn btn-primary">Сохранить</button>
+
 </form>
 <!--END-->
 </div>

web_interface/src/wui-9/main.js

@@ -1010,14 +1010,50 @@ function infoGet() {
     $('fwversion').innerHTML = data.fwversion;
     $('macaddr').innerHTML   = data.macaddr;
     $('serno').innerHTML     = data.serno;
-    $('sysname').value       = data.sysname;
-    $('owner').value         = data.owner;
-    $('location').value      = data.sysLocation;
-    $('comment').value       = data.comment;
-    $('ups_fwversion').innerHTML       = data.ups_fwversion;
-    $('ups_sn').innerHTML       = data.ups_sn;
-    $('ups_model').innerHTML       = data.ups_model;
-    // utcParam                 = data.utc;
+
+    $('ups_fwversion').innerHTML = data.ups_fwversion;
+    $('ups_sn').innerHTML        = data.ups_sn;
+    $('ups_model').innerHTML     = data.ups_model;
+
+    var info_labels = {
+      sysname: ['Название устройства', data.sysname,     19],
+      owner:   ['Владелец',            data.owner,       49],
+      location:['Местоположение',      data.sysLocation, 109],
+      comment: ['Комментарии',         data.comment,     109]
+    };
+
+    for (var i in info_labels) {
+      var row = document.createElement('tr');
+      var label = document.createElement('td');
+      label.innerHTML = info_labels[i][0];
+      var val = document.createElement('td');
+      val.id = i+'_wr';
+      if (getCookie('role') <= 1) {
+        var inp = document.createElement('input');
+        inp.type = 'text';
+        inp.id = i;
+        inp.name = i;
+        inp.className = 'form-control';
+        inp.maxLength = info_labels[i][2];
+        inp.value = info_labels[i][1];
+        val.appendChild(inp);
+      } else {
+        val.innerHTML = info_labels[i][1];
+      }
+      row.appendChild(label);
+      row.appendChild(val);
+      $('ctrl_info').appendChild(row);
+    }
+
+    if (getCookie('role') <= 1) {
+      var sbmt = document.createElement('button');
+      sbmt.className = 'btn btn-primary-inverted';
+      sbmt.type = 'button';
+      sbmt.setAttribute('onclick', 'submitInfo(); return false;');
+      sbmt.innerHTML = 'Сохранить';
+      $('SNMPinfo').appendChild(sbmt);
+    }
+
     window.setCookie('netsettings_changed', data.netsettings_changed);
     checkNotify();
   }, function() {