Fix confirm notification

web_interface/src/wui/main.css

@@ -1002,6 +1002,7 @@ fieldset[disabled] .btn-primary-inverted:active,
 .btn-primary-inverted.disabled.active,
 .btn-primary-inverted[disabled].active,
 fieldset[disabled] .btn-primary-inverted.active {
+  color: #fff;
   background-color: #337ab7;
   border-color: #3d7ab7;
 }
@@ -1048,6 +1049,7 @@ fieldset[disabled] .btn-success-inverted:active,
 .btn-success-inverted.disabled.active,
 .btn-success-inverted[disabled].active,
 fieldset[disabled] .btn-success-inverted.active {
+  color: #fff;
   background-color: #5cb85c;
   border-color: #4cae4c;
 }
@@ -1094,6 +1096,7 @@ fieldset[disabled] .btn-info-inverted:active,
 .btn-info-inverted.disabled.active,
 .btn-info-inverted[disabled].active,
 fieldset[disabled] .btn-info-inverted.active {
+  color: #fff;
   background-color: #5bc0de;
   border-color: #46b8da;
 }
@@ -1140,6 +1143,7 @@ fieldset[disabled] .btn-warning-inverted:active,
 .btn-warning-inverted.disabled.active,
 .btn-warning-inverted[disabled].active,
 fieldset[disabled] .btn-warning-inverted.active {
+  color: #fff;
   background-color: #f0ad4e;
   border-color: #eea236;
 }
@@ -1186,6 +1190,7 @@ fieldset[disabled] .btn-danger-inverted:active,
 .btn-danger-inverted.disabled.active,
 .btn-danger-inverted[disabled].active,
 fieldset[disabled] .btn-danger-inverted.active {
+  color: #fff;
   background-color: #d9534f;
   border-color: #d43f3a;
 }
@@ -1676,7 +1681,7 @@ fieldset[disabled] .checkbox label {
   z-index:102;
   overflow: auto;
 }
-#checkUpdatePass{
+#checkUpdatePass, #changePassword, #uploadSettings, #rectifiersConfig{
   display: none;
   position: relative;
   text-align: center;
@@ -2230,7 +2235,7 @@ h4 {
 }
 
 .span_1_of_2 {
-  width: 49%;
+  width: 48%;
 }
 
 /*  GO FULL WIDTH AT LESS THAN 480 PIXELS */

web_interface/src/wui/main.js

@@ -87,26 +87,6 @@ function fadeIn(el, display){
     }
   })();
 }
-// Shows confirm box if Network settings were changed
-var netsettings_changed;
-var netsettings_executed = false;
-function netsettings_changedCheck() {
-  if (netsettings_changed == 'true') {
-    if (!netsettings_executed) {
-      netsettings_executed = true;
-      var ch_element = HTMLcreate(
-        '<div id="apply-settings">'+
-          '<p>Внимание, для применения сетевых настроек необходимо их подтвердить.'+
-          ' Иначе они будут сброшены в течении 10 минут.</p>'+
-          '<a href="confirm.cgi" class="btn btn-danger">Подтвердить</a>'+
-        '</div>'
-        );
-      document.body.insertBefore(ch_element, document.body.childNodes[0]);
-      fadeIn($('apply-settings'));
-    }
-  }
-}
-setInterval(netsettings_changedCheck, 100);
 
 //########## Settings Form ############
 
@@ -382,6 +362,18 @@ function getJSON(url, successHandler, errorHandler) {
   xhr.send();
 }
 
+function updatepage(){
+  var loc = location.pathname.slice(1, -5);
+  switch(loc){
+  case 'settings':
+    setTimeout(settingsGET, 1000);
+    break;
+  case 'history':
+    getPage($('currentpage').value);
+    break;
+  }
+}
+
 function getCGI(url) {
   var xmlhttp;
   var q;
@@ -469,6 +461,8 @@ function paramsRefresh() {
     $('ro1').innerHTML = +data.ro1 ? 'Замкнут' : 'Разомкнут';
     $('ro2').innerHTML = +data.ro2 ? 'Замкнут' : 'Разомкнут';
     // checkState();
+    window.setCookie('netsettings_changed', data.netsettings_changed);
+    checkNotify();
     setTimeout(paramsRefresh, 1000);
   }, function (status) {
     if (status !== 0){
@@ -513,9 +507,7 @@ function getPage(pn){
     }
     // utcParam = data.utc;
     window.setCookie('netsettings_changed', data.netsettings_changed);
-    window.setCookie('profilaction_changed', data.profilaction_changed);
-    window.setCookie('need_confirm', data.need_confirm);
-    // checkNotify();
+    checkNotify();
     clearTimeout(mint);
     mint = setTimeout(history_dataref, 5000);
   }, function(){
@@ -697,8 +689,9 @@ function settingsGET(){
     radiusState();
     authState();
     timesetType($('ntp'));
-    netsettings_changed     = data.netsettings_changed;
-    // profilaction_changed    = data.NeedProfilaction;
+
+    window.setCookie('netsettings_changed', data.netsettings_changed);
+    checkNotify();
   }, function() {
     alert('Не удалось получить данные.');
   });
@@ -730,6 +723,15 @@ function UPSPowerOff(options) {
   }, JSON.stringify(options));
 }
 
+var apply_settings = new NotificationBox('apply-settings',
+  {
+    'message': 'Внимание, для применения сетевых настроек необходимо их подтвердить. Иначе они будут сброшены в течении 10 минут.',
+    'bgcolor':'#ffcc00',
+    'textcolor': '#333',
+    'url': 'confirm.cgi',
+    'show': window.getCookie('role') < 2
+  });
+
 // ################################################################################
 
 function infoGet() {
@@ -747,7 +749,8 @@ function infoGet() {
     $('ups_fwversion').innerHTML       = data.ups_fwversion;
     $('ups_model').innerHTML       = data.ups_model;
     // utcParam                 = data.utc;
-    netsettings_changed      = data.netsettings_changed;
+    window.setCookie('netsettings_changed', data.netsettings_changed);
+    checkNotify();
   }, function() {
     alert('Не удалось получить данные.');
   });

web_interface/src/wui/role.js

@@ -181,8 +181,6 @@ function getJSON(url, successHandler, errorHandler) {
 
 function checkNotify() {
   ( getCookie('netsettings_changed')  == 'true' ) ? apply_settings.init()           : apply_settings.close();
-  ( getCookie('profilaction_changed') == 'true' ) ? device_profilaction.init()      : device_profilaction.close();
-  ( getCookie('need_confirm')         == 'true' ) ? settings_uppload_confirm.init() : settings_uppload_confirm.close();
 }
 function getParam(e,x) {
   switch (x) {
@@ -222,37 +220,37 @@ function NotificationBox (id, options) {
   if(! ('message' in this.options)) this.options.message = 'NotificationBox: Hello World!';
   if(! ('bgcolor' in this.options)) this.options.bgcolor = '#009966';
   if(! ('textcolor' in this.options)) this.options.textcolor = '#fff';
+  if(! ('show' in this.options)) this.options.show = true;
   if(! ('url' in this.options)) console.log('NotificationBox: Please add confirm URL in options');
 }
 
 NotificationBox.prototype.init = function(){
   if (!$(this.id)) {
-    var maindiv = document.createElement('div');
-    maindiv.id = this.id;
-    maindiv.className = 'notify-box';
-    maindiv.style.backgroundColor = this.options.bgcolor;
-    maindiv.style.color = this.options.textcolor;
-
-    var string  = document.createElement('p');
-    string.textContent = this.options.message;
-    maindiv.appendChild(string);
-
-    var confirm = document.createElement('button');
-    confirm.className = 'btn btn-danger-inverted';
-    confirm.textContent = 'Подтвердить';
-    confirm.setAttribute('onclick', 'loadXMLDoc(\''+ this.options.url +'\',\'GET\', updatepage)');
-    maindiv.appendChild(confirm);
-
-    if (this.options.cancelButton) {
-      var cancel = document.createElement('button');
-      cancel.className = 'btn btn-warning-inverted';
-      cancel.style.marginLeft = '5px';
-      cancel.textContent = 'Отмена';
-      cancel.setAttribute('onclick', 'loadXMLDoc(\''+ this.options.cancelUrl +'\',\'GET\', updatepage)');
-      maindiv.appendChild(cancel);
+    if (this.options.show) {
+      var maindiv = document.createElement('div');
+      maindiv.id = this.id;
+      maindiv.className = 'notify-box';
+      maindiv.style.backgroundColor = this.options.bgcolor;
+      maindiv.style.color = this.options.textcolor;
+      var string  = document.createElement('p');
+      string.textContent = this.options.message;
+      maindiv.appendChild(string);
+      var confirm = document.createElement('button');
+      confirm.className = 'btn btn-danger-inverted';
+      confirm.textContent = 'Подтвердить';
+      confirm.setAttribute('onclick', 'loadXMLDoc(\''+ this.options.url +'\',\'GET\', updatepage)');
+      maindiv.appendChild(confirm);
+      if (this.options.cancelButton) {
+        var cancel = document.createElement('button');
+        cancel.className = 'btn btn-warning-inverted';
+        cancel.style.marginLeft = '5px';
+        cancel.textContent = 'Отмена';
+        cancel.setAttribute('onclick', 'loadXMLDoc(\''+ this.options.cancelUrl +'\',\'GET\', updatepage)');
+        maindiv.appendChild(cancel);
+      }
+      document.body.insertBefore(maindiv, document.body.childNodes[0]);
+      fadeIn($(this.id));
     }
-    document.body.insertBefore(maindiv, document.body.childNodes[0]);
-    window.fadeIn($(this.id));
   }
 };
 

web_interface/src/wui/settings.cgi

@@ -42,7 +42,7 @@ JSON = {
   "time":"14:57",
   "ntpservip":"88.147.254.236",
   "lastsynctime":"21.04.2017 12:32:14",
-  "netsettings_changed":"false",
+  "netsettings_changed":"true",
   "NeedProfilaction":"false"
 }
 print(json.dumps(JSON))