UI -- Repalce "Commerials" with "Materials".
This only replaces the UI facing wording. Specs will fail as they have not been updated yet.
This commit is contained in:
parent
1f7877ccd9
commit
9a1739e86e
8 changed files with 14 additions and 14 deletions
|
|
@ -39,7 +39,7 @@ module Admin
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@commercial.destroy
|
@commercial.destroy
|
||||||
redirect_to admin_conference_commercials_path, notice: 'Commercial was successfully destroyed.'
|
redirect_to admin_conference_commercials_path, notice: 'Materaisl were successfully removed.'
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_commercial
|
def render_commercial
|
||||||
|
|
@ -60,9 +60,9 @@ module Admin
|
||||||
errors = Commercial.read_file(params[:file]) if params[:file]
|
errors = Commercial.read_file(params[:file]) if params[:file]
|
||||||
|
|
||||||
if !params[:file]
|
if !params[:file]
|
||||||
flash[:error] = 'Empty file detected while adding commercials to Event'
|
flash[:error] = 'Empty file detected while adding materials to Event'
|
||||||
elsif errors.all? { |_k, v| v.blank? }
|
elsif errors.all? { |_k, v| v.blank? }
|
||||||
flash[:notice] = 'Successfully added commercials.'
|
flash[:notice] = 'Successfully added materials.'
|
||||||
else
|
else
|
||||||
errors_text = ''
|
errors_text = ''
|
||||||
errors_text << 'Unable to find event with ID: ' + errors[:no_event].join(', ') + '. ' if errors[:no_event].any?
|
errors_text << 'Unable to find event with ID: ' + errors[:no_event].join(', ') + '. ' if errors[:no_event].any?
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
.row
|
.row
|
||||||
.col-md-12
|
.col-md-12
|
||||||
.page-header
|
.page-header
|
||||||
%h1 Commercials
|
%h1 Session Materials
|
||||||
%p.text-muted
|
%p.text-muted
|
||||||
Conference commercials will be displayed on the events in the
|
Conference commercials will be displayed on the events in the
|
||||||
= link_to 'schedule,', conference_schedule_path(@conference.short_title)
|
= link_to 'schedule,', conference_schedule_path(@conference.short_title)
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,9 @@
|
||||||
= "(#{@events.length})" if @events.any?
|
= "(#{@events.length})" if @events.any?
|
||||||
|
|
||||||
.btn-group.pull-right
|
.btn-group.pull-right
|
||||||
%button.btn.btn-primary{ title: 'Mass import of commercials for events',
|
%button.btn.btn-primary{ title: 'Mass import of materials for events',
|
||||||
data: { toggle: 'modal', target: '#mass-commercials-modal' } }
|
data: { toggle: 'modal', target: '#mass-commercials-modal' } }
|
||||||
Add Commercials
|
Add Materials
|
||||||
|
|
||||||
- if can? :create, Event
|
- if can? :create, Event
|
||||||
= link_to 'Add Event',
|
= link_to 'Add Event',
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
.modal-dialog
|
.modal-dialog
|
||||||
.modal-content
|
.modal-content
|
||||||
.modal-header
|
.modal-header
|
||||||
%h1 Add commercials to events
|
%h1 Add materials to events
|
||||||
.text-muted
|
.text-muted
|
||||||
Upload your file with data in the following format:
|
Upload your file with data in the following format:
|
||||||
%b Event_ID:Commercial_Link
|
%b Event_ID:Commercial_Link
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
- progress_status = @event.progress_status
|
- progress_status = @event.progress_status
|
||||||
= progress_status.reject{ |_key, value| value || value.nil? }.length
|
= progress_status.reject{ |_key, value| value || value.nil? }.length
|
||||||
%li
|
%li
|
||||||
= link_to 'Commercials', '#proposal-commercials', 'data-toggle' => 'tab'
|
= link_to 'Materials', '#proposal-commercials', 'data-toggle' => 'tab'
|
||||||
|
|
||||||
.tab-content
|
.tab-content
|
||||||
#proposal-content.tab-pane.active
|
#proposal-content.tab-pane.active
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
.col-md-12
|
.col-md-12
|
||||||
.page-header
|
.page-header
|
||||||
%h1
|
%h1
|
||||||
Events without commercials
|
Events Without Materials
|
||||||
= "(#{@events_missing_commercial.length})"
|
= "(#{@events_missing_commercial.length})"
|
||||||
%p.text-muted
|
%p.text-muted
|
||||||
All submissions that have no commercial
|
All submissions that have no commercial
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
%li.active
|
%li.active
|
||||||
= link_to 'Details', '#details-content', 'data-toggle' => 'tab'
|
= link_to 'Details', '#details-content', 'data-toggle' => 'tab'
|
||||||
%li
|
%li
|
||||||
= link_to 'Commercials', '#commercials-content', 'data-toggle' => 'tab'
|
= link_to 'Materials', '#commercials-content', 'data-toggle' => 'tab'
|
||||||
|
|
||||||
.tab-content
|
.tab-content
|
||||||
#details-content.tab-pane.active
|
#details-content.tab-pane.active
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
= link_to 'Contact', edit_admin_conference_contact_path(@conference.short_title)
|
= link_to 'Contact', edit_admin_conference_contact_path(@conference.short_title)
|
||||||
- if can? :index, @conference.commercials.build
|
- if can? :index, @conference.commercials.build
|
||||||
%li{class: "#{active_nav_li(admin_conference_commercials_path(@conference.short_title))}"}
|
%li{class: "#{active_nav_li(admin_conference_commercials_path(@conference.short_title))}"}
|
||||||
= link_to 'Commercials', admin_conference_commercials_path(@conference.short_title)
|
= link_to 'Materials', admin_conference_commercials_path(@conference.short_title)
|
||||||
- if can? :update, @conference
|
- if can? :update, @conference
|
||||||
%li{class: active_nav_li(edit_admin_conference_splashpage_path(@conference.short_title))}
|
%li{class: active_nav_li(edit_admin_conference_splashpage_path(@conference.short_title))}
|
||||||
= link_to 'Splashpage', admin_conference_splashpage_path(@conference.short_title)
|
= link_to 'Splashpage', admin_conference_splashpage_path(@conference.short_title)
|
||||||
|
|
|
||||||
|
|
@ -3,15 +3,15 @@
|
||||||
%li.active
|
%li.active
|
||||||
= link_to 'Proposal', '#proposal-content', 'data-toggle' => 'tab'
|
= link_to 'Proposal', '#proposal-content', 'data-toggle' => 'tab'
|
||||||
%li
|
%li
|
||||||
= link_to 'Commercials', '#commercials-content', 'data-toggle' => 'tab'
|
= link_to 'Materials', '#commercials-content', 'data-toggle' => 'tab'
|
||||||
.tab-content
|
.tab-content
|
||||||
#proposal-content.tab-pane.active
|
#proposal-content.tab-pane.active
|
||||||
= render 'proposals/proposal_form'
|
= render 'proposals/proposal_form'
|
||||||
#commercials-content.tab-pane
|
#commercials-content.tab-pane
|
||||||
%p.text-muted
|
%p.text-muted
|
||||||
You can add commercials for your proposal. These commercials will be displayed on the
|
You can add materals for your proposal. These materials will be displayed on the
|
||||||
= link_to 'public proposal page.', conference_program_proposal_path(@conference.short_title, @event)
|
= link_to 'public proposal page.', conference_program_proposal_path(@conference.short_title, @event)
|
||||||
If you don't add a commercial, the conference commercial will be displayed!
|
If you don't add any materials, the conference materials will be displayed.
|
||||||
- if can? :create, @event.commercials.new
|
- if can? :create, @event.commercials.new
|
||||||
.row
|
.row
|
||||||
.col-md-6
|
.col-md-6
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue