Merge pull request #62 from dblachut/master

Reading count in same line as date, smallTitle more visible style
trekawek · Apr 9, 2021 · 2bf664e · 2bf664e
2 parents d3ea8e7 + d81262e
commit 2bf664e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/src/htdocs/locale/cs.php b/src/htdocs/locale/cs.php
@@ -161,6 +161,7 @@
 $locale['Radius (m)'] = 'Polomě (m)';
 $locale['Range'] = 'Rozsah';
 // $locale['Reading count'] = '';
+// $locale['Readings'] = '';
 $locale['Redirect home page'] = 'Přesměrovat home page';
 $locale['Received JSONs'] = 'Přijaté JSONs';
 $locale['register'] = 'registrovat';

diff --git a/src/htdocs/locale/en.php b/src/htdocs/locale/en.php
@@ -168,6 +168,7 @@
 $locale['Radius (m)'] = '';
 $locale['Range'] = '';
 $locale['Reading count'] = '';
+$locale['Readings'] = '';
 $locale['Redirect home page'] = '';
 $locale['Received JSONs'] = '';
 $locale['register'] = '';

diff --git a/src/htdocs/locale/hu.php b/src/htdocs/locale/hu.php
@@ -161,6 +161,7 @@
 $locale['Radius (m)'] = 'Sugár (m)';
 $locale['Range'] = 'Távolság';
 // $locale['Reading count'] = '';
+// $locale['Readings'] = '';
 $locale['Redirect home page'] = 'Honlap átirányítása';
 $locale['Received JSONs'] = 'Fogadott JSON adatok';
 $locale['register'] = 'regisztrálás';

diff --git a/src/htdocs/locale/pl.php b/src/htdocs/locale/pl.php
@@ -170,6 +170,7 @@
 $locale['Radius (m)'] = 'Promień (m)';
 $locale['Range'] = 'Zakres';
 $locale['Reading count'] = 'Liczba pomiarów';
+$locale['Readings'] = 'Pomiary';
 $locale['Redirect home page'] = 'Przekieruj stronę domową';
 $locale['Received JSONs'] = 'Otrzymane JSONy';
 $locale['register'] = 'rejestruj';

diff --git a/src/htdocs/locale/ro.php b/src/htdocs/locale/ro.php
@@ -149,6 +149,7 @@
 $locale['Radius (m)'] = 'Radius (m)';
 $locale['Range'] = 'Gamă';
 // $locale['Reading count'] = '';
+// $locale['Readings'] = '';
 $locale['Redirect home page'] = 'Redirecționeză către prima pagină';
 $locale['Received JSONs'] = 'Received JSONs';
 $locale['register'] = 'înregistrează-te';

diff --git a/src/htdocs/partials/sensors/avg-switch.php b/src/htdocs/partials/sensors/avg-switch.php
@@ -1,10 +1,10 @@
 <div class="row">
     <div class="col-md-8 offset-md-2 text-center">
-    <small><?php echo __('Average') ?>:
+    <small><span class="smallTitle"><?php echo __('Average') ?></span>:
     (<?php
         foreach (array('0' => __('Last'), '0.25' => '15m', '1' => '1h', '24' => '24h') as $value => $name) {
           if ($currentAvgType == $value) {
-            echo "<strong>$name</strong>";
+            echo "$name";
           } else if ($currentController == 'main' && $currentAction == 'all') {
             echo "<a href=\"".l('main', 'all', null, array('node_id' => $nodeId), array('avgType' => $value))."\">$name</a>";
           } else {

diff --git a/src/htdocs/partials/sensors/table.php b/src/htdocs/partials/sensors/table.php
@@ -123,9 +123,9 @@
           }
         ?>
         <small class="<?php echo $lastUpdatedClass ?>">
-          <?php echo __('Last update') ?>: <?php echo date("Y-m-d H:i:s", $sensors['last_update']); ?>.
-        </small><br/>
-        <small><?php echo __('Reading count') ?>: <?php echo $averages['values']['count']; ?>.</small>
+          <span class="smallTitle"><?php echo __('Last update') ?></span>: <?php echo date("Y-m-d H:i:s", $sensors['last_update']); ?>.
+        </small>
+        <small><span class="smallTitle"><?php echo __('Readings') ?></span>: <?php echo $averages['values']['count']; ?>.</small>
       </td>
     </tr>
   </tbody>

diff --git a/src/htdocs/public/css/style.css b/src/htdocs/public/css/style.css
@@ -243,4 +243,9 @@ a.disabled {
 
 .darkly .colorOrange {
   color: orangered;
-}
+}
+
+.smallTitle {
+  text-decoration: underline;
+  font-weight: bolder;
+}