Permalink
Browse files

Merge remote-tracking branch 'meise/schedule-version'

  • Loading branch information...
2 parents 797089b + e5de89e commit fcfc5d294c05021d5f947f4de494bcd03754588f @manno manno committed Apr 25, 2012
View
@@ -10,3 +10,5 @@ index
*.swp
rerun.txt
.sass-cache/
+.idea/
+.redcar/
@@ -30,7 +30,27 @@ div#header { width: 1200px; }
#top-navigation {
width: 60%;
float: left;
- margin: 42px 0 0 0
+ margin: 42px 0 0 0;
+}
+
+#main-content p.release {
+ left: 1030px;
+ position: relative;
+
+ background-color: #48B7E4;
+ color: white;
+ float: left;
+ font-size: 100%;
+
+ margin-bottom: 10px;
+ margin-left: 0;
+ margin-right: 0;
+ margin-top: 0;
+
+ padding-bottom: 5px;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-top: 5px;
}
ul.horizontal-navigation {
@@ -70,14 +90,17 @@ ul.horizontal-navigation li.selected {
}
#main-content {
- padding: 15px 26px;
+ padding: 26px;
+ padding-top: 0px;
+ padding-bottom: 15px;
width: 96%;
height: auto;
display: table;
}
#main-content > h2 {
font-size: 24px;
+ padding-top: 15px;
}
.small-font{ font-size: 8px; }
@@ -13,6 +13,7 @@
= f.input :timeslot_duration, :as => :select, :collection => timeslot_durations(@conference), :hint => "How long do you want the smallest timeslots to be? This essentially defines the grid on which you can plan your program. WARNING: This one is tricky and cannot be easily changed later, so give this some thought. In general, larger timeslots make things a lot simpler, but smaller ones make you more flexible. Example: If all you need is to schedule 30 minute talks that perfectly align with full and half hours, choose 30 minutes as slot size. If you have 1 hour long talks and 15 minute breaks between them, 15 minutes is the perfect slot size. Note that you can make the slot size smaller later on, as long as the old slot size is a multiple of the new one. So going from 15 minutes down to 5 is fine, while going down to 10 minutes will not work."
= f.input :default_timeslots, :as => :select, :collection => 1..20, :hint => "What is the default length of your events? Example: If you chose a timeslot duration of 15 minutes to account for breaks, but your talks are usually 1 hour long, select 4, because 4 times 15 minutes is one hour."
= f.input :max_timeslots, :as => :select, :collection => 1..100, :hint => "What is the maximum length of a single event (e.g. a single talk)?"
+ = f.input :schedule_version, hint: "What is the current schedule version?"
= dynamic_association :languages, "Languages", f, :hint => "Choose which languages events in this conference can be held in."
= f.inputs "Static program export" do
= f.input :program_export_base_url, :hint => "If you want to use the static program export, enter the URL where you want to put the files under here. All references will be generated using this as a prefix."
@@ -28,5 +28,9 @@
= link_to "Events", public_events_path
%br.clear/
#main-content
+ - unless @conference.schedule_version.nil? or @conference.schedule_version.empty?
+ %p.release
+ = "Version #{@conference.schedule_version}"
+
= yield
%br.clear/
@@ -1,5 +1,7 @@
!!! XML
%schedule
+ - unless @conference.schedule_version.nil? or @conference.schedule_version.empty?
+ %version= @conference.schedule_version
%conference
%title= @conference.title
%start= @conference.days.first.strftime('%Y-%m-%d')
@@ -28,4 +30,4 @@
%person{:id=>speaker.id}= speaker.full_public_name
%links
- event.links.each do |link|
- %link{:href=>link.url}= link.title ? link.title : link.url
+ %link{:href=>link.url}= link.title ? link.title : link.url
@@ -0,0 +1,9 @@
+class AddScheduleVersionToConferences < ActiveRecord::Migration
+ def self.up
+ add_column :conferences, :schedule_version, :string, :default => nil
+ end
+
+ def self.down
+ remove_column :conferences, :schedule_version
+ end
+end

0 comments on commit fcfc5d2

Please sign in to comment.