Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'

2016-09-14 22:42:04 -04:00 · 2016-09-14 22:42:04 -04:00 · daf1f805bd
commit daf1f805bd
parent 0b6550d060
71 changed files with 225 additions and 191 deletions
--- a/app/views/proposal/new.html.haml
+++ b/app/views/proposal/new.html.haml
@ -1,72 +0,0 @@
-.container
-  .row
-    .col-md-12
-      .page-header
-        %h1 New Proposal
-  .row
-    .col-md-12
-      = render partial: 'encouragement_text'
-  .row
-    .col-md-8
-      - unless current_user
-        %legend
-          %span
-            =link_to('#signup', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do
-              = ENV['OSEM_NAME'] || 'OSEM'
-              Account
-          %span.pull-right#account-already
-            =link_to('#signin', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do
-              Already have an account?
-      .tab-content
-        .tab-pane.active{role: 'tabpanel', id: 'signup'}
-
-          = semantic_form_for(@event, url: @url) do |f|
-
-            = render partial: 'devise/shared/sign_up_form_embedded'
-
-            = f.inputs name: 'Proposal Information' do
-              = f.input :title, as: :string, required: true, input_html: { required: true }
-              = f.input :event_type_id, as: :select,
-                collection: @program.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
-                data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]},
-                include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
-
-              - if @program.languages.present?
-                = f.input :language, as: :select,
-                  collection: @languages,
-                  include_blank: false, label: 'Language', input_html: { class: 'select-help-toggle' }
-
-              - @program.event_types.each do |event_type|
-                %span{ class: 'help-block event_event_type_id collapse', id: "#{event_type.id}-help" }
-                  = event_type.description
-
-              :javascript
-                $("##{@program.event_types.first.id}-help").collapse('show');
-
-              = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } },
-                hint: markdown_hint(link_to('Tips to improve your presentations.', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx'))
-
-              %p
-                You have used
-                %span#abstract-count #{@event.abstract_word_count}
-                words.  Abstracts must be between
-                %span#abstract-minimum-word-count
-                  0
-                and
-                %span#abstract-maximum-word-count
-                  250
-                words.
-
-              = f.input :require_registration, label: 'Require participants to register to your event'
-
-              %p.text-right
-                = link_to '#description',  'data-toggle' => 'collapse', id: 'description_link' do
-                  Do you require something special?
-              .collapse#description
-                = f.input :description, input_html: { rows: 5 }, label: 'Requirements', placeholder: 'Eg. Whiteboard, printer, or something like that.'
-
-            %p.text-right
-              = f.submit 'Create Proposal', class: 'btn btn-success'
-
-        .tab-pane{role: 'tabpanel', id: 'signin'}
-          = render partial: 'devise/shared/sign_in_form_embedded'