Implementing a use for #79 and cleaning up a few details

concerto · May 2, 2012 · 8fa88ff · 8fa88ff
1 parent 0a9b593
commit 8fa88ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/views/contents/form_elements/_dates.html.erb b/app/views/contents/form_elements/_dates.html.erb
@@ -30,14 +30,14 @@ $('#date_end').click(function(event) {
   <%= form.label :start_time %>
   <div class="input">
 		<%= form.text_field("start_time[date]", :id => "start_time_date", :maxlength => 20, :class => "datefield", 	:value=>Time.now.strftime("%m/%d/%Y"))%><a id="date_start" class="button date">&nbsp;</a>
-		<%= form.text_field("start_time[time]", :id => "start_time_time", :maxlength => 20, :class => "timefield", :value=>"12:00 am")%><a id="time_start" class="button time">&nbsp;</a>
+		<%= form.text_field("start_time[time]", :id => "start_time_time", :maxlength => 20, :class => "timefield", :value=>ConcertoConfig[:content_default_start_time])%><a id="time_start" class="button time">&nbsp;</a>
   </div>
 </div>
 
 <div class="clearfix datetime">
   <%= form.label :end_time %>
 	<div class="input">
-		<%= form.text_field("end_time[date]", :id => "end_time_date", :maxlength => 20, :class => "datefield", :value=>7.days.from_now.strftime("%m/%d/%Y"))%><a id="date_end" class="button date">&nbsp;</a>
-		<%= form.text_field("end_time[time]", :id => "end_time_time", :maxlength => 20, :class => "timefield", :value=>"11:59 pm")%><a id="time_end" class="button time">&nbsp;</a>
+		<%= form.text_field("end_time[date]", :id => "end_time_date", :maxlength => 20, :class => "datefield", :value=>ConcertoConfig[:content_default_duration].to_i.days.from_now.strftime("%m/%d/%Y"))%><a id="date_end" class="button date">&nbsp;</a>
+		<%= form.text_field("end_time[time]", :id => "end_time_time", :maxlength => 20, :class => "timefield", :value=>ConcertoConfig[:content_default_end_time])%><a id="time_end" class="button time">&nbsp;</a>
 	</div>
 </div>
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -32,8 +32,8 @@
 #Put in default configuration parameters
 ConcertoConfig.find_or_create_by_key(:key => "default_upload_type", :value => "graphic")
 ConcertoConfig.find_or_create_by_key(:key => "public_concerto", :value => "true")
-ConcertoConfig.find_or_create_by_key(:key => "content_default_start_time", :value => "00:00:00")
-ConcertoConfig.find_or_create_by_key(:key => "content_default_end_time", :value => "22:59:00")
+ConcertoConfig.find_or_create_by_key(:key => "content_default_start_time", :value => "12:00 am")
+ConcertoConfig.find_or_create_by_key(:key => "content_default_end_time", :value => "11:59 pm")
 ConcertoConfig.find_or_create_by_key(:key => "content_default_duration", :value => "7")
 
 #Create an initial feed