#386 and breadcrumbs fixed

sails/src/assets/app/i18n/en-gb.json

@@ -404,7 +404,7 @@
     "sexo": "Sex",
     "sexo": "Sex",
     "show": "Show",
     "show": "Show",
     "show_all": "Show all",
     "show_all": "Show all",
-    "show_grids": "Show grids",
+    "show_grids": "Grids",
     "show_less": "Show less details",
     "show_less": "Show less details",
     "size": "Size",
     "size": "Size",
     "small": "Small",
     "small": "Small",

sails/src/assets/app/i18n/es-es.json

@@ -402,7 +402,7 @@
     "sexo": "Sexo",
     "sexo": "Sexo",
     "show": "Mostrar",
     "show": "Mostrar",
     "show_all": "Ver todo",
     "show_all": "Ver todo",
-    "show_grids": "Ver tableros",
+    "show_grids": "Tableros",
     "show_less": "Ver menos detalles",
     "show_less": "Ver menos detalles",
     "size": "Tamaño",
     "size": "Tamaño",
     "small": "Pequeño",
     "small": "Pequeño",

sails/src/assets/scripts/modules/student/controllers/collections.js

@@ -41,7 +41,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
   $scope.nav.tab = 'collections';
   $scope.nav.tab = 'collections';
   $scope.mainGrid = null;
   $scope.mainGrid = null;
   $scope.loadingPictos = true;
   $scope.loadingPictos = true;
-  $scope.viewingGrid = null;
+  $scope.viewingGrid = {};
   $scope.gridsList = null;
   $scope.gridsList = null;
   $scope.newGridName = "";
   $scope.newGridName = "";
   $scope.breadcrumbs = [];
   $scope.breadcrumbs = [];

sails/src/assets/scripts/modules/student/views/collections.html

@@ -8,7 +8,7 @@
         <ol class="breadcrumb">
         <ol class="breadcrumb">
           <li class="breadcrumb-item" ng-repeat="b in breadcrumbs track by $index">
           <li class="breadcrumb-item" ng-repeat="b in breadcrumbs track by $index">
             <a ng-if="b.id != viewingGrid.id" ng-click="showGrid(b.id,'breadcrumb')">{{b.name}}</a>
             <a ng-if="b.id != viewingGrid.id" ng-click="showGrid(b.id,'breadcrumb')">{{b.name}}</a>
-            <small ng-if="b.id == viewingGrid.id">{{b.name}}</small>
+            <span ng-if="b.id == viewingGrid.id">{{b.name}}</span>
           </li>
           </li>
         </ol>
         </ol>
       </nav>
       </nav>
@@ -134,10 +134,9 @@
       <hr>
       <hr>
 
 
       <label class="grid-panel-head">{{ 'show_grids' | translate }}</label>
       <label class="grid-panel-head">{{ 'show_grids' | translate }}</label>
-
       <div class="form-group row">
       <div class="form-group row">
-        <select class="grid-panel-select" ng-model="grid" ng-change="showGrid(grid,'menu')" size="7">
-          <option value="{{grid.id}}" ng-repeat="grid in gridsList | orderBy: 'name' track by $index" ng-selected="grid.active" ng-class="(grid.active) ? 'grid-panel-select-optionselected' : '' ">
+        <select class="grid-panel-select" ng-model="viewingGrid.id" ng-change="showGrid(viewingGrid.id,'menu')" size="7">
+          <option value="{{grid.id}}" ng-repeat="grid in gridsList | orderBy: 'name' track by $index" ng-selected="grid.id == viewingGrid.id" ng-class="{'grid-panel-select-optionactive': grid.active}">
             {{ grid.name }}
             {{ grid.name }}
           </option>
           </option>
         </select>
         </select>

sails/src/assets/styles/main.css

@@ -1148,6 +1148,9 @@ input.editable.grid-name {
     border: 1px solid #e7e7e7;
     border: 1px solid #e7e7e7;
     width: 90%;
     width: 90%;
 }
 }
+.grid-panel-select-optionactive{
+    background-color:#c5e4c5;
+}
 .grid-panel-select-optionselected{
 .grid-panel-select-optionselected{
     background-color:#c5e4c5;
     background-color:#c5e4c5;
 }
 }