Merge pull request maestrano#46 from alexnoox/bugfixes

Bugfixes
aluqueGH · Aug 22, 2016 · 36c8835 · 36c8835
2 parents 47f0cd2 + 41ff29e
commit 36c8835
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 89 deletions.
diff --git a/src/app/components/mnoe-api/app-instances.svc.coffee b/src/app/components/mnoe-api/app-instances.svc.coffee
@@ -13,7 +13,6 @@ angular.module 'mnoEnterpriseAngular'
       cache = MnoLocalStorage.getObject(MnoeCurrentUser.user.id + "_" + LOCALSTORAGE.appInstancesKey)
       if cache?
         # Process the cache
-        @clearCache
         processAppInstances(cache)
         # Return the promised cache
         return $q.resolve(cache)

diff --git a/src/app/stylesheets/custom/accordion.less b/src/app/stylesheets/custom/accordion.less
@@ -6,7 +6,8 @@
 
   .panel-group > .panel,
   .panel-group > .panel > .panel-heading {
-    background-color: white;
+    color: @text-strong-color;
+    background-color: @bg-inverse-color;
     border: none;
     box-shadow: none;
   }

diff --git a/src/app/stylesheets/custom/button.less b/src/app/stylesheets/custom/button.less
@@ -54,22 +54,6 @@
     }
   }
 
-  &.btn-grey {
-    background-color: @decorator-inverse-color;
-    border: solid 1px @bg-main-color;
-    color: lighten(@bg-inverse-color,5%);
-    font-weight: 400;
-
-    &:hover {
-      color: @bg-inverse-color;
-      background-color: darken(@bg-main-color,5%);
-    }
-
-    &.btn-grey-bordered {
-      border: solid 1px darken(@bg-main-color,5%);
-    }
-  }
-
   &.btn-whited {
     background-color: lighten(#ccc,15%);
     border: solid 1px #ccc;

diff --git a/src/app/stylesheets/custom/form.less b/src/app/stylesheets/custom/form.less
@@ -25,22 +25,6 @@ form label {
   background-color: @input-bg;
 }
 
-
-select {
-    text-indent: 1px;
-    text-overflow: '';
-}
-
-// Remove dropdown arrow (Chrome, Firefox and IE)
-select.unstyled {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-}
-
-select::-ms-expand {
-    display: none;
-}
-
 //----------------------------------------
 // Styling for phone: select + input
 //----------------------------------------
@@ -106,7 +90,6 @@ form.inverse {
 //------------------------------------
 // Dark forms styles
 //------------------------------------
-
 form.dark {
   input[type='text'], input[type='email'], textarea {
     border-radius: 5px;
@@ -120,22 +103,6 @@ form.dark {
     padding: 5px 5px 5px 15px;
   }
 
-  *::-webkit-input-placeholder {
-      color: @bg-main-color;
-  }
-  *:-moz-placeholder {
-      /* FF 4-18 */
-      color: @bg-main-color;
-  }
-  *::-moz-placeholder {
-      /* FF 19+ */
-      color: @bg-main-color;
-  }
-  *:-ms-input-placeholder {
-      /* IE 10+ */
-      color: @bg-main-color;
-  }
-
   label {
     color: @bg-main-color;
   }

diff --git a/src/app/stylesheets/custom/utilities.less b/src/app/stylesheets/custom/utilities.less
diff --git a/src/app/views/company/company.html b/src/app/views/company/company.html
@@ -111,7 +111,7 @@ <h2 class="section-title">{{ 'mno_enterprise.templates.dashboard.organization.in
         <div uib-tab-heading>{{ 'mno_enterprise.templates.dashboard.organization.index.teams.title' | translate }}</div>
 
         <div>
-          <h4 class="text-bg-inverse">
+          <h4>
             {{ 'mno_enterprise.templates.dashboard.organization.index.teams.subtitle' | translate }}
             <span class="text-muted"><small><em>&nbsp;{{ 'mno_enterprise.templates.dashboard.organization.index.teams.control_access' | translate }}</em></small></span>
           </h4>

diff --git a/src/app/views/company/team-list/modals/member-add-modal.html b/src/app/views/company/team-list/modals/member-add-modal.html
@@ -24,7 +24,6 @@ <h3>{{ 'mno_enterprise.templates.dashboard.teams.member_add_modal.title' | trans
   <div class="row" ng-show="memberAddModal.canAddUsers()">
     <div class="col-sm-6 col-sm-offset-3 text-center">
       <p>{{ 'mno_enterprise.templates.dashboard.teams.member_add_modal.select_company_members' | translate }}</p>
-      <div class="spacer1"></div>
 
       <!-- List Available Users to add -->
       <table>

diff --git a/src/app/views/company/team-list/team-list.html b/src/app/views/company/team-list/team-list.html
@@ -16,12 +16,12 @@ <h4 ng-show="hasTeams()">{{ title }}</h4>
         </div>
 
         <div class="row text-center" ng-show="isTeamEmpty(team)">
-          <p class="text-muted">
+          <p>
             <em>{{ 'mno_enterprise.templates.dashboard.teams.team_list.add_team_members' | translate:{teamname: team.name} }}</em>
           </p>
 
           <div ng-show="canManageTeam()">
-            <button class="btn btn-sm btn-grey" ng-click="memberAddModal.open(team)">
+            <button class="btn btn-sm btn-warning" ng-click="memberAddModal.open(team)">
               <i class="fa fa-user-plus"></i>
               {{ 'mno_enterprise.templates.dashboard.teams.team_list.add_team_members' | translate }}
             </button>
@@ -30,7 +30,7 @@ <h4 ng-show="hasTeams()">{{ title }}</h4>
 
         <div class="row" ng-show="!isTeamEmpty(team)">
           <div class="col-sm-12" ng-show="canManageTeam()">
-            <button class="btn btn-sm btn-grey" ng-click="memberAddModal.open(team)">
+            <button class="btn btn-sm btn-warning" ng-click="memberAddModal.open(team)">
               <i class="fa fa-user-plus"></i>
               {{ 'mno_enterprise.templates.dashboard.teams.team_list.add_team_members' | translate }}
             </button>
@@ -53,7 +53,8 @@ <h4 ng-show="hasTeams()">{{ title }}</h4>
               <div class="row td-row" ng-repeat="member in team.users">
                 <div class="cell col-sm-3 col-md-2">
                   <span class="cell-label visible-xs-inline">
-                    {{ 'mno_enterprise.templates.dashboard.teams.team_list.tbl_name' | translate }}:</span>
+                    {{ 'mno_enterprise.templates.dashboard.teams.team_list.tbl_name' | translate }}:
+                  </span>
                   {{ member.name }}
                 </div>
 

diff --git a/src/app/views/company/teams/modals/team-add-modal.html b/src/app/views/company/teams/modals/team-add-modal.html
@@ -18,7 +18,6 @@ <h3>{{ 'mno_enterprise.templates.dashboard.teams.team_add_modal.title' | transla
   <div class="row">
     <div class="col-sm-6 col-sm-offset-3 text-center">
       <p>{{ 'mno_enterprise.templates.dashboard.teams.team_add_modal.enter_team_name' | translate }}</p>
-      <div class="spacer1"></div>
       <input type="text" class="form-control" ng-model="addTeamModal.model.name" required/>
     </div>
   </div>

diff --git a/src/app/views/company/teams/organization-teams.html b/src/app/views/company/teams/organization-teams.html
@@ -4,17 +4,16 @@
 
   <!-- No teams view -->
   <div ng-show="!isLoading && !hasTeams()">
-    <div class="row text-bg-inverse top-buffer-2">
-      <div class="col-sm-12 text-center">
-        <p>
-          {{ 'mno_enterprise.templates.dashboard.teams.index.no_teams_warning' | translate }}
-        </p>
-
-        <button type="button" class="btn btn-lg btn-grey btn-grey-bordered" ng-click="matrix.addTeam()">
-          <i class="fa fa-plus" style="margin-bottom:-2px;"></i>
-          &nbsp;
-          {{ 'mno_enterprise.templates.dashboard.teams.index.add_team' | translate }}
-        </button>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="well text-center">
+          <p>{{ 'mno_enterprise.templates.dashboard.teams.index.no_teams_warning' | translate }}</p>
+
+          <button type="button" class="btn btn-lg btn-warning top-buffer-1" ng-click="matrix.addTeam()">
+            <i class="fa fa-plus"></i>
+            {{ 'mno_enterprise.templates.dashboard.teams.index.add_team' | translate }}
+          </button>
+        </div>
       </div>
     </div>
   </div>
@@ -31,7 +30,6 @@
       </div>
     </div>
 
-
     <!-------------------------------------->
     <!--        Permissions matrix        -->
     <!-------------------------------------->
@@ -52,13 +50,12 @@
             <thead>
               <tr>
                 <th class="td-first">
-                  <button type="button" class="btn btn-grey btn-grey-bordered" ng-click="matrix.addTeam()">
-                    <i class="fa fa-plus" style="margin-bottom:-2px;"></i>
+                  <button type="button" class="btn btn-warning" ng-click="matrix.addTeam()">
+                    <i class="fa fa-plus"></i>
                     &nbsp;
                     {{ 'mno_enterprise.templates.dashboard.teams.index.add_team_light' | translate }}
                   </button>
                 </th>
-
                 <th style="width:6%;">{{ 'mno_enterprise.templates.dashboard.teams.index.all' | translate }}</th>
               </tr>
             </thead>
@@ -72,7 +69,7 @@
                   </div>
 
                   <span class="team-remove">
-                      <button class="btn btn-grey" ng-click="matrix.removeTeam(team)">
+                      <button class="btn btn-warning" ng-click="matrix.removeTeam(team)">
                         <i class="fa fa-remove hidden-xs"></i>
                       </button>
                   </span>
@@ -86,7 +83,7 @@
               <tr class="btn-group-row" ng-show="matrix.isChanged()">
                 <td class="text-center" colspan="2">
                   <div ng-show="matrix.isChanged() && !matrix.isLoading">
-                    <button type="button" class="btn btn-grey btn-grey-bordered" ng-click="matrix.cancel()">Cancel</button>
+                    <button type="button" class="btn btn-default" ng-click="matrix.cancel()">Cancel</button>
                     <button type="button" class="btn btn-warning" ng-click="matrix.save()">Save</button>
                   </div>
                   <!-- Loader -->
@@ -100,9 +97,9 @@
         <!-- Matrix: right part (detailed permissions) -->
         <div class="col-xs-8 table-right">
           <div class="text-center" ng-show="!hasApps()">
-            <p>{{ 'mno_enterprise.templates.dashboard.teams.index.no_apps_warning' | translate }}</p>
-            <a type="button" class="btn btn-lg btn-grey btn-grey-bordered" href="#/marketplace">
-              <i class="fa fa-plus" style="margin-bottom:-2px;"></i>
+            <p class="top-buffer-3">{{ 'mno_enterprise.templates.dashboard.teams.index.no_apps_warning' | translate }}</p>
+            <a type="button" class="btn btn-warning" href="#/marketplace">
+              <i class="fa fa-plus"></i>
               &nbsp;
               {{ 'mno_enterprise.templates.dashboard.teams.index.add_app' | translate }}
             </a>

diff --git a/src/app/views/layout.html b/src/app/views/layout.html
@@ -9,12 +9,8 @@
 
 <div id="dashboard">
   <div class="container">
-    <div class="row">
-      <dashboard-menu></dashboard-menu>
-      <dashboard-company-selectbox></dashboard-company-selectbox>
-      <div class="col-xs-12 col-sm-11">
-        <div ui-view></div>
-      </div>
-    </div>
+    <dashboard-menu></dashboard-menu>
+    <dashboard-company-selectbox></dashboard-company-selectbox>
+    <div ui-view></div>
   </div>
 </div>
diff --git a/src/app/views/layout.less b/src/app/views/layout.less
@@ -1,3 +1,5 @@
+@menu-left-width: 80px;
+
 #layout-loading {
   position: absolute;
   top: 0px;
@@ -21,7 +23,31 @@
 }
 
 #dashboard {
+  margin-left: @menu-left-width;
+
+  /* Fix the container width if the screen is sm+ */
+  @media screen and (min-width: @screen-sm-min) {
+    .container {
+      width: @container-sm - @menu-left-width;
+    }
+  }
+
+  /* Fix the container width if the screen is md+ */
+  @media screen and (min-width: @screen-md-min) {
+    .container {
+      width: @container-md - @menu-left-width;
+    }
+  }
+
+  /* Fix the container width if the screen is lg+ */
+  @media screen and (min-width: @screen-lg-min) {
+    .container {
+      width: @container-lg - @menu-left-width;
+    }
+  }
+
   @media (max-width: @screen-xs-max) {
     padding-top: 40px;
+    margin-left: 0;
   }
 }