Skip to content

Commit

Permalink
Merge pull request RocketChat#10 from alfonsofiz/UiOnboardingReview
Browse files Browse the repository at this point in the history
UI Onboargind Review
  • Loading branch information
leolara authored Sep 13, 2016
2 parents b8e2bdf + 7f4a61e commit 2aa070d
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 27 deletions.
6 changes: 3 additions & 3 deletions client/clase/OnBoarding/OnBoarding2.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template name="OnBoarding2">
<section class="full-page">
<div class="wrapper-onboarding">
<img class="img-onboarding" src="/images/onboarding2.png">
<img class="img-onboarding" src="/images/paso1.png">
<div class="clase-tittle-onboarding" >
<p>Solo lo relevante</p>
<p>Mantente informado</p>
</div>
<div class="clase-desc-onboarding" >
<p>Cuando no tengas tiempo para debates que no conciernen directamente a tus hijos cambia de modo.<br>Tú elijes si ver todo o solo lo importante, ¡y solo tú sabes el modo de visionado!</p>
<p>Únete al grupo de la clase de tu hij@ y mantente informado de todo lo que ocurre </p>
</div>
<button class="button-onboarding" id="clase_next">Siguiente</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/clase/OnBoarding/OnBoarding2.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Template.OnBoarding2.onRendered(function() {

Template.OnBoarding2.events({
'click #clase_next': function() {
FlowRouter.go("OnBoarding3")
FlowRouter.go('OnBoarding3')
}
})
});
6 changes: 3 additions & 3 deletions client/clase/OnBoarding/OnBoarding3.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template name="OnBoarding3">
<section class="full-page">
<div class="wrapper-onboarding">
<img class="img-onboarding" src="/images/onboarding3.png">
<img class="img-onboarding" src="/images/paso2.png">
<div class="clase-tittle-onboarding" >
<p>El profesor cuenta</p>
<p>Solo lo relevante</p>
</div>
<div class="clase-desc-onboarding" >
<p>Pero no puede leer los comentarios. Este es un chat que solo pueden visionar los padres aunque el profesor puede enviar mensajes.<br> Podrás verlos destacados y en diferente color. </p>
<p>Cuando no tengas tiempo para debates que no conciernen directamente a tus hijos cambia de modo.<br>Tú elijes si ver todo o solo lo importante, ¡y solo tú sabes el modo de visionado!</p>
</div>
<button class="button-onboarding" id="clase_next">Siguiente</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/clase/OnBoarding/OnBoarding3.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ Template.OnBoarding3.onRendered(function() {

Template.OnBoarding3.events({
'click #clase_next': function() {
FlowRouter.go("OnBoarding4")
FlowRouter.go('OnBoarding4')
}
})
});
16 changes: 8 additions & 8 deletions client/clase/OnBoarding/OnBoarding4.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template name="OnBoarding4">
<section class="full-page">
<div class="wrapper">
<div class="clase-logo-b" >
<p>clase</p>
<div class="wrapper-onboarding">
<img class="img-onboarding" src="/images/paso3.png">
<div class="clase-tittle-onboarding" >
<p>El profesor cuenta</p>
</div>
<div class="clase-desc-b" >
<p>Comunicación entre padres<br>simple y efectiva</p>
</div>
<button class="button-onboarding" id="clase_register">Crear Cuenta</button>
<button class="input-submit-light" id="clase_login">Ya tengo cuenta</button>
<div class="clase-desc-onboarding" >
<p>Pero no puede leer los comentarios. Este es un chat que solo pueden visionar los padres aunque el profesor puede enviar mensajes.<br> Podrás verlos destacados y en diferente color. </p>
</div>
<button class="button-onboarding" id="clase_next">Siguiente</button>
</div>
</section>
</template>
12 changes: 3 additions & 9 deletions client/clase/OnBoarding/OnBoarding4.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ Template.OnBoarding4.onRendered(function() {
});

Template.OnBoarding4.events({
'click #clase_register': function() {
Session.set("loginDefaultState","register");
FlowRouter.go("home");

},
'click #clase_login': function() {
Session.set("loginDefaultState","login");
FlowRouter.go("home");
'click #clase_next': function() {
FlowRouter.go('OnBoarding5');
}
})
});
14 changes: 14 additions & 0 deletions client/clase/OnBoarding/OnBoarding5.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<template name="OnBoarding5">
<section class="full-page">
<div class="wrapper">
<div class="clase-logo-b" >
<p>clase</p>
</div>
<div class="clase-desc-b" >
<p>Comunicación entre padres<br>simple y efectiva</p>
</div>
<button class="button-onboarding" id="clase_register">Crear Cuenta</button>
<button class="input-submit-light" id="clase_login">Ya tengo cuenta</button>
</div>
</section>
</template>
15 changes: 15 additions & 0 deletions client/clase/OnBoarding/OnBoarding5.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Template.OnBoarding5.onRendered(function() {
$('#initial-page-loading').remove();
});

Template.OnBoarding5.events({
'click #clase_register': function() {
Session.set('loginDefaultState', 'register');
FlowRouter.go('home');

},
'click #clase_login': function() {
Session.set('loginDefaultState', 'login');
FlowRouter.go('home');
}
});
5 changes: 5 additions & 0 deletions client/clase/routes.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ FlowRouter.route '/OnBoarding4',
action: ->
BlazeLayout.render 'OnBoarding4'

FlowRouter.route '/OnBoarding5',
name: 'OnBoarding5'
action: ->
BlazeLayout.render 'OnBoarding5'

FlowRouter.route '/claseHome',
name: 'claseHome'
action: ->
Expand Down
Binary file added public/images/paso1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/paso2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/paso3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2aa070d

Please sign in to comment.