diff options
| author | elijah <elijah@riseup.net> | 2014-01-23 02:05:37 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-01-23 11:37:50 -0800 |
| commit | 91c535a080f05be23ee1320b0701dae6ff3601af (patch) | |
| tree | a58470bb932a37fc6a049b77f6064c330000057b | |
| parent | 8f624a9f6a130293d921e0f0076a3ecb08b481b7 (diff) | |
move #masthead out of main templates to make the masthead partials more flexible.
| -rw-r--r-- | app/views/home/_masthead.html.haml | 6 | ||||
| -rw-r--r-- | app/views/home/index.html.haml | 30 | ||||
| -rw-r--r-- | app/views/layouts/_masthead.html.haml | 11 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/home.html.haml | 2 |
5 files changed, 19 insertions, 33 deletions
diff --git a/app/views/home/_masthead.html.haml b/app/views/home/_masthead.html.haml index e5d63d6..6759339 100644 --- a/app/views/home/_masthead.html.haml +++ b/app/views/home/_masthead.html.haml @@ -1,6 +1,4 @@ -# An example masthead: -# --# #masthead-text --# .container-fluid --# .row-fluid --# %h1 Example
\ No newline at end of file +-# #masthead +-# %h1 Example
\ No newline at end of file diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 2d5b238..147cacd 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,21 +1,9 @@ -!!! -%html - %head - %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"} - %title= html_title - %meta{:content => content_for?(:description) ? yield(:description) : "Leap Web", :name => "description"} - = stylesheet_link_tag "application", :media => "all" - = javascript_include_tag "application" - = csrf_meta_tags - = yield(:head) - %body - #wrap - #masthead - = render 'home/masthead' - #main - .container-fluid - = render 'home/content' - #push - -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 - #footer - = render 'layouts/footer'
\ No newline at end of file +#wrap + = render 'home/masthead' + #main + .container-fluid + = render 'home/content' + #push + -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 +#footer + = render 'layouts/footer'
\ No newline at end of file diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml index 5f40c05..35225a1 100644 --- a/app/views/layouts/_masthead.html.haml +++ b/app/views/layouts/_masthead.html.haml @@ -1,5 +1,6 @@ -.title - %span.sitename - %a{:href => home_path}= APP_CONFIG[:domain] - - if @show_navigation - = t(:user_control_panel)
\ No newline at end of file +#masthead + .title + %span.sitename + %a{:href => home_path}= APP_CONFIG[:domain] + - if @show_navigation + = t(:user_control_panel)
\ No newline at end of file diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e52ca7f..1cd4ec3 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,8 +11,7 @@ = yield(:head) %body #wrap - #masthead - = render 'layouts/masthead' + = render 'layouts/masthead' #main .container-fluid - if logged_in? diff --git a/app/views/layouts/home.html.haml b/app/views/layouts/home.html.haml index e6fa15d..8451de5 100644 --- a/app/views/layouts/home.html.haml +++ b/app/views/layouts/home.html.haml @@ -8,5 +8,5 @@ = javascript_include_tag "application" = csrf_meta_tags = yield(:head) - %body + %body.home = yield
\ No newline at end of file |