Merge pull request #44 from VonOx/master

Adding footer, version and links in front
GladysAssistant · Nov 29, 2015 · 0c1b049 · 0c1b049
2 parents 301a23e + e5f6c85
commit 0c1b049
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 4 deletions.
diff --git a/api/services/StartService.js b/api/services/StartService.js
@@ -14,6 +14,8 @@
  * @help :: See http://links.sailsjs.org/docs/controllers
  */
 
+fs = require('fs');
+
 module.exports = {
 
 	/**
@@ -41,6 +43,13 @@ module.exports = {
 		sails.config.Event.emit('sailsReady');
 		// new way
 		gladys.emit('sailsReady');
+		// get version of Gladys from package.json
+		try {
+			json = JSON.parse(fs.readFileSync('package.json'));
+		} catch(e) {
+			console.error('Cannot parse package.json');
+		}
+		gladys.version = json.version;
 	}
 
 

diff --git a/assets/js/AdminLTE/app.js b/assets/js/AdminLTE/app.js
@@ -29,6 +29,7 @@ $(function() {
             $('.left-side').toggleClass("collapse-left");
             $(".right-side").toggleClass("strech");
         }
+        $(".main-footer").toggleClass('full-width');
     });
 
     //Add hover support for touch devices

diff --git a/assets/less/core.less b/assets/less/core.less
@@ -103,7 +103,7 @@ body.fixed {
 
 /* Content */
 .content {
-    padding: 20px 15px;
+    padding: 20px 15px 50px 15px;
     background: @body-bg;
     overflow: auto;
 }
@@ -416,7 +416,27 @@ Gradient Background colors
     color: #fff;
 }
 
-
 .connectedSortable {
     min-height: 100px;
+}
+
+.main-footer {
+    background: #fff;
+    padding: 15px;
+    color: #555;
+    height: 50px;
+    border-top: 1px solid #eee;
+    margin-left: 220px;
+    margin-top: -50px;
+    &.full-width {
+        margin-left: 0;
+    }
+}
+.main-footer a {
+    color: #555;
+    margin-right:5px;
+}
+.main-footer span {
+    color: #555;
+    margin-right:5px;
 }
diff --git a/assets/styles/AdminLTE.css b/assets/styles/AdminLTE.css
@@ -297,7 +297,7 @@ body.fixed .wrapper {
 }
 /* Content */
 .content {
-  padding: 20px 15px;
+  padding: 20px 15px 50px 15px;
   background: #f9f9f9;
   overflow: auto;
 }
@@ -3722,3 +3722,24 @@ fieldset[disabled] .btn-vk.active {
   color: #587ea3;
   background-color: #ffffff;
 }
+
+.main-footer {
+    background: #fff;
+    padding: 15px;
+    color: #555;
+    height: 50px;
+    border-top: 1px solid #eee;
+    margin-left: 220px;
+    margin-top: -50px;
+    &.full-width {
+        margin-left: 0;
+    }
+}
+.main-footer a {
+    color: #555;
+    margin-right:5px;
+}
+.main-footer span {
+    color: #555;
+    margin-right:5px;
+}
diff --git a/views/layout.ejs b/views/layout.ejs
@@ -173,7 +173,13 @@
 
         </div><!-- ./wrapper -->
 
-
+        <footer class="main-footer hidden-sm hidden-xs">
+          <div class="pull-right">
+            <span>Gladys <%= gladys.version %></span>
+            <a class="fa fa-github-alt" href="https://github.com/GladysProject/Gladys" target="_blank"></a>
+            <a class="fa fa-link" href="http://gladysproject.com" target="_blank"></a>
+          </div>            
+        </footer>