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/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 = [