Merge branch 'master' into develop

sails/src/api/controllers/OfficeController.js

@@ -101,9 +101,10 @@ module.exports = {
    *   ]
    */
   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
-      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 () {
       res.serverError();

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

@@ -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_updated": "Supervisor updated",
     "supervisors": "Supervisors",
+    "support": "User support",
     "surname": "Surname",
     "tag_deleted": "Tag deleted",
     "tape_background": "Tape background",

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

@@ -347,6 +347,7 @@
     "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_updated": "Supervisor actualizado",
+    "support": "Atención al cliente",
     "therapists": "Terapeutas",
     "supervisors": "Supervisores",
     "surname": "Apellidos",

sails/src/assets/scripts/modules/login/views/disclaimer.html

@@ -7,6 +7,7 @@
     <div class="col-lg-2">&nbsp;</div>
 
     <div class="col-lg-8">
+      <p>&nbsp;</p>
       <p class="text-center">
         <a href="/app"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" style="border-style: none"/></a>
       </p>

sails/src/assets/scripts/modules/login/views/login.html

-    <div class="row">
+<div class="row">
+  <div class="col-md-12 text-center">
+    <!-- Logo Pictogram
+    <p>
+      <img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" />
+    </p>
+    -->
+    <p>&nbsp;</p>
+    <p class="text-center">
+      <img ng-src="{{office.logoUrl}}" alt="{{office.name}}" title="{{office.name}}">
+    </p>
+  </div>
+</div>
+<div class="row">
 
       <!-- Rejilla 3 elementos de igual ancho -->
-      <div class="col-md-4">&nbsp;</div>
-
+      <div class="col-md-2">&nbsp;</div>
       <div class="col-md-4">
         <div id="login">
-          <!-- Logo Pictogram
-          <p>
-            <img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" />
-          </p>
-        -->
-          <p class="text-center">
-            <img ng-src="{{office.logoUrl}}" alt="{{office.name}}" title="{{office.name}}">
-          </p>
           <!-- Formulario -->
           <!-- LoginCtrl controls here, see app.js -->
           <form name="loginForm" ng-submit="login()" novalidate>
 
             <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" />
             </div>
             <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" />
             </div>
             <div class="checkbox">
@@ -28,23 +34,32 @@
                 <input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }}
               </label>
             </div>
-            <p class="text-center">
-              <button type="submit" class="btn btn-primary" translate>login</button>
-            </p>
-            <p class="text-center">
-              <i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i>
-            </p>
-            <p class="text-center">
-              <a href="/app/#/signin" translate>create_an_account</a>
-            </p>
-            <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>
+		</div>
+		<div class="pull-left">
+		  <i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i>
+		</div>
+		<div class="pull-right margin-top7">
+		  <a href="/app/#/signin" translate>create_an_account</a>
+		</div>
+	      </div>
+	    </div>
+	    
+            <div class="text-center margin-top15">
+	      <br/>
               <a href="/app/#/changepass" translate>password_forgotten</a>
-            </p>
+            </div>
           </form>
         </div>
         <!-- Fin login -->
       </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>
     <!-- Fin de row -->
 

sails/src/assets/scripts/modules/login/views/signin.html

@@ -7,6 +7,7 @@
     <div class="col-lg-2">&nbsp;</div>
 
     <div class="col-lg-8">
+      <p>&nbsp;</p>
      <p class="text-center">
           <a href="/app"><img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" style="border-style: none"/></a>
         </p>

sails/src/assets/scripts/modules/translate/views/footer_translate.html

 <div class="languages">
   <div class="row">
-    <div class="col-xs-6">
-      <div class="languages-margin text-center">
+    <div class="col-xs-4">
+      <div class="languages-margin text-left">
         <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">|</button>
@@ -9,10 +9,16 @@
         </div>
       </div>
     </div>
-    <div class="col-xs-6">
+    <div class="col-xs-4">
       <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>
       </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>

sails/src/assets/styles/main.css

 /*******************/
-/* Estilos propios */
+/* Estils propios */
 /*******************/
 
 /* Estilos generales */
@@ -51,6 +51,15 @@
 	margin-right: 10px;
 }
 
+.margin-top15 {
+    margin-top: 15px;
+}
+
+.margin-top7 {
+    margin-top: 7px;
+}
+
+
 /* Evitar scrolling horizontal */
 body{
 	overflow-x: hidden;
@@ -101,11 +110,11 @@ legend{ padding-top: 20px; }
 /* Estilos para el panel de login*/
 #login{
 	max-width: 300px;
-	margin: 60px auto;
+	margin: 15px auto;
 }
 
 #login form{
-	margin-top: 30px;
+	margin-top: 0px;
 }
 
 /* Login: Pie de página con idiomas fijos siempre abajo ; */
@@ -134,7 +143,7 @@ div.languages{
 	border-top: 1px solid #e7e7e7;
 }
 .languages-margin{
-	margin: 20px 0;
+	margin: 20px 15px 20px 15px;
 }
 .languages-margin img {
     position: absolute;
@@ -943,7 +952,7 @@ input[type=range]:focus::-ms-fill-upper {
 
 	/* Estilos para el panel de login*/
 	#login{
-		margin-top: 100px;
+		margin-top: 0px;
 	}
 
 	/* Estilos para el panel de signin (registro) */