Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

sails/cron/logrotate.conf

@@ -5,7 +5,7 @@
 	mail amontejo@ujaen.es
 	mail amontejo@ujaen.es
 	compress
 	compress
 	create 700 ubuntu ubuntu
 	create 700 ubuntu ubuntu
-	postrotate
+	prerotate
 		/home/ubuntu/pictogram/sails/cron/report.sh
 		/home/ubuntu/pictogram/sails/cron/report.sh
 	endscript
 	endscript
 }
 }

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

@@ -596,6 +596,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
           ngToast.success($translate.instant('grid_added'));
           ngToast.success($translate.instant('grid_added'));
 
 
           $scope.loadGridsList();
           $scope.loadGridsList();
+          $scope.showGrid(grid.id, 'menu');
 
 
         }).error(function () {});
         }).error(function () {});
     });
     });

sails/src/assets/scripts/modules/supervisor/views/supervisors_list.html

@@ -60,8 +60,8 @@
               <div class="col-xs-9">
               <div class="col-xs-9">
                 <h4>{{supervisor.name}} {{supervisor.surname}}</h4>
                 <h4>{{supervisor.name}} {{supervisor.surname}}</h4>
                 <p><span class="text-muted">{{ supervisor.role | translate }}</span></p>
                 <p><span class="text-muted">{{ supervisor.role | translate }}</span></p>
-                <p><i class="fa fa-envelope" aria-hidden="true">&nbsp</i><a href="mailto:{{supervisor.email}}">{{supervisor.email}}</a></p>
-                <p><i class="fa fa-phone-square" aria-hidden="true"></i>&nbsp<a href="tel:{{supervisor.phone}}">{{supervisor.phone}}</a></p>
+                <p><i class="fa fa-envelope" aria-hidden="true" ng-if="supervisor.email != null"></i> <a href="mailto:{{supervisor.email}}" ng-if="supervisor.email != null">{{supervisor.email}}</a></p>
+                <p><i class="fa fa-phone-square" aria-hidden="true" ng-if="supervisor.phone != null"></i> <a href="tel:{{supervisor.phone}}" ng-if="supervisor.phone != null">{{supervisor.phone}}</a></p>
               </div>
               </div>
             </div>
             </div>
           </td>
           </td>