student setup view rearranged

sails/src/assets/app/bower.json

@@ -27,7 +27,8 @@
     "angular-animate": "~1.4.1",
     "angular-sanitize": "~1.4.1",
     "angular-chart.js": "latest",
-    "ng-lodash": "~0.3.0"
+    "ng-lodash": "~0.3.0",
+    "bootstrap-filestyle": "~1.2.1"
   },
   "resolutions": {
     "angular": ">=1 <1.3.0",

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

@@ -56,6 +56,7 @@
     "country": "Country",
     "create_account": "Create account",
     "create_an_account": "Create an account",
+    "credentials": "Credentials",
     "crop_image": "Crop image",
     "data_no_saved": "Data can't be saved",
     "data_saved": "Data saved",
@@ -97,7 +98,7 @@
     "expand_navigation": "Expand navigation",
     "expression": "Expression:",
     "February": "February",
-    "feedback_picto": "Feedback when a pictogram is placed",
+    "feedback_picto": "Selection feedback",
     "filter": "Filter",
     "finish_session": "Finish session",
     "finished": "Finished",
@@ -125,6 +126,7 @@
     "June": "June",
     "language": "Language",
     "large": "Large",
+    "large_picto": "Large pictograms",
     "last_session": "Last session",
     "legend": "Legend",
     "legend_size": "Legend size",
@@ -217,6 +219,7 @@
     "press": "Long press",
     "previous_actions": "Previous actions",
     "previous_sessions": "Previous sessions",
+    "profile_picture": "Profile picture",
     "read_picto": "Read picto",
     "register": "Sign in",
     "remember": "Remember me",
@@ -248,6 +251,7 @@
     "show": "Show",
     "size": "Size",
     "small": "Small",
+    "small_picto": "Small pictograms",
     "sound_setup": "Sound setup",
     "spanish": "Spanish",
     "started": "Started",

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

@@ -56,6 +56,7 @@
     "country": "País",
     "create_account": "Crear cuenta",
     "create_an_account": "Crear una cuenta",
+    "credentials": "Credenciales",
     "crop_image": "Recortar imagen",
     "data_no_saved": "Los datos no se han podido guardar",
     "data_saved": "Datos guardados",
@@ -97,7 +98,7 @@
     "error_loading_pictos": "Error cargando información de los pictos",
     "error_general": "Se ha producido un error",
     "February": "Febrero",
-    "feedback_picto": "Feedback al colocar un pictograma",
+    "feedback_picto": "Efecto de selección",
     "filter": "Filtrar",
     "finish_session": "Terminar sesión",
     "finished": "Completada",
@@ -125,6 +126,7 @@
     "June": "Junio",
     "language": "Idioma",
     "large": "Grande",
+    "large_picto": "Pictograms grandes",
     "last_session": "Última sesión",
     "legend": "Leyenda",
     "legend_size": "Tamaño de la leyenda",
@@ -217,6 +219,7 @@
     "press": "Pulsación larga",
     "previous_actions": "Acciones anteriores",
     "previous_sessions": "Sesiones anteriores",
+    "profile_picture": "Foto del perfil",
     "read_picto": "Leer picto",
     "register": "Regístrate",
     "register_button": "Registrar",
@@ -249,6 +252,7 @@
     "show": "Mostrar",
     "size": "Tamaño",
     "small": "Pequeño",
+    "small_picto": "Pictogramas pequeños",
     "sound_setup": "Ajustes de sonido",
     "spanish": "Español",
     "started": "Iniciada",

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

@@ -17,6 +17,12 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
   // For tab navigation (here too, if the user refresh the page...)
   $scope.nav.tab = 'setup';
 
+  // Set upload button to filestyle
+  $(":file").filestyle({
+    buttonText: " " + $translate.instant('change_picture'),
+    input: false
+  });
+
   /**
    * Updates the student picture
    * @param  {Angular file array} $files Image to be uploaded

sails/src/assets/scripts/modules/student/views/setup.html

@@ -5,60 +5,93 @@
       <div class="col-md-6">
         <div id="student_personal_edit">
           <form role="form" ng-submit="updateStudent()">
-            <!-- Cambiar imagen de perfil -->
-            <div class="form-group">
-              <h4><span class="glyphicon glyphicon-picture" aria-hidden="true"></span> {{ 'change_picture' | translate }}: </h4>
-              <!-- Input oculto para cargar la redimensión de la imagen (awesome-cropper) -->
-              <input type="file" ng-file-select="onFileSelect($files)" ng-model="picFile" accept="image/*">
-            </div>
 
-            <!-- Preview -->
-            <img class="thumbnail preview" ng-src="{{studentData.pic}}" />
-            <!-- Fin Cambiar imagen de perfil -->
+            <h3>{{ 'account' | translate }}</h3>
+
+            <div class="row">
+              <div class="col-md-6">
+
+                <legend translate>profile_picture</legend>
+                <!-- Preview -->
+                <img class="thumbnail preview" ng-src="{{studentData.pic}}" />
+                <!-- Fin Cambiar imagen de perfil -->
+                <div class="form-group">
+                  <input type="file" class="filestyle">
+                </div>
 
-            <fieldset>
-              <legend translate>account</legend>
-              <div class="form-group">
-                <input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formUser.username" readonly/>
-              </div>
-              <div class="form-group">
-                <input style="display:none" type="password" name="fakepasswordremembered"/>
-                <input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formUser.password"/>
               </div>
-              <div class="form-group">
-                <input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm"/>
+              <div class="col-md-6">
+
+                <fieldset>
+                  <legend translate>credentials</legend>
+                  <div class="form-group">
+                    <input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formUser.username" readonly/>
+                  </div>
+                  <div class="form-group">
+                    <input style="display:none" type="password" name="fakepasswordremembered"/>
+                    <input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formUser.password"/>
+                  </div>
+                  <div class="form-group">
+                    <input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm"/>
+                  </div>
+                </fieldset>
+
               </div>
+          </div>
+
+            <fieldset>
               <legend translate>personal_data</legend>
-              <div class="form-group">
-                <input type="text" class="form-control" id="student_personal_edit_name" placeholder="{{ 'name' | translate }}" ng-model="formUser.name" required />
-              </div>
-              <div class="form-group">
-                <input type="text" class="form-control" id="student_personal_edit_surname" placeholder="{{ 'surname' | translate }}" ng-model="formUser.surname" required />
-              </div>
-              <div class="form-group">
-                <p class="input-group">
-                  <input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="formUser.birthdate" placeholder="{{ 'birthdate' | translate }}" is-open="opened" close-text="{{'close' | translate}}" required />
-                  <span class="input-group-btn">
-                      <button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>
-                  </span>
-                </p>
-              </div>
-              <div class="form-group">
-                <select class="form-control" name="student_gender" id="student_gender" ng-model="formUser.gender" required>
-                  <option value=" ">&nsp;</option>
-                  <option value="F" translate>woman</option>
-                  <option value="M" translate>man</option>
-                </select>
-              </div>
-              <div class="form-group">
-                <select class="form-control" name="student_country" id="student_country" ng-model="formUser.country" required>
-                  <option value="ES">España</option>
-                  <option value="US">United States</option>
-                  <option value="UK">United Kingdom</option>
-                  <option value="IE">Ireland</option>
-                </select>
+
+              <div class="row">
+                <div class="col-md-6">
+
+
+                  <div class="form-group">
+                    <input type="text" class="form-control" id="student_personal_edit_name" placeholder="{{ 'name' | translate }}" ng-model="formUser.name" required />
+                  </div>
+                  <div class="form-group">
+                    <input type="text" class="form-control" id="student_personal_edit_surname" placeholder="{{ 'surname' | translate }}" ng-model="formUser.surname" required />
+                  </div>
+                  <div class="form-group">
+                    <p class="input-group">
+                      <input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="formUser.birthdate" placeholder="{{ 'birthdate' | translate }}" is-open="opened" close-text="{{'close' | translate}}" required />
+                      <span class="input-group-btn">
+                          <button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>
+                      </span>
+                    </p>
+                  </div>
+
+                </div>
+                <div class="col-md-6">
+
+                  <fieldset>
+                    <div class="form-group">
+                      <select class="form-control" name="student_gender" id="student_gender" ng-model="formUser.gender" required>
+                        <option value=" ">&nsp;</option>
+                        <option value="F" translate>woman</option>
+                        <option value="M" translate>man</option>
+                      </select>
+                    </div>
+                    <div class="form-group">
+                      <select class="form-control" name="student_country" id="student_country" ng-model="formUser.country" required>
+                        <option value="ES">España</option>
+                        <option value="US">United States</option>
+                        <option value="UK">United Kingdom</option>
+                        <option value="IE">Ireland</option>
+                      </select>
+                    </div>
+
+                    <div class="form-group">
+                      <span translate>language</span>:
+                      <select class="form-control" name="supervisor_language" id="supervisor_language" ng-model="formUser.lang">
+                        <option value="es-es">Español</option>
+                        <option value="en-gb">English</option>
+                      </select>
+                    </div>
+                  </fieldset>
+
+                </div>
               </div>
-            </fieldset>
 
             <fieldset ng-if="studentData.supervision != 1">
               <legend translate>notes</legend>
@@ -67,16 +100,6 @@
               </div>
             </fieldset>
 
-            <fieldset>
-              <legend translate>language</legend>
-              <div class="form-group">
-                <select class="form-control" name="supervisor_language" id="supervisor_language" ng-model="formUser.lang">
-                  <option value="es-es">Español</option>
-                  <option value="en-gb">English</option>
-                </select>
-              </div>
-            </fieldset>
-
             <div class="form-group text-center">
               <button type="submit" class="btn btn-primary" translate>save</button>
             </div>
@@ -85,11 +108,241 @@
         <!-- Fin de student_personal_edit -->
       </div>
 
-      <!-- Parte derecha: Tutores y dispositivos -->
+
+      <!-- Configuración dispositivo -->
       <div class="col-md-6">
+
+      <div id="device_setup">
+        <h3>{{ 'device_setup' | translate }}</h3>
+
+        <div class="row">
+          <div class="col-md-6">
+
+        <form role="form" class="form">
+          <fieldset>
+            <legend>{{ 'categories' | translate }}</legend>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupUseCategories"
+                  ng-model="studentData.attributes.categories"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupUseCategories">{{ 'use_categories' | translate }}</label>
+            </div>
+            <legend>{{ 'picto_size' | translate }}</legend>
+            <div class="form-group">
+              <div class="input-group">
+                <span class="input-group-addon">
+                  <input type="radio"
+                    value="small"
+                    id="studentSetupPictoSizeSmall"
+                    ng-model="studentData.attributes.size"
+                    ng-change="update_attributes()">
+                </span>
+                <label class="form-control" for="studentSetupPictoSizeSmall">
+                  {{ 'small_picto' | translate }}
+                </label>
+              </div>
+              <div class="input-group">
+                <span class="input-group-addon">
+                  <input type="radio"
+                    value="large"
+                    id="studentSetupPictoSizeLarge"
+                    ng-model="studentData.attributes.size"
+                    ng-change="update_attributes()">
+              </span>
+                <label class="form-control" for="studentSetupPictoSizeLarge">
+                  {{ 'large_picto' | translate }}
+                </label>
+              </div>
+            </div>
+          </fieldset>
+
+        </div>
+        <div class="col-md-6">
+
+          <fieldset>
+            <legend>{{ 'feedback_picto' | translate }}</legend>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupVibrateOnTouch"
+                  ng-model="studentData.attributes.input_feedback.vibration"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupVibrateOnTouch">{{ 'vibration' | translate }}</label>
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupBeepOnTouch"
+                  ng-model="studentData.attributes.input_feedback.beep"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupBeepOnTouch">{{ 'beep' | translate }}</label>
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupReadOnTouch"
+                  ng-model="studentData.attributes.input_feedback.read"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupReadOnTouch">{{ 'read_picto' | translate }}</label>
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupHighlightOnTouch"
+                  ng-model="studentData.attributes.input_feedback.highlight"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupHighlightOnTouch">
+                {{ 'highlight' | translate }}
+              </label>
+            </div>
+          </fieldset>
+          <!-- DISABLED, NOT IMPLEMENTED YET
+          <fieldset>
+            <legend>{{ 'input_selection' | translate }}</legend>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupSelectOnClick"
+                  ng-model="studentData.attributes.input_selection.click"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupSelectOnClick">
+                {{ 'click' | translate }}
+              </label>
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupSelectOnDoubleClick"
+                  ng-model="studentData.attributes.input_selection.double_click"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupSelectOnDoubleClick">
+                {{ 'double_click' | translate }}
+              </label>
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupSelectOnLongPress"
+                  ng-model="studentData.attributes.input_selection.long_press"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupSelectOnLongPress">
+                {{ 'press' | translate }}
+              </label>
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupSelectOnDrag"
+                  ng-model="studentData.attributes.input_selection.drag"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupSelectOnDrag">
+                {{ 'drag' | translate }}
+              </label>
+            </div>
+          </fieldset>
+          <fieldset>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="color"
+                  id="studentSetupPictoBackground"
+                  ng-model="studentData.attributes.picto_background"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupPictoBackground">
+                {{ 'background' | translate }}
+              </label>
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="color"
+                  id="studentSetupTapeBackground"
+                  ng-model="studentData.attributes.tape_background"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupTapeBackground">
+                {{ 'tape_background' | translate }}
+              </label>
+            </div>
+          </fieldset>
+          <fieldset>
+            <legend>{{ 'legend' | translate }}</legend>
+            <div class="input-group">
+              <span class="input-group-addon">
+                <input type="checkbox"
+                  id="studentSetupShowPictoLegend"
+                  ng-model="studentData.attributes.legend"
+                  ng-change="update_attributes()">
+              </span>
+              <label class="form-control" for="studentSetupShowPictoLegend">
+                {{ 'show' | translate }}
+              </label>
+            </div>
+            <fieldset class="form-group" ng-disabled="!studentData.attributes.legend">
+              <h4>{{ 'legend_size' | translate }}</h4>
+              <div class="input-group">
+                <span class="input-group-addon">
+                  <input type="radio"
+                    value="small"
+                    id="studentSetupPictoLegendSizeSmall"
+                    ng-model="studentData.attributes.legend_size"
+                    ng-change="update_attributes()">
+              </span>
+                <label class="form-control" for="studentSetupPictoLegendSizeSmall">
+                  {{ 'small' | translate }}
+                </label>
+              </div>
+              <div class="input-group">
+                <span class="input-group-addon">
+                  <input type="radio"
+                    value="normal"
+                    id="studentSetupPictoLegendSizeNormal"
+                    ng-model="studentData.attributes.legend_size"
+                    ng-change="update_attributes()">
+              </span>
+                <label class="form-control" for="studentSetupPictoLegendSizeNormal">
+                  {{ 'normal' | translate }}
+                </label>
+              </div>
+              <div class="input-group">
+                <span class="input-group-addon">
+                  <input type="radio"
+                    value="large"
+                    id="studentSetupPictoLegendSizeLarge"
+                    ng-model="studentData.attributes.legend_size"
+                    ng-change="update_attributes()">
+              </span>
+                <label class="form-control" for="studentSetupPictoLegendSizeLarge">
+                  {{ 'large' | translate }}
+                </label>
+              </div>
+            </fieldset>
+          </fieldset>
+        -->
+        </form>
+      </div>
+
+    </div>
+  </div>
+
+      <!-- /configuración dispositivo -->
+
+
+        <!-- Parte derecha: Tutores y dispositivos -->
+
         <!-- Supervisores (terapeutas) del alumno -->
         <div id="student_sups" ng-if="studentData.supervision != 1">
-          <h3 translate>supervisors</h3>
+          <legend translate>supervisors</legend>
           <!-- Buscador de supervisores -->
           <p>
             <form role="search" ng-submit="search_sup()">
@@ -129,7 +382,7 @@
 
         <!-- Tutores (Padres) -->
         <div id="student_tutors" ng-if="studentData.supervision != 1">
-          <h3>{{ 'tutors' | translate }}</h3>
+          <legend translate>tutors</legend>
           <!-- Buscador de tutores -->
           <p>
             <form role="search" ng-submit="search_tutor()">
@@ -171,218 +424,6 @@
         </div>
         <!-- Fin de id student-tutors -->
 
-        <div id="device_setup">
-          <h3>{{ 'device_setup' | translate }}</h3>
-          <form role="form" class="form">
-            <fieldset>
-              <legend>{{ 'categories' | translate }}</legend>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupUseCategories"
-                    ng-model="studentData.attributes.categories"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupUseCategories">{{ 'use_categories' | translate }}</label>
-              </div>
-              <legend>{{ 'picto_style' | translate }}</legend>
-              <div class="form-group">
-                <h4>{{ 'size' | translate }}</h4>
-                <div class="input-group">
-                  <span class="input-group-addon">
-                    <input type="radio"
-                      value="small"
-                      id="studentSetupPictoSizeSmall"
-                      ng-model="studentData.attributes.size"
-                      ng-change="update_attributes()">
-                  </span>
-                  <label class="form-control" for="studentSetupPictoSizeSmall">
-                    {{ 'small' | translate }}
-                  </label>
-                </div>
-                <div class="input-group">
-                  <span class="input-group-addon">
-                    <input type="radio"
-                      value="large"
-                      id="studentSetupPictoSizeLarge"
-                      ng-model="studentData.attributes.size"
-                      ng-change="update_attributes()">
-                </span>
-                  <label class="form-control" for="studentSetupPictoSizeLarge">
-                    {{ 'large' | translate }}
-                  </label>
-                </div>
-              </div>
-            </fieldset>
-            <fieldset>
-              <legend>{{ 'feedback_picto' | translate }}</legend>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupVibrateOnTouch"
-                    ng-model="studentData.attributes.input_feedback.vibration"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupVibrateOnTouch">{{ 'vibration' | translate }}</label>
-              </div>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupBeepOnTouch"
-                    ng-model="studentData.attributes.input_feedback.beep"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupBeepOnTouch">{{ 'beep' | translate }}</label>
-              </div>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupReadOnTouch"
-                    ng-model="studentData.attributes.input_feedback.read"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupReadOnTouch">{{ 'read_picto' | translate }}</label>
-              </div>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupHighlightOnTouch"
-                    ng-model="studentData.attributes.input_feedback.highlight"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupHighlightOnTouch">
-                  {{ 'highlight' | translate }}
-                </label>
-              </div>
-            </fieldset>
-            <!-- DISABLED, NOT IMPLEMENTED YET
-            <fieldset>
-              <legend>{{ 'input_selection' | translate }}</legend>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupSelectOnClick"
-                    ng-model="studentData.attributes.input_selection.click"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupSelectOnClick">
-                  {{ 'click' | translate }}
-                </label>
-              </div>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupSelectOnDoubleClick"
-                    ng-model="studentData.attributes.input_selection.double_click"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupSelectOnDoubleClick">
-                  {{ 'double_click' | translate }}
-                </label>
-              </div>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupSelectOnLongPress"
-                    ng-model="studentData.attributes.input_selection.long_press"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupSelectOnLongPress">
-                  {{ 'press' | translate }}
-                </label>
-              </div>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupSelectOnDrag"
-                    ng-model="studentData.attributes.input_selection.drag"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupSelectOnDrag">
-                  {{ 'drag' | translate }}
-                </label>
-              </div>
-            </fieldset>
-            <fieldset>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="color"
-                    id="studentSetupPictoBackground"
-                    ng-model="studentData.attributes.picto_background"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupPictoBackground">
-                  {{ 'background' | translate }}
-                </label>
-              </div>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="color"
-                    id="studentSetupTapeBackground"
-                    ng-model="studentData.attributes.tape_background"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupTapeBackground">
-                  {{ 'tape_background' | translate }}
-                </label>
-              </div>
-            </fieldset>
-            <fieldset>
-              <legend>{{ 'legend' | translate }}</legend>
-              <div class="input-group">
-                <span class="input-group-addon">
-                  <input type="checkbox"
-                    id="studentSetupShowPictoLegend"
-                    ng-model="studentData.attributes.legend"
-                    ng-change="update_attributes()">
-                </span>
-                <label class="form-control" for="studentSetupShowPictoLegend">
-                  {{ 'show' | translate }}
-                </label>
-              </div>
-              <fieldset class="form-group" ng-disabled="!studentData.attributes.legend">
-                <h4>{{ 'legend_size' | translate }}</h4>
-                <div class="input-group">
-                  <span class="input-group-addon">
-                    <input type="radio"
-                      value="small"
-                      id="studentSetupPictoLegendSizeSmall"
-                      ng-model="studentData.attributes.legend_size"
-                      ng-change="update_attributes()">
-                </span>
-                  <label class="form-control" for="studentSetupPictoLegendSizeSmall">
-                    {{ 'small' | translate }}
-                  </label>
-                </div>
-                <div class="input-group">
-                  <span class="input-group-addon">
-                    <input type="radio"
-                      value="normal"
-                      id="studentSetupPictoLegendSizeNormal"
-                      ng-model="studentData.attributes.legend_size"
-                      ng-change="update_attributes()">
-                </span>
-                  <label class="form-control" for="studentSetupPictoLegendSizeNormal">
-                    {{ 'normal' | translate }}
-                  </label>
-                </div>
-                <div class="input-group">
-                  <span class="input-group-addon">
-                    <input type="radio"
-                      value="large"
-                      id="studentSetupPictoLegendSizeLarge"
-                      ng-model="studentData.attributes.legend_size"
-                      ng-change="update_attributes()">
-                </span>
-                  <label class="form-control" for="studentSetupPictoLegendSizeLarge">
-                    {{ 'large' | translate }}
-                  </label>
-                </div>
-              </fieldset>
-            </fieldset>
-          -->
-          </form>
-        </div>
       </div>
     </div>
     <!-- Fin de row -->

sails/src/tasks/config/concat.js

@@ -25,7 +25,7 @@ module.exports = function (grunt) {
     'assets/app/bower_components/angular-chart.js/dist/angular-chart.min.js',
     'assets/app/bower_components/ng-lodash/build/ng-lodash.js',
     'assets/app/bower_components/ng-file-upload/angular-file-upload-shim.js',
-
+    'assets/app/bower_components/bootstrap-filestyle/src/bootstrap-filestyle.min.js',
     'assets/scripts/lib/sails.io.js'
   ];
   var jsFiles = [