Commit 0c35dbeb authored by Franco Fichtner's avatar Franco Fichtner

dashboard: minor fixes for consistency and style

Log widget has a problem with config section unhide.
parent 80d2d039
...@@ -365,10 +365,10 @@ include("fbegin.inc");?> ...@@ -365,10 +365,10 @@ include("fbegin.inc");?>
</h3></li> </h3></li>
<li class="pull-right"> <li class="pull-right">
<div class="btn-group"> <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="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="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" 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> </div>
</li> </li>
</ul> </ul>
......
...@@ -322,8 +322,6 @@ endforeach; ...@@ -322,8 +322,6 @@ endforeach;
<!-- needed to display the widget settings menu --> <!-- needed to display the widget settings menu -->
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
selectIntLink = "log-configure"; $("#log-configure").toggleClass("disabled");
textlink = document.getElementById(selectIntLink);
textlink.style.display = "inline";
//]]> //]]>
</script> </script>
...@@ -97,8 +97,6 @@ endif ?> ...@@ -97,8 +97,6 @@ endif ?>
<!-- needed to show the settings widget icon --> <!-- needed to show the settings widget icon -->
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
selectIntLink = "picture-configure"; $("#picture-configure").toggleClass("disabled");
textlink = document.getElementById(selectIntLink);
textlink.style.display = "inline";
//]]> //]]>
</script> </script>
...@@ -170,8 +170,6 @@ if (!empty($config['widgets']['rsswidgettextlength']) && is_numeric($config['wid ...@@ -170,8 +170,6 @@ if (!empty($config['widgets']['rsswidgettextlength']) && is_numeric($config['wid
<!-- needed to display the widget settings menu --> <!-- needed to display the widget settings menu -->
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
selectIntLink = "rss-configure"; $("#rss-configure").toggleClass("disabled");
textlink = document.getElementById(selectIntLink);
textlink.style.display = "inline";
//]]> //]]>
</script> </script>
...@@ -103,8 +103,6 @@ if (isset($_POST['servicestatusfilter'])) { ...@@ -103,8 +103,6 @@ if (isset($_POST['servicestatusfilter'])) {
<!-- needed to display the widget settings menu --> <!-- needed to display the widget settings menu -->
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
selectIntLink = "services_status-configure"; $("#services_status-configure").toggleClass("disabled");
textlink = document.getElementById(selectIntLink);
textlink.style.display = "inline";
//]]> //]]>
</script> </script>
...@@ -75,8 +75,6 @@ if(is_numeric($_POST['logfiltercount'])) { ...@@ -75,8 +75,6 @@ if(is_numeric($_POST['logfiltercount'])) {
<!-- needed to display the widget settings menu --> <!-- needed to display the widget settings menu -->
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
selectIntLink = "system_log-configure"; $("#system_log-configure").toggleClass("disabled");
textlink = document.getElementById(selectIntLink);
textlink.style.display = "inline";
//]]> //]]>
</script> </script>
<?php <?php
/* /*
Copyright (C) 2014-2016 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
...@@ -113,7 +114,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -113,7 +114,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <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> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -159,7 +160,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -159,7 +160,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
<!-- template progress bar used for all constructed items in thermal_sensors_widget_update() --> <!-- template progress bar used for all constructed items in thermal_sensors_widget_update() -->
<div style="display:none" id="thermal_sensors_widget_progress_bar"> <div style="display:none" id="thermal_sensors_widget_progress_bar">
<div class="progress"> <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> </div>
<span class="info"> <span class="info">
</span> </span>
...@@ -173,6 +174,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -173,6 +174,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
<!-- needed to display the widget settings menu --> <!-- needed to display the widget settings menu -->
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
$("#thermal_sensors-configure").css({display: "inline"}); $("#thermal_sensors-configure").toggleClass("disabled");
//]]> //]]>
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment