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

app/views/layouts/_admin_sidebar.html.haml

@@ -100,7 +100,7 @@
       %ul
         - if can? :update, @conference.sponsorship_levels.build
           %li{:class=> "#{active_nav_li(admin_conference_sponsorship_levels_path(@conference.short_title))}" }
-            = link_to 'Sponsorship', admin_conference_sponsorship_levels_path(@conference.short_title)
+            = link_to 'Sponsorship Levels', admin_conference_sponsorship_levels_path(@conference.short_title)
         - if can? :update, @conference.sponsors.build
           %li{:class=> active_nav_li(admin_conference_sponsors_path(@conference.short_title))}
             = link_to 'Sponsors', admin_conference_sponsors_path(@conference.short_title)

app/views/layouts/_messages.html.haml

@@ -8,8 +8,11 @@
   %p
     OSEM requires JavaScript to be enabled to function. Please turn on JavaScript in your browser's settings and reload the page to continue.
 - flash.each do |type, message|
-  %div{:class=>"alert alert-dismissable #{bootstrap_class_for(type)}", :id=>"flash"}
-    .button.close{"data-dismiss" => "alert", "aria-hidden"=>"true"}
-      ×
-    %p
-      = message
+  .container
+    .row
+      .col-md-12
+        %div{:class=>"alert alert-dismissable #{bootstrap_class_for(type)}", :id=>"flash"}
+          .button.close{"data-dismiss" => "alert", "aria-hidden"=>"true"}
+            ×
+          %p
+            = message

app/views/layouts/application.html.haml

@@ -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