Remove date configurations from application.yml since they are now av…

…ailable in Phase instances. Refs euruko2013#15.
stream7 · Apr 21, 2013 · 61ebb80 · 61ebb80
1 parent bdeb204
commit 61ebb80
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -137,9 +137,9 @@ def authentication_links(container = :p)
   end
 
   def countdown_to_submissions_end
-    submissions_end = DateTime.parse(Settings.submissions_end)
+    submissions_end = Phase::ONE.ending_at
     if submissions_end > DateTime.now
-      content_tag :span, '', id: 'counter', data: {countdown_end: DateTime.parse(Settings.submissions_end).to_i * 1000}
+      content_tag :span, '', id: 'counter', data: {countdown_end: submissions_end.to_i * 1000}
     else
       content_tag :span, 'no time'
     end

diff --git a/app/views/dashboard/_moderator_dashboard.html.erb b/app/views/dashboard/_moderator_dashboard.html.erb
@@ -1,5 +1,5 @@
 <%
-   submissions_start = DateTime.parse(Settings.submissions_start).to_date
+   submissions_start = Phase::ONE.starting_at.to_date
 
    proposals = Proposal.scoped
    suggestions = Suggestion.scoped

diff --git a/config/application.example.yml b/config/application.example.yml
@@ -23,8 +23,6 @@ defaults: &defaults
   mailer:
     from: '"Your Event" <[email protected]>'
     bcc: '[email protected]'
-  submissions_start: '2013-03-28T00:00:00+2'
-  submissions_end: '2013-04-24T00:00:00+3'
 
 development:
   <<: *defaults

diff --git a/config/application.yml b/config/application.yml
@@ -27,8 +27,6 @@ defaults: &defaults
   mailer:
     from: '"EuRuKo 2013" <[email protected]>'
     bcc: '[email protected]'
-  submissions_start: '2013-03-28T00:00:00+2'
-  submissions_end: '2013-04-24T00:00:00+3'
 
 development:
   <<: *defaults