Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
19e323e7
authored
Oct 09, 2017
by
german callejas
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Vista admin modificada
parent
33940b5d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
6 deletions
sails/src/assets/app/i18n/en-gb.json
sails/src/assets/app/i18n/es-es.json
sails/src/assets/scripts/modules/admin/controllers/supervisors.js
sails/src/assets/scripts/modules/admin/views/admin.html
sails/src/assets/scripts/modules/admin/views/supervisors.html
sails/src/assets/app/i18n/en-gb.json
View file @
19e323e7
...
...
@@ -355,6 +355,7 @@
"reports"
:
"Reports"
,
"request_change_password"
:
"Request change password"
,
"resume"
:
"Resume"
,
"role"
:
"Role"
,
"room_changed"
:
"A partner is offline. Session paused."
,
"save"
:
"Save"
,
"save_as_template"
:
"Save as template"
,
...
...
sails/src/assets/app/i18n/es-es.json
View file @
19e323e7
...
...
@@ -353,6 +353,7 @@
"reports"
:
"Informes"
,
"request_change_password"
:
"Solicitar cambio de contraseña"
,
"resume"
:
"Continuar"
,
"role"
:
"Rol"
,
"room_changed"
:
"Un participante abandonó la sesión. Sesión en pausa."
,
"save"
:
"Guardar"
,
"save_as_template"
:
"Guardar como plantilla"
,
...
...
sails/src/assets/scripts/modules/admin/controllers/supervisors.js
View file @
19e323e7
...
...
@@ -37,7 +37,7 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
});
// List of offices (for the select form)
$http
/*
$http
.get(config.backend+'/office/get_all')
.success(function(data, status, headers, config) {
$scope.offices = data;
...
...
@@ -46,7 +46,7 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
$translate('error_downloading_offices').then(function (translation) {
ngToast.danger({ content: translation });
});
});
});
*/
// Reset form Supervisor
$scope
.
resetForm
=
function
(){
...
...
sails/src/assets/scripts/modules/admin/views/admin.html
View file @
19e323e7
...
...
@@ -8,9 +8,9 @@
<li
role=
"presentation"
ng-click=
"selectedTab = 'licenses'"
ng-class=
"{'active':selectedTab === 'licenses'}"
>
<a
href=
"/app/#/admin/licenses"
>
{{ 'licenses' | translate }}
</a>
</li>
<li
role=
"presentation"
ng-click=
"selectedTab = 'offices'"
ng-class=
"{'active':selectedTab === 'offices'}"
>
<
!--<
li role="presentation" ng-click="selectedTab = 'offices'" ng-class="{'active':selectedTab === 'offices'}">
<a href="/app/#/admin/offices">{{ 'offices' | translate }}</a>
</li>
</li>
-->
<li
role=
"presentation"
ng-click=
"selectedTab = 'supervisors'"
ng-class=
"{'active':selectedTab === 'supervisors'}"
>
<a
href=
"/app/#/admin/supervisors"
>
{{ 'supervisors' | translate }}
</a>
</li>
...
...
sails/src/assets/scripts/modules/admin/views/supervisors.html
View file @
19e323e7
...
...
@@ -9,7 +9,7 @@
<div
class=
"col-xs-3"
>
<a
ng-click=
"resetForm(); hidesupervisoradd = false"
class=
"btn btn-success btn-sm"
role=
"button"
>
<span
class=
"glyphicon glyphicon-plus"
aria-hidden=
"true"
></span>
{{ 'add_supervisor' | translate }}
</a>
</a>
</div>
<div
class=
"col-xs-6 input-group"
>
<input
type=
"text"
ng-model=
"search_sups"
id=
"search_sups"
placeholder=
"{{ 'filter' | translate }}"
class=
"form-control"
aria-describedby=
"basic-addon2"
>
...
...
@@ -18,16 +18,18 @@
<div
class=
"col-xs-3"
>
</div>
</div>
<br>
<table
class=
"table table-striped"
>
<tr>
<th
translate
>
name
</th>
<th
translate
>
email
</th>
<th
translate
>
role
</th>
<th>
Ops
</th>
</tr>
<tr
ng-repeat=
"supervisor in supervisors | filter:search_sups | orderBy: 'name'"
>
<td
class=
"color_blue"
>
{{supervisor.name}} {{supervisor.surname}}
</td>
<td>
{{supervisor.email}}
</td>
<td>
{{supervisor.role | translate}}
</td>
<td
class=
"ops"
>
<a
ng-click=
"update_supervisor(supervisor)"
title=
"{{'edit'|translate}}"
><span
class=
"glyphicon glyphicon-pencil"
aria-hidden=
"true"
></span></a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment