Skip to content

yotta / pictogram

Go to a project
Commit 2ff19d74 by Arturo Montejo Ráez
Options

add student wizard mockup ready

parent 9885ef02
Expand all
Inline Side-by-side
Showing with 41 additions and 161 deletions
sails/src/assets/app/i18n/en-gb.json
......@@ -446,7 +446,8 @@
"use_categories": "Use categories",
"username": "Name of account (no spaces)",
"username_exists": "There is already an account with name '{{username}}'",
"user_created": "User {{name}} {{surname}} created. An email with instructions to activate the account has been sent.",
"user_created": "Account created!",
"user_created_text": "An email with instructions to activate the account has been sent to {{email}}.",
"user_exists": "User with email {{email}} already exists",
"validate_fail": "The user account couldn't be validated",
"validate_success": "The user account has been validated. Now, you can login from the link below",
......
sails/src/assets/app/i18n/es-es.json
......@@ -446,7 +446,8 @@
"use_categories": "Usar categorías",
"username": "Nombre cuenta (sin espacios)",
"username_exists": "Ya existe un usuario con nombre de cuenta '{{username}}'",
"user_created": "Usuario {{name}} {{surname}} creado. Se ha enviado un email de confirmación para activar su cuenta.",
"user_created": "¡Cuenta creada!",
"user_created_text": "Se ha enviado un email de confirmación para activar su cuenta a la dirección {{email}}.",
"user_exists": "Ya existe el usuario con email '{{email}}'",
"validate_fail": "La cuenta no se ha podido validar",
"validate_success": "Cuenta validada. Puede iniciar sesión desde el enlace inferior",
......
sails/src/assets/app/img/office.jpg
sails/src/assets/app/img/office.jpg

14.7 KB | W: | H:

sails/src/assets/app/img/office.jpg

11.7 KB | W: | H:

sails/src/assets/app/img/office.jpg
sails/src/assets/app/img/office.jpg
sails/src/assets/app/img/office.jpg
sails/src/assets/app/img/office.jpg
  • 2-up
  • Swipe
  • Onion skin
sails/src/assets/app/img/parents.png
sails/src/assets/app/img/parents.png

32 KB | W: | H:

sails/src/assets/app/img/parents.png

25.4 KB | W: | H:

sails/src/assets/app/img/parents.png
sails/src/assets/app/img/parents.png
sails/src/assets/app/img/parents.png
sails/src/assets/app/img/parents.png
  • 2-up
  • Swipe
  • Onion skin
sails/src/assets/app/img/therapist.png
sails/src/assets/app/img/therapist.png

24.6 KB | W: | H:

sails/src/assets/app/img/therapist.png

23 KB | W: | H:

sails/src/assets/app/img/therapist.png
sails/src/assets/app/img/therapist.png
sails/src/assets/app/img/therapist.png
sails/src/assets/app/img/therapist.png
  • 2-up
  • Swipe
  • Onion skin
sails/src/assets/scripts/modules/login/controllers/login.js
......@@ -26,12 +26,14 @@ function LoginCtrl(
rightTo: function (state) {
$scope.slide.back = false;
$scope.slide.prev = $scope.slide.state;
$timeout(function () {
$scope.slide.state = state;
}, 0);
},
leftTo: function (state) {
$scope.slide.back = true;
$scope.slide.prev = $scope.slide.state;
$timeout(function () {
$scope.slide.state = state;
}, 0);
......
sails/src/assets/scripts/modules/login/views/loginform.html deleted 100644 → 0
<!-- Form column and offset -->
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-4">
<!-- Formulario -->
<!-- LoginCtrl controls here, see app.js -->
<form name="loginForm" ng-submit="login()" novalidate>
<!-- Email -->
<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>
<!-- Password -->
<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="row">
<div class="col-xs-6">
<!-- Login -->
<div class="pull-left">
<button type="submit" class="btn btn-primary" translate>login</button>
</div>
<!-- Spinner -->
<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>
<div class="col-xs-6 margin-top7">
<!-- Remember -->
<div class="checkbox">
<label>
<input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }}
</label>
</div>
</div>
</div>
<br>
<!-- Remember password -->
<div class="row text-center">
<a href="/app/#/changepass" translate>password_forgotten</a>
</div>
<!-- Create account -->
<div class="row text-center">
<a ng-click="pane.state = 'accounts'; pane2.state = 'accounts'" translate>create_an_account</a>
</div>
</form>
</div>
<!--/. form column -->
<!-- Image column -->
<div class="col-md-4 text-center">
<img src="img/login.png" alt="Pictogram" title="Pictogram" />
</div>
<!--/. image column -->
<div class="col-md-2">
</div>
</div>
<!--/. login -->
sails/src/assets/scripts/modules/login/views/signup.html deleted 100644 → 0
<div class="switch-panel-body" ng-switch="pane2.state">
<!-- signup pane -->
<div class="switch-animation" ng-switch-when="accounts">
<h2>Elija el tipo de cuenta</h2>
<div class="row">
<div class="col-md-4">
<legend translate>parents_tutor</legend>
<div class="text-center">
<a ng-click="showTutorForm()"><img src="img/parents.png" alt="Parents" title="Parents" /></a>
</div>
<div>
<p>Gestione los pictogramas de su hijo o hija y configure su dispositivo de comunicación.</p>
</div>
</div>
<div class="col-md-4">
<legend translate>therapist</legend>
<div class="text-center">
<a ng-click="showTherapistForm()"><img src="img/therapist.png" alt="Therapist" title="Therapist" /></a>
</div>
<div>
<p>Gestione pictogramas, dispositivos, grabe sesiones de terapia y obtenga estadísticas de evolución.</p>
</div>
</div>
<div class="col-md-4">
<legend translate>office_center</legend>
<div class="text-center">
<a ng-click="pane2.state = 'signup_office'"><img src="img/office.jpg" alt="Office" title="Office" /></a>
</div>
<div>
<p>Gestione alumnos y equipos de intervención, además de todas las funcionalidades propias de un terapeuta.</p>
</div>
</div>
</div>
</div>
<div class="switch-animation row" ng-switch-when="signup_office">
<legend translate>office_center</legend>
<div class="col-md-4 text-center">
<img src="img/office.jpg" alt="Office" title="Office" />
</div>
<div class="form-group col-md-4" id="office_form">
<div class="form-group">
<input type="text" class="form-control" placeholder="{{ 'name' | translate }}" ng-model="formdata.office.name"/>
</div>
<div class="form-group">
<input type="email" class="form-control" placeholder="{{ 'email' | translate }}" ng-model="formdata.office.email"/>
</div>
<fieldset>
<span class="color_red text_sm pull-right" ng-show="formdata.password != formdata.password_confirm" translate>password_match</span>
<div class="form-group">
<input type="password" class="form-control" id="signin_password1" placeholder="{{ 'password_type' | translate }}"/>
</div>
<div class="form-group">
<input type="password" class="form-control" id="signin_password2" placeholder="{{ 'password_confirm' | translate }}"/>
</div>
</fieldset>
<div class="row form-group">
<div class="col-xs-6">
<button class="btn btn-default" ng-click="pane2.state = 'accounts'">&lt;&lt; Volver</button>
</div>
<div class="col-xs-6">
<button class="btn btn-primary float-right">Continuar &gt;&gt; </button>
</div>
</div>
</div>
</div>
<!-- login pane -->
<div class="switch-animation" ng-switch-when="signup2">
<div class="form-group">
<legend></legend>
<input type="checkbox" ng-model="formdata.disclaimer_accepted">
<span translate>disclaimer_accept</span>
</div>
<div class="form-group">
<legend>Captcha</legend>
<div vc-recaptcha></div>
</div>
</div>
</div>
<div class="row text-center">
<br><br>
<a ng-click="pane.state = 'login'"><< {{ 'back_to_login' | translate }}</a>
</div>
sails/src/assets/scripts/modules/supervisor/controllers/students.js
......@@ -13,6 +13,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
$window,
$translate,
ngToast,
$timeout,
IOService) {
$scope.formdatastudent = {
username: '',
......@@ -27,6 +28,27 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
office: $scope.user.office || { name: '' }
};
$scope.slide = {
state: 'accounts',
prev: 'accounts',
back: false,
rightTo: function (state) {
$scope.slide.back = false;
$scope.slide.prev = $scope.slide.state;
$timeout(function () {
$scope.slide.state = state;
}, 0);
},
leftTo: function (state) {
$scope.slide.back = true;
$scope.slide.prev = $scope.slide.state;
$timeout(function () {
$scope.slide.state = state;
}, 0);
}
};
// Flags for showing buttons according to role
$scope.user = JSON.parse($window.sessionStorage.user);
......
sails/src/assets/scripts/modules/supervisor/views/students.html
<!-- StudentsCtrl controls here, see app.js -->
<div class="panel panel-default">
<!-- Default panel contents -->
<div class="panel-heading"><h3 class="panel-title" translate>students</h3>
<div class="panel-heading"><h3 class="color-green" translate>students</h3>
<!-- span ng-if="user.isAdmin">({{user.office.currentStudents}}/{{user.office.maxStudents}} - <span translate="licenses_left" translate-values="{number: num_licenses_left}"></span>)</span -->
<div class="panel-body">
......
sails/src/assets/styles/main.css
......@@ -1106,18 +1106,25 @@ input.editable.scene-name {
/* Estilos para ngSwitch */
.switch-panel-body {
position:relative;
width: 900px;
width: 930px;
height: 500px;
margin: auto;
overflow:hidden;
}
.switch-animation,
.switch-animation-back {
width: 900px;
}
.switch-animation.ng-enter,
.switch-animation.ng-leave,
.switch-animation-back.ng-enter,
.switch-animation-back.ng-leave {
-webkit-transition:0.2s linear all;
-moz-transition:0.2s linear all;
-o-transition:0.2s linear all;
transition:0.2s linear all;
-webkit-transition:0.5s linear all;
-moz-transition:0.5s linear all;
-o-transition:0.5s linear all;
transition: 0.5s linear all;
position:absolute;
}
......
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