diff --git a/app/assets/images/tracks-logo-dark.png b/app/assets/images/tracks-logo-dark.png new file mode 100644 index 00000000..9476f37d Binary files /dev/null and b/app/assets/images/tracks-logo-dark.png differ diff --git a/app/assets/javascripts/tracks.js.coffee b/app/assets/javascripts/tracks.js.coffee new file mode 100644 index 00000000..83a51236 --- /dev/null +++ b/app/assets/javascripts/tracks.js.coffee @@ -0,0 +1 @@ +# Tracks specific coffeescript \ No newline at end of file diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss new file mode 100644 index 00000000..102d6645 --- /dev/null +++ b/app/assets/stylesheets/tracks.css.scss @@ -0,0 +1,18 @@ +/* + * Tracks CSS +*/ + +.navbar-inner { + background-color: #000; + background-image: none; +} + +footer { + text-align: center; + background-color: #000; + background-image: linear-gradient(to bottom, #FFFFFF, #F2F2F2); +} + +div#tracks-login-form { + margin: 0 0 100px 0; +} \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 00000000..ad7daf2a --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,89 @@ + + + + + + + <%= content_for?(:title) ? yield(:title) : "Tracksapp" %> + <%= csrf_meta_tags %> + + + + + <%= stylesheet_link_tag "application", :media => "all" %> + + + + <%= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %> + + + + <%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %> + + + + <%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %> + + + + <%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %> + + + + <%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %> + + + +
+
+
+ + + + + + Tracksapp +
+
    +
  • <%= link_to "Link1", "/path1" %>
    • +
  • <%= link_to "Link2", "/path2" %>
    • +
  • <%= link_to "Link3", "/path3" %>
    • +
+
+
+
+
+ +
+
+
+
+
    +
  • Sidebar
    • +
  • <%= link_to "Link1", "/path1" %>
    • +
  • <%= link_to "Link2", "/path2" %>
    • +
  • <%= link_to "Link3", "/path3" %>
    • +
+
+
+
+ <%= bootstrap_flash %> + <%= yield %> +
+
+ + + +
+ + + + <%= javascript_include_tag "application" %> + + + diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index d09bd531..0a04e3c6 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -1,17 +1,66 @@ - - - - - <%= stylesheet_link_tag "login" %> - <%= favicon_link_tag 'favicon.ico' %> - <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> -<%= @page_title -%> + + + + + + + <%= content_for?(:title) ? yield(:title) : @page_title %> + <%= csrf_meta_tags %> - - + + -<%= yield %> + <%= stylesheet_link_tag "application", :media => "all" %> -<%= render :partial => "shared/footer" %> - + + + <%= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %> + + + + <%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %> + + + + <%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %> + + + + <%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %> + + + + <%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %> + + + +
+
+
+ <%= image_tag "tracks-logo-dark.png"%> +
+
+
+ +
+
+
+ <%= bootstrap_flash %> + <%= yield %> +
+
+
+ + <%= render partial: "shared/footer" %> + + <% + # Javascripts + # ================================================== + # Placed at the end of the document so the pages load faster + -%> + <%= javascript_include_tag "application" %> + + diff --git a/app/views/login/login.html.erb b/app/views/login/login.html.erb index 7db9c2d9..290593eb 100644 --- a/app/views/login/login.html.erb +++ b/app/views/login/login.html.erb @@ -1,28 +1,30 @@ -
+
+ <%= form_tag(login_path, class: "form-horizontal") do %> +
+
+

<%= t('login.please_login') %>

+
+
- <%= render_flash %> - -

<%= t('login.please_login') %>:

-
- <%= form_tag :action=> 'login' do %> - - - - - - - - - - - - - - - - - -
- <% end %> -
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+ <% end %>
\ No newline at end of file diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index 063c55c4..a87e7606 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,8 +1,14 @@ - +