Integrate the splash page into the general layout
* Cleanup the CSS * Fix more views then you have fingers and toes * Introduce position(weight) for sponsor levels * Fix bootstrap/datatable integration
This commit is contained in:
parent
7acd16f923
commit
f2cdea4f1a
56 changed files with 1191 additions and 1266 deletions
|
|
@ -6,7 +6,6 @@
|
|||
%meta{:content => "", :name => "description"}
|
||||
%meta{:content => "", :name => "author"}
|
||||
= stylesheet_link_tag "application", :media => "all"
|
||||
= stylesheet_link_tag "splash" if content_for :splash
|
||||
= javascript_include_tag "application"
|
||||
= csrf_meta_tags
|
||||
:javascript
|
||||
|
|
@ -25,23 +24,16 @@
|
|||
|
||||
= javascript_include_tag "//cdn.transifex.com/live.js"
|
||||
= yield(:head)
|
||||
%body{ data: (content_for?(:splash_nav) ? {spy: 'scroll', offset: 0, target: 'splash-nav'} : {} ) }
|
||||
%body
|
||||
= render 'layouts/navigation'
|
||||
-# Admin area
|
||||
- if controller.class.name.split("::").first=="Admin"
|
||||
= render 'layouts/admin'
|
||||
-else
|
||||
.container#messages
|
||||
.row
|
||||
.col-md-12
|
||||
= render 'layouts/messages'
|
||||
- if content_for :splash
|
||||
#content
|
||||
= yield :splash
|
||||
-else
|
||||
.container#content
|
||||
= yield
|
||||
|
||||
#messages
|
||||
= render 'layouts/messages'
|
||||
#content
|
||||
= yield
|
||||
#footer
|
||||
.container
|
||||
%p.muted.text-center
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue