transitions working

parent 8aaa2996
......@@ -22,7 +22,7 @@
"humanize-duration": "~3.0.0",
"momentjs": "~2.10.3",
"ngtoast": "~1.5.4",
"angular-animate": "~1.4.1",
"angular-animate": "~1.2.2",
"angular-sanitize": "~1.4.1",
"angular-chart.js": "latest",
"ng-lodash": "~0.3.0",
......@@ -34,7 +34,6 @@
},
"resolutions": {
"angular": ">=1 <1.3.0",
"humanize-duration": "~3.0.0",
"momentjs": "~2.10.3"
"humanize-duration": "~3.0.0"
}
}
......@@ -41,7 +41,9 @@
"August": "August",
"average_time_between_pictos": "Average time between pictograms",
"average_time_per_try": "Average time per try",
"back": "Back",
"background": "Background",
"back_to_login": "Back to login",
"beep": "Beep",
"birthdate": "Birthdate",
"black_and_white": "B&W",
......@@ -235,6 +237,7 @@
"new_scene_with_categories": "Create scene with categories",
"new_scene_without_categories": "Create scene without categories",
"new_session": "New session",
"next": "Next",
"next_actions": "Next actions",
"next_sessions": "Next sessions",
"no": "No",
......@@ -273,6 +276,7 @@
"own_pictos": "Your pictograms",
"tos": "Your pictograms",
"pages": "Pages",
"parents_tutor": "Parent or tutor",
"password": "Password",
"password_changed": "Password changed sucessfully",
"password_confirm": "Repeat password",
......@@ -402,6 +406,7 @@
"tag_deleted": "Tag deleted",
"tape_background": "Tape background",
"template_deleted": "Template deleted",
"therapist": "Therapist",
"therapists": "Therapists",
"time_hours": "Time: {{hours}} hours",
"time_instruction_method": "Time instructions of method",
......
......@@ -41,7 +41,9 @@
"August": "Agosto",
"average_time_between_pictos": "Tiempo medio entre pictogramas",
"average_time_per_try": "Tiempo medio por intento",
"back": "Volver",
"background": "Fondo",
"back_to_login": "Volver a inicio de sesión",
"beep": "Pitido",
"birthdate": "Fecha de nacimiento",
"black_and_white": "ByN",
......@@ -235,6 +237,7 @@
"new_scene_with_categories": "Crear escena con categorías",
"new_scene_without_categories": "Crear escena sin categorías",
"new_session": "Nueva sesión",
"next": "Siguiente",
"next_actions": "Acciones posteriores",
"next_sessions": "Sesiones posteriores",
"no": "No",
......@@ -272,6 +275,7 @@
"own_labels": "Etiquetas propias",
"own_pictos": "Pictogramas propios",
"pages": "Páginas",
"parents_tutor": "Padre, madre o tutor",
"password": "Contraseña",
"password_changed": "La clave ha sido modificada exitosamente.",
"password_confirm": "Repita la contraseña",
......@@ -397,12 +401,13 @@
"supervisor_note": "Si los padres no se van a dar de alta en la plataforma nunca, el administrador puede anotar la información de contacto en el campo notas.",
"supervisor_updated": "Supervisor actualizado",
"support": "Atención al cliente",
"therapists": "Terapeutas",
"supervisors": "Supervisores",
"surname": "Apellidos",
"tag_deleted": "Etiqueta borrada",
"tape_background": "Fondo de la cinta",
"template_deleted": "Plantilla eliminada",
"therapists": "Terapeutas",
"therapist": "Terapeuta",
"time_hours": "Tiempo: {{hours}} horas",
"time_instruction_method": "Tiempo instrucciones del método",
"time_sessions_total": "Tiempo total de sesiones",
......
......@@ -8,6 +8,7 @@
dashboardControllers.controller('LoginCtrl',
function LoginCtrl(
$scope,
$rootScope,
$http,
$window,
$translate,
......@@ -15,8 +16,28 @@ function LoginCtrl(
$location,
config,
$stateParams,
$timeout,
ngToast) {
$scope.slide = {
state: 'login',
prev: 'login',
back: false,
rightTo: function (state) {
$scope.slide.back = false;
$timeout(function () {
$scope.slide.state = state;
}, 0);
},
leftTo: function (state) {
$scope.slide.back = true;
$timeout(function () {
$scope.slide.state = state;
}, 0);
}
};
$scope.credentials = {
email: '',
password: '',
......
......@@ -1098,3 +1098,47 @@ input.editable.scene-name {
font-size: 16px;
font-weight: 600;
}
.float-right {
float: right;
}
/* Estilos para ngSwitch */
.switch-panel-body {
position:relative;
width: 900px;
margin: auto;
}
.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;
position:absolute;
}
.switch-animation.ng-enter,
.switch-animation-back.ng-leave.ng-leave-active {
left:100%;
}
.switch-animation.ng-leave,
.switch-animation.ng-enter.ng-enter-active,
.switch-animation-back.ng-leave,
.switch-animation-back.ng-enter.ng-enter-active {
left:0;
}
.switch-animation.ng-leave.ng-leave-active,
.switch-animation-back.ng-enter {
left:-100%;
}
.switch-panel {
overflow:hidden;
}
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