Merge pull request #135 from khoa-nd/master

Merged
chrisshayan · Jan 6, 2015 · 7d114f1 · 7d114f1
2 parents 1579211 + a5e46b5
commit 7d114f1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 48 deletions.
diff --git a/src/main/webapp/assets/modules/app.js b/src/main/webapp/assets/modules/app.js
@@ -131,13 +131,13 @@ techlooper.run(function (shortcutFactory, connectionFactory, loadingBoxFactory,
     return rsLocationPathFn;
   }
 
-  connectionFactory.verifyUserLogin()
-    .then(function() {
-      utils.sendNotification(jsonValue.notifications.loginSuccess);
-    })
-    .catch(function() {
-      utils.sendNotification(jsonValue.notifications.loginFailed);
-    });
+  //connectionFactory.verifyUserLogin();
+    //.then(function() {
+    //  utils.sendNotification(jsonValue.notifications.loginSuccess);
+    //})
+    //.catch(function() {
+    //  //utils.sendNotification(jsonValue.notifications.loginFailed);
+    //});
 });
 
 techlooper

diff --git a/src/main/webapp/assets/modules/job/searchBox.ser.js b/src/main/webapp/assets/modules/job/searchBox.ser.js
@@ -100,7 +100,7 @@ angular.module("Jobs").factory("searchBoxService", function ($location, jsonValu
         if(view == jsonValue.views.pieChart || view == jsonValue.views.bubbleChart){
           $('.navi-container').find('a.m-chart').parent().addClass('active');
           $('.navi-container').find('a.m-search-jobs').parent().removeClass('active');
-          $('.main-navi-block').css('background','url(../images/line-h.png) #000 right top repeat-y');
+          $('.main-navi-block').css('background','url(images/line-h.png) #000 right top repeat-y');
         }
       });
       $('.btn-logo').click(function () {
@@ -109,7 +109,7 @@ angular.module("Jobs").factory("searchBoxService", function ($location, jsonValu
         if(view == jsonValue.views.pieChart || view == jsonValue.views.bubbleChart){
           $('.navi-container').find('a.m-chart').parent().addClass('active');
           $('.navi-container').find('a.m-search-jobs').parent().removeClass('active');
-          $('.main-navi-block').css('background','url(../images/line-h.png) #000 right top repeat-y');
+          $('.main-navi-block').css('background','url(images/line-h.png) #000 right top repeat-y');
         }
       });
 

diff --git a/src/main/webapp/assets/modules/navigation/navigation.ser.js b/src/main/webapp/assets/modules/navigation/navigation.ser.js
@@ -9,9 +9,6 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
           }, 300, function () {
             $(this).css('position', 'relative');
           });
-          $('.techlooper-body').animate({
-            'padding-left': 0
-          });
           $('.sub-page-header').animate({
             'padding-left': '90px'
           });
@@ -20,19 +17,12 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
           }, 300, function () {
             $(this).css('display', 'none');
           });
-
           $(this).removeClass('active');
         }
         else {
           $('.main-navi-block').animate({
             width: '85px'
           }).css('position', 'fixed');
-          $('.techlooper-body').animate({
-            'padding-left': '85px'
-          });
-          $('.sub-page-header').animate({
-            'padding-left': '20px'
-          });
           $('.navi-container').animate({
             'width': '100%'
           }).css('display', 'block');
@@ -83,6 +73,7 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
           break;
         case jsonValue.views.jobsSearch:
           $('.navi-container').find('a.m-search-jobs').parent().addClass('active');
+          $('.main-navi-block').css('background','url(images/line-h1.png) #ccc right top repeat-y');
           break;
         case jsonValue.views.signIn:
           $('.navi-container').find('a.sign-out-sign-in').parent().addClass('active');
@@ -93,17 +84,25 @@ angular.module("Navigation").factory("navigationService", function (utils, jsonV
       }
       var menuItem = $('.navi-container').find('li');
       menuItem.on('click', function(){
+        hideNavigationBar();
         if($(this).find('a').hasClass('m-chart') || $(this).find('a').hasClass('m-search-jobs') || $(this).find('a').hasClass('sign-out-sign-in')){
           menuItem.removeClass('active');
           $(this).addClass('active');
           if($(this).find('a').hasClass('m-search-jobs')){
-            $('.main-navi-block').css('background','url(../images/line-h1.png) #ccc right top repeat-y');
+            $('.main-navi-block').css('background','url(images/line-h1.png) #ccc right top repeat-y');
+          }else{
+            $('.main-navi-block').css('background','url(images/line-h.png) #000 right top repeat-y');
+            $('body').css('background-color','#201d1e');
           }
         }
       });
     }
   }
-
+  function hideNavigationBar(){
+    $('.main-navi-block').css('width', '0px');
+    $('.navi-container').css({'width': '0%', 'display': 'none'});
+    $('.manager-navi').find('.fa-bars').removeClass('active');
+  }
   var instance = {
     initialize: function () {
       $$.updateChartButton();

diff --git a/src/main/webapp/assets/sass/main.sass b/src/main/webapp/assets/sass/main.sass
@@ -263,9 +263,9 @@ ul.setting-items
       a.m-languages.en
         background-position: 9px -517px
       a.m-sign-out
-        background-position: 13px -358px !important
+        background-position: 13px -280px !important
       a.m-sign-in
-        background-position: 13px -280px
+        background-position: 13px -358px
       a.m-user-profile
         background: transparent
         border-radius: 50%
@@ -295,9 +295,9 @@ ul.setting-items
       a.m-languages.en:hover
         background-position: -65px -517px
       a.m-sign-out:hover
-        background-position: -61px -358px
-      a.m-sign-in:hover
         background-position: -61px -280px
+      a.m-sign-in:hover
+        background-position: -61px -358px
       a.m-user-profile:hover
         background: transparent
       a.m-tour-guide:hover
@@ -316,9 +316,9 @@ ul.setting-items
       a.m-languages.en
         background-position: -65px -517px
       a.m-sign-out
-        background-position: -61px -358px
-      a.m-sign-in
         background-position: -61px -280px
+      a.m-sign-in
+        background-position: -61px -358px
       a.m-user-profile
         background: transparent
       a.m-tour-guide

diff --git a/src/main/webapp/assets/sass/z-responsive.sass b/src/main/webapp/assets/sass/z-responsive.sass
@@ -28,25 +28,6 @@
   .signin-signout-block
     width: 10%
 
-  .logo
-    width: 100%
-    padding: 5px 5px 5px 0
-    position: relative
-    img
-      width: auto
-      max-height: 60px
-      position: absolute
-      left: 0
-      top: 50px
-      right: 0
-      bottom: 0
-      margin: auto
-
-    h1
-      line-height: 0
-      margin: 0
-      padding: 0
-
   .bubble-chart-block
     width: 65%
   .chart-block
@@ -377,5 +358,8 @@
       text-align: center
 @media (max-width: 440px)
   .logo-block img
-    max-width: 90% !important
-    padding-top: 5px
+    max-width: 55% !important
+    padding-top: 8px
+  .sub-page-header
+    .logo-block img
+      max-width: 85% !important