From 98d8d87232f5d829c79dd06d33d59a09a7025bc9 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 2 Jul 2014 17:15:50 +0200 Subject: [PATCH] getting started + login CSS WIP --- .../app/controllers/getting_started.js.coffee | 2 +- .../app/controllers/login.js.coffee | 2 + .../app/views/getting_started.jst.eco | 50 ++--- .../javascripts/app/views/login.jst.eco | 78 ++++---- .../javascripts/app/views/navigation.jst.eco | 2 +- app/assets/stylesheets/application.css | 1 + app/assets/stylesheets/layout.css | 161 ++++++++++++++++ app/assets/stylesheets/zzz.css | 174 +++++++++++------- app/views/init/index.html.erb | 4 +- app/views/layouts/application.html.erb | 2 +- 10 files changed, 330 insertions(+), 146 deletions(-) create mode 100755 app/assets/stylesheets/layout.css diff --git a/app/assets/javascripts/app/controllers/getting_started.js.coffee b/app/assets/javascripts/app/controllers/getting_started.js.coffee index e0d61a29e..66a406226 100644 --- a/app/assets/javascripts/app/controllers/getting_started.js.coffee +++ b/app/assets/javascripts/app/controllers/getting_started.js.coffee @@ -1,5 +1,5 @@ class Index extends App.ControllerContent - className: 'container getstarted' + className: 'getstarted fit vertical center justified' events: 'submit form': 'submit', diff --git a/app/assets/javascripts/app/controllers/login.js.coffee b/app/assets/javascripts/app/controllers/login.js.coffee index b0631736c..dcc87a325 100644 --- a/app/assets/javascripts/app/controllers/login.js.coffee +++ b/app/assets/javascripts/app/controllers/login.js.coffee @@ -1,4 +1,6 @@ class Index extends App.ControllerContent + className: 'login fit vertical center justified' + events: 'submit #login': 'login' diff --git a/app/assets/javascripts/app/views/getting_started.jst.eco b/app/assets/javascripts/app/views/getting_started.jst.eco index 1d5f946e2..2cf98639e 100644 --- a/app/assets/javascripts/app/views/getting_started.jst.eco +++ b/app/assets/javascripts/app/views/getting_started.jst.eco @@ -1,36 +1,22 @@

<%- @T( 'Getting started!' ) %>

-
-
-
-
    -
  1. <%- @T( 'Create Admin' ) %>
  2. -
  3. <%- @T( 'Invite Agents' ) %>
  4. -
  5. <%- @T( 'Configure Channels' ) %>
  6. -
-
-
-
- <% if @master_user: %> -
-

<%- @T( 'Create Admin' ) %>

-
- -
-
- <% end %> -
-

<%- @T( 'Invite Agents' ) %>

-
- -
-
-
-

<%- @T( 'Tour' ) %>

-

- <%- @T( 'Learn all about ...' ) %> -

-
-
+
    +
  1. <%- @T( 'Create Admin' ) %>
  2. +
  3. <%- @T( 'Invite Agents' ) %>
  4. +
  5. <%- @T( 'Configure Channels' ) %>
  6. +
+ <% if @master_user: %> +
+

<%- @T( 'Create Admin' ) %>

+
+ +
+
+ <% end %> +
+

<%- @T( 'Invite Agents' ) %>

+
+ +
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco index a6a360071..ed27f8011 100644 --- a/app/assets/javascripts/app/views/login.jst.eco +++ b/app/assets/javascripts/app/views/login.jst.eco @@ -1,50 +1,46 @@ -
+

Login with zeughaus.znuny.com:

-
-

<%- @T( 'Welcome stranger!' ) %>

+
+
+ + -
-

<%- @T( 'Sign in with' ) %>

- - - - -
- - <% if @C('user_lost_password'): %> - · - <%- @T( 'Forgot password?' ) %> - <% end %> -
- -
+ + - <% if !_.isEmpty( @auth_providers ): %> -
-

--- <%- @T( 'or' ) %> ---

-
+ -
-

<%- @T( 'Sign in using' ) %>

-
- <% end %> - - <% if @C('user_create_account'): %> -
-

--- <%- @T( 'or' ) %> ---

-
- -
-

<%- @T( 'New to %s join today!', @C( 'product_name' ) ) %>

-

<%- @T( 'Sign up' ) %> -

- <% end %> + +
+<% if !_.isEmpty( @auth_providers ): %> +
+

--- <%- @T( 'or' ) %> ---

-
+
+

<%- @T( 'Sign in using' ) %>

+ +
+<% end %> + +<% if @C('user_create_account'): %> +
+

--- <%- @T( 'or' ) %> ---

+
+ +
+

<%- @T( 'New to %s join today!', @C( 'product_name' ) ) %>

+

<%- @T( 'Sign up' ) %> +

+<% end %> diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index 15a100bce..3336d01f0 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -1,4 +1,4 @@ -