From 0c35dbebfaf24cc6b4e1e31ced128dba1b7efa59 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 9 May 2016 16:05:22 +0200
Subject: [PATCH] dashboard: minor fixes for consistency and style

Log widget has a problem with config section unhide.
---
 src/www/index.php                                  | 2 +-
 src/www/widgets/widgets/log.widget.php             | 4 +---
 src/www/widgets/widgets/picture.widget.php         | 4 +---
 src/www/widgets/widgets/rss.widget.php             | 4 +---
 src/www/widgets/widgets/services_status.widget.php | 4 +---
 src/www/widgets/widgets/system_log.widget.php      | 4 +---
 src/www/widgets/widgets/thermal_sensors.widget.php | 7 ++++---
 7 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/www/index.php b/src/www/index.php
index 7b55ef95d..2633235b8 100644
--- a/src/www/index.php
+++ b/src/www/index.php
@@ -365,10 +365,10 @@ include("fbegin.inc");?>
                   </h3></li>
                   <li class="pull-right">
                     <div class="btn-group">
+                      <button type="button" class="btn btn-default btn-xs disabled" id="<?= $widgetItem['name'] ?>-configure" onclick='return configureWidget("<?=  $widgetItem['name'] ?>")' style="cursor:pointer" ><span class="glyphicon glyphicon-pencil"></span></button>
                       <button type="button" class="btn btn-default btn-xs" title="minimize" id="<?= $widgetItem['name'] ?>-min" onclick='return minimizeWidget("<?= $widgetItem['name'] ?>",true)' style="display:<?= $mindiv ?>;"><span class="glyphicon glyphicon-minus"></span></button>
                       <button type="button" class="btn btn-default btn-xs" title="maximize" id="<?= $widgetItem['name'] ?>-max" onclick='return showWidget("<?= $widgetItem['name'] ?>",true)' style="display:<?= $mindiv == 'none' ? 'inline' : 'none' ?>;"><span class="glyphicon glyphicon-plus"></span></button>
                       <button type="button" class="btn btn-default btn-xs" title="remove widget" onclick='return closeWidget("<?= $widgetItem['name'] ?>",true)'><span class="glyphicon glyphicon-remove"></span></button>
-                      <button type="button" class="btn btn-default btn-xs" id="<?= $widgetItem['name'] ?>-configure" onclick='return configureWidget("<?=  $widgetItem['name'] ?>")' style="display:none; cursor:pointer" ><span class="glyphicon glyphicon-pencil"></span></button>
                     </div>
                   </li>
                 </ul>
diff --git a/src/www/widgets/widgets/log.widget.php b/src/www/widgets/widgets/log.widget.php
index c8c67deb4..26a53b969 100644
--- a/src/www/widgets/widgets/log.widget.php
+++ b/src/www/widgets/widgets/log.widget.php
@@ -322,8 +322,6 @@ endforeach;
 <!-- needed to display the widget settings menu -->
 <script type="text/javascript">
 //<![CDATA[
-  selectIntLink = "log-configure";
-  textlink = document.getElementById(selectIntLink);
-  textlink.style.display = "inline";
+  $("#log-configure").toggleClass("disabled");
 //]]>
 </script>
diff --git a/src/www/widgets/widgets/picture.widget.php b/src/www/widgets/widgets/picture.widget.php
index f979ecb0d..a348747dd 100644
--- a/src/www/widgets/widgets/picture.widget.php
+++ b/src/www/widgets/widgets/picture.widget.php
@@ -97,8 +97,6 @@ endif ?>
 <!-- needed to show the settings widget icon -->
 <script type="text/javascript">
 //<![CDATA[
-  selectIntLink = "picture-configure";
-  textlink = document.getElementById(selectIntLink);
-  textlink.style.display = "inline";
+  $("#picture-configure").toggleClass("disabled");
 //]]>
 </script>
diff --git a/src/www/widgets/widgets/rss.widget.php b/src/www/widgets/widgets/rss.widget.php
index baa76a0d3..f194ab455 100644
--- a/src/www/widgets/widgets/rss.widget.php
+++ b/src/www/widgets/widgets/rss.widget.php
@@ -170,8 +170,6 @@ if (!empty($config['widgets']['rsswidgettextlength']) && is_numeric($config['wid
 <!-- needed to display the widget settings menu -->
 <script type="text/javascript">
 //<![CDATA[
-    selectIntLink = "rss-configure";
-    textlink = document.getElementById(selectIntLink);
-    textlink.style.display = "inline";
+  $("#rss-configure").toggleClass("disabled");
 //]]>
 </script>
diff --git a/src/www/widgets/widgets/services_status.widget.php b/src/www/widgets/widgets/services_status.widget.php
index 104143bb7..19bb66151 100644
--- a/src/www/widgets/widgets/services_status.widget.php
+++ b/src/www/widgets/widgets/services_status.widget.php
@@ -103,8 +103,6 @@ if (isset($_POST['servicestatusfilter'])) {
 <!-- needed to display the widget settings menu -->
 <script type="text/javascript">
 //<![CDATA[
-  selectIntLink = "services_status-configure";
-  textlink = document.getElementById(selectIntLink);
-  textlink.style.display = "inline";
+  $("#services_status-configure").toggleClass("disabled");
 //]]>
 </script>
diff --git a/src/www/widgets/widgets/system_log.widget.php b/src/www/widgets/widgets/system_log.widget.php
index ae26f9050..7da11e7d5 100644
--- a/src/www/widgets/widgets/system_log.widget.php
+++ b/src/www/widgets/widgets/system_log.widget.php
@@ -75,8 +75,6 @@ if(is_numeric($_POST['logfiltercount'])) {
 <!-- needed to display the widget settings menu -->
 <script type="text/javascript">
 //<![CDATA[
-  selectIntLink = "system_log-configure";
-  textlink = document.getElementById(selectIntLink);
-  textlink.style.display = "inline";
+  $("#system_log-configure").toggleClass("disabled");
 //]]>
 </script>
diff --git a/src/www/widgets/widgets/thermal_sensors.widget.php b/src/www/widgets/widgets/thermal_sensors.widget.php
index 95bb854f6..98a12e7bc 100644
--- a/src/www/widgets/widgets/thermal_sensors.widget.php
+++ b/src/www/widgets/widgets/thermal_sensors.widget.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
     Copyright (C) 2014-2016 Deciso B.V.
 
@@ -113,7 +114,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     <table class="table table-striped">
       <thead>
         <tr>
-          <th colspan="2"><?= gettext('Thresholds in &deg;C (1 to 100):') ?></th>
+          <th colspan="2"><?= gettext('Thresholds in °C (1 to 100):') ?></th>
         </tr>
       </thead>
       <tbody>
@@ -159,7 +160,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 <!-- template progress bar used for all constructed items in thermal_sensors_widget_update() -->
 <div style="display:none" id="thermal_sensors_widget_progress_bar">
   <div class="progress">
-    <div class="progress-bar progress-bar-striped progress-bar-success active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%"></div>
+    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%"></div>
   </div>
   <span class="info">
   </span>
@@ -173,6 +174,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 <!-- needed to display the widget settings menu -->
 <script type="text/javascript">
 //<![CDATA[
-  $("#thermal_sensors-configure").css({display: "inline"});
+  $("#thermal_sensors-configure").toggleClass("disabled");
 //]]>
 </script>