* [FIX] Backend level was not set in JS code when adding new backends…

…. Related #13 #17 * [MOD] Moved highlighting events to CSS.
nuxsmin · Jun 16, 2016 · e4a81dd · e4a81dd
1 parent 8844ef5
commit e4a81dd
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ Las funcionalidades de **sysMonDash** son las siguientes:
 * Filtrado de servicios para NO mostrar en vista principal
 * Selección de elementos críticos para mostrar siempre
 * Detección de paradas programadas que se hayan establecido, así como su visualización en la vista principal
+* Enlace con backends remotos mediante API JSON
 
 ---
 
@@ -41,6 +42,7 @@ The **sysMonDash** key features are:
 * Services filtering to NOT be shown in the main view
 * Critical items selection to be always shown
 * Scheduled downtimes detection and showing them in the main view
+* Link to remote backends through JSON API
 
 ---
 

diff --git a/ajax/checkConfig.php b/ajax/checkConfig.php
@@ -23,6 +23,7 @@
  *
  */
 
+use Exts\Zabbix\ZabbixApiLoader;
 use SMD\Core\Init;
 use SMD\Http\Request;
 use SMD\Http\Response;
@@ -54,7 +55,7 @@
             $json = Util::getDataFromUrl($url);
             break;
         case 'zabbixBackend':
-            $ZabbixLoader = new \Exts\Zabbix\ZabbixApiLoader();
+            $ZabbixLoader = new ZabbixApiLoader();
             $Zabbix = $ZabbixLoader->getAPI($data->version);
             $Zabbix->setApiUrl($data->url);
             $Zabbix->userLogin(array('user' => $data->user, 'password' => $data->pass));

diff --git a/css/styles.css b/css/styles.css
@@ -4,7 +4,7 @@
 }
 
 body {
-    font-family: Arial, helvetica, verdana, tahoma, "sans serif";
+    font-family: Arial, helvetica, verdana, tahoma, "sans serif", serif;
     line-height: 1.3em;
     overflow-x: hidden;
     font-size: 1.2em;
@@ -33,6 +33,8 @@ tr.item-data > td, thead > th {
 
 .new {
     font-weight: bold;
+    background-color: #ffff00;
+    color: #333333;
 }
 
 .up a, .new a {

diff --git a/css/styles.min.css b/css/styles.min.css
diff --git a/inc/SMD/Util/Util.class.php b/inc/SMD/Util/Util.class.php
@@ -130,7 +130,7 @@ public static function checkRefreshSession()
      */
     public static function getVersion($retBuild = false)
     {
-        $build = 2016061502;
+        $build = 2016061601;
         $version = array(1, 0);
 
         if ($retBuild) {

diff --git a/js/functions.js b/js/functions.js
@@ -144,8 +144,6 @@ function SMD() {
                     newItemsCount = newItems.length;
                     playBeep();
                 }
-
-                newItems.highlight({bgcolor_on: self.hex2rgb('#ffff00'), fgcolor_on: self.hex2rgb('#333333')});
             },
             error: function (xhr, textStatus, errorThrown) {
                 placeHolder.html("<div id=\"nomessages\" class=\"error\">" + Config.getLang(1) + "<p>" + xhr.status + " " + xhr.statusText + "</p></div>");
@@ -286,6 +284,7 @@ function SMD() {
         $html.find('[name=\'backend[zabbix][version]\']')[0].name = "backend[zabbix][" + len + "][version]";
         $html.find('[name=\'backend[zabbix][user]\']')[0].name = "backend[zabbix][" + len + "][user]";
         $html.find('[name=\'backend[zabbix][pass]\']')[0].name = "backend[zabbix][" + len + "][pass]";
+        $html.find('[name=\'backend[zabbix][level]\']')[0].name = "backend[zabbix][" + len + "][level]";
         $html.find('[name=\'backend[zabbix][active]\']')[0].name = "backend[zabbix][" + len + "][active]";
 
         return $html.html();
@@ -509,12 +508,6 @@ function SMD() {
         })
     };
 
-    /**
-     * Establecer los eventos para la vista de eventos
-     */
-    this.setDashboardHooks = function () {
-    };
-
     /**
      * Reproducir sonido
      */

diff --git a/js/functions.min.js b/js/functions.min.js