Merge pull request #44 from adamfitzgibbon/Icons

Added icons to application and notifications

Gruntfile.js

@@ -16,7 +16,7 @@ module.exports = function(grunt) {
         command: 'cd HCCGo/ && npm start'
       },
       build_electron: {
-        command: 'cd HCCGo/ && npm run-script packageWin'
+        command: 'cd HCCGo/ && npm run-script packageOsx'
       }
     },
     auto_install: {

HCCGo/app/css/application.less

@@ -33,6 +33,10 @@ body {
 
 }
 
+.navIcon {
+  height: 130%;
+}
+
 .highlight {
   background-color: #F1F5F8;
 }
@@ -264,7 +268,7 @@ div.historyinfo {
   top: -0px;
 }
 
-.status-check 
+.status-check
 {
 	stroke-dasharray: 110;
 	stroke-dashoffset: -110;
@@ -275,7 +279,7 @@ div.historyinfo {
 {
   stroke-dasharray: 110;
   stroke-dashoffset: -110;
-  stroke-width: 0; 
+  stroke-width: 0;
 }
 
 .status-anx-complete
@@ -288,24 +292,24 @@ div.historyinfo {
 
 }
 
-.status-check-complete 
-{   
+.status-check-complete
+{
 	animation: status-check 1s ease-in forwards;
 	stroke-width: 15;
 	stroke-dashoffset: 0;
   stroke: #009900;
   transition: status-stroke 1.6s;
 }
 
-.status-fill 
+.status-fill
 {
 	stroke-dasharray: 285;
 	stroke-dashoffset: -100;
 	animation: status-spin-fill 3s linear infinite forwards;
   transform-origin: 50% 50%;
 }
 
-.status-fill-complete 
+.status-fill-complete
 {
 	animation: status-fill 1s ease-out forwards;
 }
@@ -352,6 +356,3 @@ div.historyinfo {
   stroke: #f44336;
   transition: status-stroke 1.6s;
 }
-
-
-

HCCGo/app/html/navbar.html

@@ -1,25 +1,35 @@
 <div class="navbar navbar-hcc" ng-controller="NavCtrl">
   <div class="navbar-header">
-    <a ng-click="goHome()" class="navbar-brand" href="javascript:void(0)">HCC Go</a>
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a ng-click="goHome()" class="navbar-brand" href="javascript:void(0)">
+      <img class="navIcon" src="../icons/HCCGo.png" />
+    </a>
   </div>
-  
-  <div class="navbar-collapse collapse navbar-responsive-collapse">
+
+  <div class="navbar-collapse collapse navbar-responsive-collapse" id="myNavbar">
   <!--File Management Dropdown -->
     <ul class="nav navbar-nav">
-       <button type="button" 
-           ng-click="jobHistory()" 
+      <li>
+       <button type="button"
+           ng-click="jobHistory()"
            class="navbar-left btn btn-success navbar-btn btn-primary">
                Submit
        </button>
-       <button type="button" 
-           ng-click="goToSCP()" 
+      </li>
+     <li>
+       <button type="button"
+           ng-click="goToSCP()"
            class="navbar-left btn btn-secondary navbar-btn btn-primary">
                File Management
        </button>
-
+     </li>
     </ul>
-   
-    
+
+
     <ul class="nav navbar-nav navbar-right">
       <li class="dropdown">
         <a href="javascript:void(0)" data-target="#" class="dropdown-toggle" data-toggle="dropdown"> {{username}}@{{params.clusterId}} <b class="caret"></b></a>
@@ -29,8 +39,8 @@
       </li>
     </ul>
 
-   
- 
-    
+
+
+
   </div>
 </div>

HCCGo/app/js/NotifierService.js

@@ -1,24 +1,24 @@
 
 notifierModule = angular.module('NotifierModule', ['toastr'])
 
-notifierModule.factory('notifierService',['$log', '$q', '$routeParams', 'toastr', 
+notifierModule.factory('notifierService',['$log', '$q', '$routeParams', 'toastr',
                                            function($log, $q, $routeParams, toastr) {
-  
+
    const {ipcRenderer} = require('electron');
    const notifier = require('node-notifier');
    var path = require('path');
    var fs = require('fs');
-   
+
    const toastrOptions = {closeButton: true,
                           timeOut: 5000,
                           extendedTimeOut: 5000,
                           progressBar: true};
-   
+
    /**
    * To notify user of application dependent on window focus
    *
    */
-   
+
   // Get window focus status
   var getWinFocus = function() {
     var deferred = $q.defer();
@@ -28,29 +28,28 @@ notifierModule.factory('notifierService',['$log', '$q', '$routeParams', 'toastr'
       });
       ipcRenderer.send('focus-check-reply', 'ping');
 	return deferred.promise;
-  }  
-   
+  }
+
   // Pop a success message
   var success = function(msg, title) {
     getWinFocus().then(function (response) {
       if (response) {
 	    toastr.success(msg, title, toastrOptions);
-	  } else {
+	    } else {
 	    notifier.notify({
 	      title: title,
-		  message: msg,
-		  icon: void 0,
-		  sound: false,
-		  wait: false
+  		  message: msg,
+  		  icon: path.join(__dirname, '../icons/HCCGo.png'),
+  		  sound: false,
+  		  wait: false
 	    }, function (err, response) {
 	      if (err) {
 		    $log.debug(err);
 		  }
 	    })
 	  }
-	});
+	 });
   }
-
   // Pop a warning message
   var warning = function(msg) {
     getWinFocus().then(function (response) {
@@ -60,7 +59,7 @@ notifierModule.factory('notifierService',['$log', '$q', '$routeParams', 'toastr'
 	    notifier.notify({
 	      title: 'Warning!',
 		  message: msg,
-		  icon: void 0,
+		  icon: path.join(__dirname, '../icons/HCCGo.png'),
 		  sound: false,
 		  wait: false
 	    }, function (err, response) {
@@ -81,7 +80,7 @@ notifierModule.factory('notifierService',['$log', '$q', '$routeParams', 'toastr'
 	    notifier.notify({
 	      title: title,
 		  message: msg,
-		  icon: void 0,
+		  icon: path.join(__dirname, '../icons/HCCGo.png'),
 		  sound: false,
 		  wait: false
 	    }, function (err, response) {
@@ -92,11 +91,11 @@ notifierModule.factory('notifierService',['$log', '$q', '$routeParams', 'toastr'
 	  }
 	});
   }
-  
+
   return {
   success: success,
   warning: warning,
   error: error
   }
-  
+
 }]);

HCCGo/package.json

@@ -5,9 +5,9 @@
   "description": "Interface for HCC Resouces",
   "scripts": {
     "start": "electron .",
-    "packageWin": "node ./node_modules/electron-packager/cli.js ./ HCCGo --platform=win32 --arch=all --out ../packageWin/ --version 1.2.6 --overwrite",
-    "packageOsx": "node ./node_modules/electron-packager/cli.js ./ HCCGo --platform=darwin --arch=x64 --out ../packageOsx/ --version 1.2.6 --overwrite",
-    "packageNix": "node ./node_modules/electron-packager/cli.js ./ HCCGo --platform=linux --arch=all --out ../packageNix/ --version 1.2.6 --overwrite",
+    "packageWin": "node ./node_modules/electron-packager/cli.js ./ HCCGo --platform=win32 --arch=all --out ../packageWin/ --version 1.2.6 --overwrite --icon ./icons/HCCGo",
+    "packageOsx": "node ./node_modules/electron-packager/cli.js ./ HCCGo --platform=darwin --arch=x64 --out ../packageOsx/ --version 1.2.6 --overwrite --icon ./icons/HCCGo",
+    "packageNix": "node ./node_modules/electron-packager/cli.js ./ HCCGo --platform=linux --arch=all --out ../packageNix/ --version 1.2.6 --overwrite --icon ./icons/HCCGo",
     "postinstall": "./postinstall.js"
   },
   "keywords": [