Skip to content

yotta / pictogram

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

Merge branch 'master' into develop

parents fdc9f100 41f3a16c
Inline Side-by-side
Showing with 61 additions and 26 deletions
sails/src/api/controllers/OfficeController.js
...@@ -101,9 +101,10 @@ module.exports = { ...@@ -101,9 +101,10 @@ module.exports = {
* ] * ]
*/ */
getAll: function (req, res) { getAll: function (req, res) {
Office.find().populate('admin').then(function (offices) { Office.find()
.populate('admin').then(function (offices) {
// return all offices filtering out personal ones // return all offices filtering out personal ones
res.ok(offices.filter(o => o.name !== 'no_office')); res.ok(offices.filter(o => o.name !== 'no_office' && o.name.search(' Test') == -1));
}) })
.catch(function () { .catch(function () {
res.serverError(); res.serverError();
......
sails/src/assets/app/i18n/en-gb.json
...@@ -347,6 +347,7 @@ ...@@ -347,6 +347,7 @@
"supervisor_note": "If the parent aren't going to register in the platform, the administrator can use the notes field to store their information.", "supervisor_note": "If the parent aren't going to register in the platform, the administrator can use the notes field to store their information.",
"supervisor_updated": "Supervisor updated", "supervisor_updated": "Supervisor updated",
"supervisors": "Supervisors", "supervisors": "Supervisors",
"support": "User support",
"surname": "Surname", "surname": "Surname",
"tag_deleted": "Tag deleted", "tag_deleted": "Tag deleted",
"tape_background": "Tape background", "tape_background": "Tape background",
......
sails/src/assets/app/i18n/es-es.json
...@@ -347,6 +347,7 @@ ...@@ -347,6 +347,7 @@
"supervisor_not_updated": "El supervisor no se ha podido actualizar", "supervisor_not_updated": "El supervisor no se ha podido actualizar",
"supervisor_note": "Si los padres no se van a dar de alta en la plataforma nunca, el administrador puede anotar la información de contacto en el campo notas.", "supervisor_note": "Si los padres no se van a dar de alta en la plataforma nunca, el administrador puede anotar la información de contacto en el campo notas.",
"supervisor_updated": "Supervisor actualizado", "supervisor_updated": "Supervisor actualizado",
"support": "Atención al cliente",
"therapists": "Terapeutas", "therapists": "Terapeutas",
"supervisors": "Supervisores", "supervisors": "Supervisores",
"surname": "Apellidos", "surname": "Apellidos",
......
sails/src/assets/scripts/modules/login/views/disclaimer.html
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<div class="col-lg-2">&nbsp;</div> <div class="col-lg-2">&nbsp;</div>
<div class="col-lg-8"> <div class="col-lg-8">
<p>&nbsp;</p>
<p class="text-center"> <p class="text-center">
<a href="/app"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" style="border-style: none"/></a> <a href="/app"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" style="border-style: none"/></a>
</p> </p>
......
sails/src/assets/scripts/modules/login/views/login.html
<div class="row"> <div class="row">
<div class="col-md-12 text-center">
<!-- Rejilla 3 elementos de igual ancho -->
<div class="col-md-4">&nbsp;</div>
<div class="col-md-4">
<div id="login">
<!-- Logo Pictogram <!-- Logo Pictogram
<p> <p>
<img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" /> <img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" />
</p> </p>
--> -->
<p>&nbsp;</p>
<p class="text-center"> <p class="text-center">
<img ng-src="{{office.logoUrl}}" alt="{{office.name}}" title="{{office.name}}"> <img ng-src="{{office.logoUrl}}" alt="{{office.name}}" title="{{office.name}}">
</p> </p>
</div>
</div>
<div class="row">
<!-- Rejilla 3 elementos de igual ancho -->
<div class="col-md-2">&nbsp;</div>
<div class="col-md-4">
<div id="login">
<!-- Formulario --> <!-- Formulario -->
<!-- LoginCtrl controls here, see app.js --> <!-- LoginCtrl controls here, see app.js -->
<form name="loginForm" ng-submit="login()" novalidate> <form name="loginForm" ng-submit="login()" novalidate>
<div class="form-group"> <div class="form-group">
<label translate>email</label>:
<input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" /> <input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label translate>password</label>:
<input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" /> <input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" />
</div> </div>
<div class="checkbox"> <div class="checkbox">
...@@ -28,23 +34,32 @@ ...@@ -28,23 +34,32 @@
<input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }} <input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }}
</label> </label>
</div> </div>
<p class="text-center"> <div class="row">
<div class="col-md-12">
<div class="pull-left">
<button type="submit" class="btn btn-primary" translate>login</button> <button type="submit" class="btn btn-primary" translate>login</button>
</p> </div>
<p class="text-center"> <div class="pull-left">
<i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i> <i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i>
</p> </div>
<p class="text-center"> <div class="pull-right margin-top7">
<a href="/app/#/signin" translate>create_an_account</a> <a href="/app/#/signin" translate>create_an_account</a>
</p> </div>
<p class="text-center"> </div>
</div>
<div class="text-center margin-top15">
<br/>
<a href="/app/#/changepass" translate>password_forgotten</a> <a href="/app/#/changepass" translate>password_forgotten</a>
</p> </div>
</form> </form>
</div> </div>
<!-- Fin login --> <!-- Fin login -->
</div> </div>
<div class="col-md-4">&nbsp;</div> <div class="col-md-4">
<img src="img/login.png" alt="Pictogram" title="Pictogram" />
</div>
<div class="col-md-2">&nbsp;</div>
</div> </div>
<!-- Fin de row --> <!-- Fin de row -->
......
sails/src/assets/scripts/modules/login/views/signin.html
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<div class="col-lg-2">&nbsp;</div> <div class="col-lg-2">&nbsp;</div>
<div class="col-lg-8"> <div class="col-lg-8">
<p>&nbsp;</p>
<p class="text-center"> <p class="text-center">
<a href="/app"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" style="border-style: none"/></a> <a href="/app"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" style="border-style: none"/></a>
</p> </p>
......
sails/src/assets/scripts/modules/translate/views/footer_translate.html
<div class="languages"> <div class="languages">
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-4">
<div class="languages-margin text-center"> <div class="languages-margin text-left">
<div ng-controller="TranslateController" class="btn-group" role="group" aria-label=""> <div ng-controller="TranslateController" class="btn-group" role="group" aria-label="">
<button type="button" class="btn-link" ng-click="changeLanguage('es-es')">Español</button> <button type="button" class="btn-link" ng-click="changeLanguage('es-es')">Español</button>
<button type="button" class="btn-link">|</button> <button type="button" class="btn-link">|</button>
...@@ -9,10 +9,16 @@ ...@@ -9,10 +9,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-4">
<div class="languages-margin text-center text-muted"> <div class="languages-margin text-center text-muted">
Powered by &nbsp; <a href="http://www.yottacode.com"><img src="img/logo_pictogram.png" width="40px" alt="Pictogram" title="Pictogram" /></a> Powered by &nbsp; <a href="http://www.yottacode.com"><img src="img/logo_pictogram.png" width="40px" alt="Pictogram" title="Pictogram" /></a>
</div> </div>
</div> </div>
<div class="col-xs-4">
<div class="languages-margin text-right text-muted">
<a href="mailto:soporte@yottacode.com" translate>support</a> |
<a href='/app/#/disclaimer' target='_blank' translate>disclaimer</a>
</div>
</div>
</div> </div>
</div> </div>
sails/src/assets/styles/main.css
/*******************/ /*******************/
/* Estilos propios */ /* Estils propios */
/*******************/ /*******************/
/* Estilos generales */ /* Estilos generales */
...@@ -51,6 +51,15 @@ ...@@ -51,6 +51,15 @@
margin-right: 10px; margin-right: 10px;
} }
.margin-top15 {
margin-top: 15px;
}
.margin-top7 {
margin-top: 7px;
}
/* Evitar scrolling horizontal */ /* Evitar scrolling horizontal */
body{ body{
overflow-x: hidden; overflow-x: hidden;
...@@ -101,11 +110,11 @@ legend{ padding-top: 20px; } ...@@ -101,11 +110,11 @@ legend{ padding-top: 20px; }
/* Estilos para el panel de login*/ /* Estilos para el panel de login*/
#login{ #login{
max-width: 300px; max-width: 300px;
margin: 60px auto; margin: 15px auto;
} }
#login form{ #login form{
margin-top: 30px; margin-top: 0px;
} }
/* Login: Pie de página con idiomas fijos siempre abajo ; */ /* Login: Pie de página con idiomas fijos siempre abajo ; */
...@@ -134,7 +143,7 @@ div.languages{ ...@@ -134,7 +143,7 @@ div.languages{
border-top: 1px solid #e7e7e7; border-top: 1px solid #e7e7e7;
} }
.languages-margin{ .languages-margin{
margin: 20px 0; margin: 20px 15px 20px 15px;
} }
.languages-margin img { .languages-margin img {
position: absolute; position: absolute;
...@@ -943,7 +952,7 @@ input[type=range]:focus::-ms-fill-upper { ...@@ -943,7 +952,7 @@ input[type=range]:focus::-ms-fill-upper {
/* Estilos para el panel de login*/ /* Estilos para el panel de login*/
#login{ #login{
margin-top: 100px; margin-top: 0px;
} }
/* Estilos para el panel de signin (registro) */ /* Estilos para el panel de signin (registro) */
......
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