Get rid of the splashpage banner photo and "descriptions"

This commit is contained in:
Henne Vogelsang 2014-11-18 00:58:43 +01:00
parent 60ba81ab46
commit 30e8ab856c
23 changed files with 1235 additions and 184 deletions

View file

@ -43,8 +43,8 @@
%li{:class=> "#{active_nav_li(admin_conference_photos_path(@conference.short_title))}"}
= link_to 'Photos', admin_conference_photos_path(@conference.short_title)
- if can? :update, @conference
%li{:class=> active_nav_li(admin_conference_splashpage_path(@conference.short_title))}
= link_to 'Splashpage', admin_conference_splashpage_path(@conference.short_title)
%li{:class=> active_nav_li(edit_admin_conference_splashpage_path(@conference.short_title))}
= link_to 'Splashpage', edit_admin_conference_splashpage_path(@conference.short_title)
- if can? :index, @conference.venue
%li{:class=> "#{active_nav_li(edit_admin_conference_venue_path(@conference.short_title))}"}
= link_to(edit_admin_conference_venue_path(@conference.short_title)) do

View file

@ -8,11 +8,10 @@
%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|
.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
.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

View file

@ -15,14 +15,9 @@
detectlang: true,
autocollect: true
};
$(function() {
$('.dropdown input, .dropdown label').click(function(e) {
e.stopPropagation();
});
});
= content_for(:script_head)
= javascript_include_tag "//cdn.transifex.com/live.js"
= yield(:head)
%body
= render 'layouts/navigation'
@ -31,7 +26,8 @@
= render 'layouts/admin'
-else
#messages
= render 'layouts/messages'
.container
= render 'layouts/messages'
#content
= yield
#footer