Merge branch 'master' into dev_villa

fuel/app/classes/controller/perfil/index.php

@@ -53,6 +53,9 @@ class Controller_Perfil_Index extends \Controller_App{
         //Paso de las opciones de menu que deben aparecer seleccionadas
         $view->option_menu = $this->_option_menu;
 
+        //Pasar la leyenda para la info funcionamiento de la página
+        $view->leyenda = "En esta pantalla puedes modificar tus datos personales. Generamos tu menú personalizado basándonos en estos datos. No te olvides de mantenerlo actualizado.";
+
         $view -> profile = $this->ws_profile_get();
 
         return Response::forge($view);

fuel/app/views/modals/modalinfo.twig

@@ -3,12 +3,17 @@
 <div class="modal fade" id="modalInfo" tabindex="-1" role="dialog" aria-labelledby="modalInfo">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">Modal Info</h4>
-            </div>
+
             <div class="modal-body">
-                ...
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <div class="text-center">
+                    <i class="fa fa-info-circle fa-5x color-perfil"></i>
+                </div>
+
+                <div class="content text-center pb40">
+                    {{ leyenda }}
+                </div>
+
             </div>
 
         </div>

fuel/app/views/perfil/datos_generales.twig

@@ -15,7 +15,7 @@
 <span class="input input--nao">
     <input class="input__field input__field--nao data-profile" type="text" id="height" rel="height"  name="height" required="" value="{{ profile.height }}"/>
     <label class="input__label input__label--nao" for="height">
-        <span class="input__label-content input__label-content--nao">Altura</span>
+        <span class="input__label-content input__label-content--nao">Altura (cm)</span>
     </label>
     <svg class="graphic graphic--nao" width="300%" height="100%" viewBox="0 0 1200 60" preserveAspectRatio="none">
         <path d="M0,56.5c0,0,298.666,0,399.333,0C448.336,56.5,513.994,46,597,46c77.327,0,135,10.5,200.999,10.5c95.996,0,402.001,0,402.001,0"/>