Skip to content

yotta / pictogram

Go to a project
Commit c58855bc by Arturo Montejo Ráez
Options

issue #854 on improving student setup section done

parent c7abca0f
Expand all
Inline Side-by-side
Showing with 10 additions and 7 deletions
sails/src/assets/app/i18n/en-gb.json
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
"delete_strip_after_delivery": "Empty strip after delivery", "delete_strip_after_delivery": "Empty strip after delivery",
"delete_template": "Delete from templates", "delete_template": "Delete from templates",
"description": "Description", "description": "Description",
"device": "Device",
"device_setup": "Device setup", "device_setup": "Device setup",
"disabled": "Disabled. Clic for invisible", "disabled": "Disabled. Clic for invisible",
"disclaimer": "Conditions of use", "disclaimer": "Conditions of use",
......
sails/src/assets/app/i18n/es-es.json
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
"delete_strip_after_delivery": "Limpiar cinta tras entrega", "delete_strip_after_delivery": "Limpiar cinta tras entrega",
"delete_template": "Eliminar de plantillas", "delete_template": "Eliminar de plantillas",
"description": "Descripción", "description": "Descripción",
"device": "Dispositivo",
"device_setup": "Configuración del dispositivo", "device_setup": "Configuración del dispositivo",
"disabled": "Desactivado. Clic para invisible", "disabled": "Desactivado. Clic para invisible",
"disclaimer": "Condiciones de uso", "disclaimer": "Condiciones de uso",
......
sails/src/assets/scripts/modules/student/controllers/setup.js
...@@ -26,7 +26,8 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl( ...@@ -26,7 +26,8 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
});*/ });*/
$scope.supsForm = {}; $scope.supsForm = {};
$scope.section = 'account';
$scope.changeImg = function () { $scope.changeImg = function () {
$scope.progress = 0; $scope.progress = 0;
......
sails/src/assets/scripts/modules/student/views/header.html
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
<a href="/app/#/student/{{studentData.id}}/session" ng-click="nav.tab = 'session'"><span class="glyphicon glyphicon-transfer" aria-hidden="true"></span> {{ 'sessions' | translate }}</a> <a href="/app/#/student/{{studentData.id}}/session" ng-click="nav.tab = 'session'"><span class="glyphicon glyphicon-transfer" aria-hidden="true"></span> {{ 'sessions' | translate }}</a>
</li> </li>
<li role="presentation" ng-class="{'active' : nav.tab == 'reports'}" ng-if="studentData.supervision != 1"> <li role="presentation" ng-class="{'active' : nav.tab == 'reports'}" ng-if="studentData.supervision != 1">
<a href="/app/#/student/{{studentData.id}}/reports" ng-click="nav.tab = 'reports'"><span class="glyphicon glyphicon-file" aria-hidden="true"></span> {{ 'reports' | translate }}</a> <a href="/app/#/student/{{studentData.id}}/reports" ng-click="nav.tab = 'reports'"><i class="fa fa-bar-chart" aria-hidden="true"></i> {{ 'reports' | translate }}</a>
</li> </li>
<li role="presentation" ng-class="{'active' : nav.tab == 'setup'}" ng-if="studentData.supervision != 0"> <li role="presentation" ng-class="{'active' : nav.tab == 'setup'}">
<a href="/app/#/student/{{studentData.id}}/setup" ng-click="nav.tab = 'setup'" <a href="/app/#/student/{{studentData.id}}/setup" ng-click="nav.tab = 'setup'"
><span class="glyphicon glyphicon-cog" aria-hidden="true"></span> {{ 'setup' | translate }}</a> ><span class="glyphicon glyphicon-cog" aria-hidden="true"></span> {{ 'setup' | translate }}</a>
</li> </li>
......
sails/src/assets/scripts/modules/supervisor/views/header.html
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li> <li>
<a class="pointer" role="menuitem" tabindex="0" href="/app/#/students"> <a class="pointer" role="menuitem" tabindex="0" href="/app/#/students">
<i class="glyphicon glyphicon-user" aria-hidden="true"></i> <i class="fa fa-users" aria-hidden="true"></i>
{{ 'students' | translate }} {{ 'students' | translate }}
</a> </a>
</li> </li>
<li> <li>
<a class="pointer" role="menuitem" tabindex="0" href="/app/#/supervisors_list"> <a class="pointer" role="menuitem" tabindex="0" href="/app/#/supervisors_list">
<i class="glyphicon glyphicon-star" aria-hidden="true"></i> <i class="fa fa-users" aria-hidden="true"></i>
{{ 'supervisors' | translate }} {{ 'supervisors' | translate }}
</a> </a>
<li ng-if="user.isTutor == false"> <li ng-if="user.isTutor == false">
......
sails/src/assets/scripts/modules/supervisor/views/students.html
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
<span class="btn btn-default btn-lg" role="button" alt="{{ 'session' | translate}}" popover="{{ 'session' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 2"><span class="glyphicon glyphicon-transfer" aria-hidden="true" style="color: #bbb"></span></span> <span class="btn btn-default btn-lg" role="button" alt="{{ 'session' | translate}}" popover="{{ 'session' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 2"><span class="glyphicon glyphicon-transfer" aria-hidden="true" style="color: #bbb"></span></span>
<a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/reports" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 1"><span class="glyphicon glyphicon-file" aria-hidden="true"></span></a> <a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/reports" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 1"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
<span class="btn btn-default btn-lg" role="button" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision == 1"><span class="glyphicon glyphicon-file" aria-hidden="true" style="color: #bbb"></span></span> <span class="btn btn-default btn-lg" role="button" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision == 1"><i class="fa fa-bar-chart" aria-hidden="true" style="color: #bbb"></i></span>
<a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/setup" alt="{{ 'setup' | translate}}" popover="{{ 'setup' | translate}}" popover-trigger="mouseenter"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span></a> <a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/setup" alt="{{ 'setup' | translate}}" popover="{{ 'setup' | translate}}" popover-trigger="mouseenter"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span></a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment