Skip to content

yotta / pictogram

Go to a project
Commit 9d2550ea by Arturo Montejo Ráez
Options

fixing layout problems in student setup

parent 0491f518
Inline Side-by-side
Showing with 23 additions and 17 deletions
sails/src/assets/app/i18n/en-gb.json
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
"finished": "Finished", "finished": "Finished",
"firmware": "Firmware id", "firmware": "Firmware id",
"free_category": "Free category", "free_category": "Free category",
"gender": "Gender",
"general_labels": "General labels", "general_labels": "General labels",
"generate": "Generate", "generate": "Generate",
"generate_serial": "Generate serial number", "generate_serial": "Generate serial number",
......
sails/src/assets/app/i18n/es-es.json
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
"finished": "Completada", "finished": "Completada",
"firmware": "Id firmware", "firmware": "Id firmware",
"free_category": "Categoría libre", "free_category": "Categoría libre",
"gender": "Género",
"general_labels": "Generales", "general_labels": "Generales",
"generate": "Generar", "generate": "Generar",
"generate_serial": "Generar número de serie", "generate_serial": "Generar número de serie",
......
sails/src/assets/scripts/modules/student/views/setup.html
...@@ -6,12 +6,11 @@ ...@@ -6,12 +6,11 @@
<div id="student_personal_edit"> <div id="student_personal_edit">
<form role="form" ng-submit="updateStudent()"> <form role="form" ng-submit="updateStudent()">
<h3>{{ 'account' | translate }}</h3> <legend translate>account</legend>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<legend translate>profile_picture</legend>
<!-- Preview --> <!-- Preview -->
<img class="thumbnail preview" ng-src="{{studentData.pic}}" /> <img class="thumbnail preview" ng-src="{{studentData.pic}}" />
<!-- Fin Cambiar imagen de perfil --> <!-- Fin Cambiar imagen de perfil -->
...@@ -23,7 +22,6 @@ ...@@ -23,7 +22,6 @@
<div class="col-md-6"> <div class="col-md-6">
<fieldset> <fieldset>
<legend translate>credentials</legend>
<div class="form-group"> <div class="form-group">
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formUser.username" readonly/> <input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formUser.username" readonly/>
</div> </div>
...@@ -35,6 +33,7 @@ ...@@ -35,6 +33,7 @@
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm"/> <input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<span translate>license_number</span>:
<input type="text" id="setup_license" mask="9999-9999-9999-9999" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formUser.license_number" required> <input type="text" id="setup_license" mask="9999-9999-9999-9999" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formUser.license_number" required>
<br/> <br/>
<span ng-show="studentData.license && !studentData.license_expired" class="text-info"> <span ng-show="studentData.license && !studentData.license_expired" class="text-info">
...@@ -58,15 +57,17 @@ ...@@ -58,15 +57,17 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<span translate>name</span>:
<input type="text" class="form-control" id="student_personal_edit_name" placeholder="{{ 'name' | translate }}" ng-model="formUser.name" required /> <input type="text" class="form-control" id="student_personal_edit_name" placeholder="{{ 'name' | translate }}" ng-model="formUser.name" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<span translate>surname</span>:
<input type="text" class="form-control" id="student_personal_edit_surname" placeholder="{{ 'surname' | translate }}" ng-model="formUser.surname" required /> <input type="text" class="form-control" id="student_personal_edit_surname" placeholder="{{ 'surname' | translate }}" ng-model="formUser.surname" required />
</div> </div>
<div class="form-group"> <div class="form-group">
<p class="input-group"> <p class="input-group">
<span translate>birthdate</span>:
<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 /> <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"> <span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button> <button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<span translate>gender</span>:
<select class="form-control" name="student_gender" id="student_gender" ng-model="formUser.gender" required> <select class="form-control" name="student_gender" id="student_gender" ng-model="formUser.gender" required>
<option value=" ">&nsp;</option> <option value=" ">&nsp;</option>
<option value="F" translate>woman</option> <option value="F" translate>woman</option>
...@@ -86,6 +88,7 @@ ...@@ -86,6 +88,7 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<span translate>country</span>:
<select class="form-control" name="student_country" id="student_country" ng-model="formUser.country" required> <select class="form-control" name="student_country" id="student_country" ng-model="formUser.country" required>
<option value="ES">España</option> <option value="ES">España</option>
<option value="US">United States</option> <option value="US">United States</option>
...@@ -126,24 +129,26 @@ ...@@ -126,24 +129,26 @@
<div class="col-md-6"> <div class="col-md-6">
<div id="device_setup"> <div id="device_setup">
<h3>{{ 'device_setup' | translate }}</h3> <legend translate>device_setup</legend>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<form role="form" class="form"> <form role="form" class="form">
<fieldset> <fieldset>
<legend>{{ 'categories' | translate }}</legend> <span translate>categories</span>:
<div class="input-group"> <div class="form-group">
<span class="input-group-addon"> <div class="input-group">
<input type="checkbox" <span class="input-group-addon">
id="studentSetupUseCategories" <input type="checkbox"
ng-model="studentData.attributes.categories" id="studentSetupUseCategories"
ng-change="update_attributes()"> ng-model="studentData.attributes.categories"
</span> ng-change="update_attributes()">
<label class="form-control" for="studentSetupUseCategories">{{ 'use_categories' | translate }}</label> </span>
<label class="form-control" for="studentSetupUseCategories">{{ 'use_categories' | translate }}</label>
</div>
</div> </div>
<legend>{{ 'picto_size' | translate }}</legend> <span translate>picto_size</span>:
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"> <span class="input-group-addon">
...@@ -176,7 +181,7 @@ ...@@ -176,7 +181,7 @@
<div class="col-md-6"> <div class="col-md-6">
<fieldset> <fieldset>
<legend>{{ 'feedback_picto' | translate }}</legend> <span translate>feedback_picto</span>:
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"> <span class="input-group-addon">
<input type="checkbox" <input type="checkbox"
...@@ -352,7 +357,6 @@ ...@@ -352,7 +357,6 @@
<!-- Parte derecha: Tutores y dispositivos --> <!-- Parte derecha: Tutores y dispositivos -->
<h3>{{ 'supervisors' | translate }}</h3>
<!-- Supervisores (terapeutas) del alumno --> <!-- Supervisores (terapeutas) del alumno -->
<div id="student_sups" ng-if="studentData.supervision != 1"> <div id="student_sups" ng-if="studentData.supervision != 1">
<legend translate>therapists</legend> <legend translate>therapists</legend>
......
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