Merge pull request #69 from NanoTools/develop

Bugfix release 1.4.5
NanoTools · May 4, 2018 · d0efdf2 · d0efdf2
2 parents b4b5b4b + 5c31170
commit d0efdf2
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 14 deletions.
diff --git a/modules/constants.php b/modules/constants.php
@@ -1,7 +1,7 @@
 <?php
 
 // the project version
-define('PROJECT_VERSION', '1.4.4');
+define('PROJECT_VERSION', '1.4.5');
 
 // project URL
 define('PROJECT_URL', 'https://github.com/NanoTools/nanoNodeMonitor');

diff --git a/modules/defaults.php b/modules/defaults.php
@@ -7,7 +7,7 @@
 // ----------- General Variables -----------
 
 // Theme of your Node Monitor (dark or light)
-$themeChoice = 'dark';
+$themeChoice = 'light';
 
 // autorefresh interval for the status webpage in seconds
 $autoRefreshInSeconds = 5;

diff --git a/modules/footer.php b/modules/footer.php
@@ -1,15 +1,25 @@
 <footer id="footer">
-  <p><?php echo getVersionInformation(); ?><br>
-  GitHub: <a href="<?php echo PROJECT_URL; ?>" target="_blank">Source</a> | <a href="<?php echo PROJECT_URL . '/wiki'; ?>" target="_blank">Wiki</a> | <a href="<?php echo PROJECT_URL . '/wiki/API-Description'; ?>" target="_blank">API</a></p>
-  <br>
-  <p class=small>Made by <a href="https://github.com/NanoTools" target="_blank">Nano Tools</a>.
-  <br>
-  Representative: <a href="<?php echo getAccountUrl(NODEMON_REP_ACCOUNT, 'ninja'); ?>" target="_blank"><?php echo NODEMON_REP_ACCOUNT; ?></a>
-  <button id="copyAccount" class="btn btn-sm btn-link btn-clipboard-light" data-clipboard-text="<?php echo NODEMON_REP_ACCOUNT; ?>" title="Copy"><i class="fas fa-clipboard fa-lg"></i></button> 
+
+  <p>
+   <?php echo getVersionInformation(); ?>
+   <br>
+    Made by <a href="https://github.com/NanoTools" target="_blank">Nano Tools</a>.
+   <br>
+    GitHub: <a href="<?php echo PROJECT_URL; ?>" target="_blank">Source</a> | <a href="<?php echo PROJECT_URL . '/wiki'; ?>" target="_blank">Wiki</a> | <a href="<?php echo PROJECT_URL . '/wiki/API-Description'; ?>" target="_blank">API</a>  
   </p>
-  <p class=small>
-  Donations to Nano Node Monitor: <a href="<?php echo getAccountUrl(NODEMON_DON_ACCOUNT, $blockExplorer); ?>" target="_blank"><?php echo NODEMON_DON_ACCOUNT; ?></a>
-  <button id="copyAccount" class="btn btn-sm btn-link btn-clipboard-light" data-clipboard-text="<?php echo NODEMON_DON_ACCOUNT; ?>" title="Copy"><i class="fas fa-clipboard fa-lg"></i></button> 
+
+
+  <p class=truncate>
+   <small>
+    <br>
+    Representative: <a href="<?php echo getAccountUrl(NODEMON_REP_ACCOUNT, 'ninja'); ?>" target="_blank"><?php echo NODEMON_REP_ACCOUNT; ?></a>
+   </small>
+   <button id="copyAccount" class="btn btn-sm btn-link btn-clipboard-light" data-clipboard-text="<?php echo NODEMON_REP_ACCOUNT; ?>" title="Copy"><i class="fas fa-clipboard fa-lg"></i></button>
+   <br>
+   <small>
+    Donations to Nano Node Monitor: <a href="<?php echo getAccountUrl(NODEMON_DON_ACCOUNT, $blockExplorer); ?>" target="_blank"><?php echo NODEMON_DON_ACCOUNT; ?></a>
+   </small>
+   <button id="copyAccount" class="btn btn-sm btn-link btn-clipboard-light" data-clipboard-text="<?php echo NODEMON_DON_ACCOUNT; ?>" title="Copy"><i class="fas fa-clipboard fa-lg"></i></button>
   </p>
 </footer>
 
@@ -21,5 +31,7 @@
 <script src="static/js/handlebars-v4.0.11.js?v=<?php echo PROJECT_VERSION; ?>"></script>
 <script src="static/js/main.js?v=<?php echo PROJECT_VERSION; ?>"></script>
 
+
+
 </body>
 </html>
diff --git a/static/js/index.js b/static/js/index.js
@@ -32,11 +32,11 @@ function updateStats(){
   .done(function (apidata) {
     $('#content').html(template(apidata));
     new ClipboardJS('#copyAccount');
-    //setTimeout(updateStats, GLOBAL_REFRESH * 1000);
+    setTimeout(updateStats, GLOBAL_REFRESH * 1000);
   })
   .fail(function (apidata) {
     $('#content').html(apidata.responseText);
     console.log('FAIL', apidata.responseText);
     setTimeout(updateStats, GLOBAL_REFRESH * 1000);
   });
-}
+}
diff --git a/static/themes/dark/css/theme.css b/static/themes/dark/css/theme.css
@@ -35,6 +35,11 @@ body {
     border-bottom: 1px solid #242a38;
 }
 
+.navbar-toggler-icon {
+  background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(243,136,46, 1)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
+}
+
+
 
 .n-logo-theme {
     color: #ffffff;

diff --git a/static/themes/light/css/theme.css b/static/themes/light/css/theme.css
@@ -34,6 +34,12 @@ body {
     padding: 1.5% 4%;
 }
 
+
+.navbar-toggler-icon {
+  background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(74,144,226, 1)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
+}
+
+
 .n-logo-theme {
     color: #0f1121;
     padding-left: 12px;
@@ -43,6 +49,7 @@ body {
     color: #0f1121;
 }
 
+
 .nav-link:hover {
     color: #ffffff;
     width: 100%;