From 4c7e41b71b8166d01dc1c27043f1522f74a9bcde Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 19 Mar 2014 01:26:20 -0600 Subject: [PATCH] Lots of work on front-end --- config.json | 1 + libs/website.js | 7 ++++--- website/home.html | 2 +- website/index.html | 16 ++++++++-------- website/stats.html | 2 ++ website/style.css | 27 ++++++++------------------- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/config.json b/config.json index 40f2c9f..0c0d3cb 100644 --- a/config.json +++ b/config.json @@ -18,6 +18,7 @@ }, "website": { "enabled": true, + "siteTitle": "Cryppit", "port": 80, "statUpdateInterval": 5 }, diff --git a/libs/website.js b/libs/website.js index 6292a8e..605382f 100644 --- a/libs/website.js +++ b/libs/website.js @@ -75,7 +75,8 @@ module.exports = function(logger){ for (var pageName in pageTemplates){ pageProcessed[pageName] = pageTemplates[pageName]({ poolsConfigs: poolConfigs, - stats: portalApi.stats + stats: portalApi.stats, + portalConfig: portalConfig }); } }; @@ -133,11 +134,11 @@ module.exports = function(logger){ var requestedPage = getPage(pageId); if (requestedPage){ var data = pageTemplates.index({ - siteTitle: websiteConfig.siteTitle, page: requestedPage, selected: pageId, stats: portalApi.stats, - poolConfigs: poolConfigs + poolConfigs: poolConfigs, + portalConfig: portalConfig }); res.send(data); } diff --git a/website/home.html b/website/home.html index 6951753..53d5751 100644 --- a/website/home.html +++ b/website/home.html @@ -1 +1 @@ -
Welcome to Cryppit - The first multi-pool running on NOMP!
\ No newline at end of file +
Welcome to {{=it.portalConfig.website.siteTitle}}! - The first multi-pool running on NOMP!
\ No newline at end of file diff --git a/website/index.html b/website/index.html index e6532bf..1b70889 100644 --- a/website/index.html +++ b/website/index.html @@ -13,7 +13,7 @@ - {{=it.siteTitle}} + {{=it.portalConfig.website.siteTitle}} @@ -23,10 +23,10 @@
@@ -43,11 +43,11 @@
This site is powered by the open source NOMP project created by Matthew Little and licensed under the GPL
-
Support this project by donating  BTC: 1KRotMnQpxu3sePQnsVLRy3EraRFYfJQFR
+
  Support this project by donating  BTC: 1KRotMnQpxu3sePQnsVLRy3EraRFYfJQFR
- Community:  #nomp IRC + Community  :  #nomp IRC   |   - /r/nomp + /r/nomp   |  
diff --git a/website/stats.html b/website/stats.html index 8b6ec10..ccab08e 100644 --- a/website/stats.html +++ b/website/stats.html @@ -1,3 +1,5 @@
fancy graphs here +
+ {{=JSON.stringify(it.stats)}}
\ No newline at end of file diff --git a/website/style.css b/website/style.css index 9a3ffe2..6684e86 100644 --- a/website/style.css +++ b/website/style.css @@ -1,3 +1,6 @@ +html{ + height: 100%; +} body{ min-height: 100vh; overflow: hidden; @@ -12,6 +15,8 @@ body{ -moz-flex-direction: column; -ms-flex-direction: column; flex-direction: column; + + } header{ background-color: #f3f2ef; @@ -74,22 +79,6 @@ footer a{ } - -footer > div{ - display: -webkit-box; - display: -webkit-flex; - display: -moz-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -webkit-align-items: center; - -moz-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -webkit-justify-content: center; - -moz-box-pack: center; - -ms-flex-pack: center; - justify-content: center; -} - +footer iframe{ + vertical-align: middle; +} \ No newline at end of file