bike/BikeBikeBike
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Broadcast is up

Browse Source
This commit is contained in:
Godwin
2016-07-18 20:18:25 -07:00
parent 2c0de5b038
commit 1b95a5eb3d
7 changed files with 127 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/conferences/_workshops.html.haml
+4 -5
View File
@@ -1,6 +1,6 @@
= columns(medium: 12) do
%h2=_@page_title
= columns(medium: 12) do
= columns(medium: 12, class: 'major-group') do
- if @my_workshops.present?
%h3=_'articles.conference_registration.headings.Your_Workshops'
%p=_'articles.conference_registration.paragraphs.Your_Workshops', :p
@@ -9,17 +9,16 @@
%p=_'articles.conference_registration.paragraphs.Create_Workshop', :p
= link_to (_'articles.conference_registration.headings.Add_Workshop'), create_workshop_path(@this_conference.slug), class: :button
- if @requested_workshops.present?
= columns(medium: 12) do
= columns(medium: 12, class: 'major-group') do
%h3=_'articles.conference_registration.headings.Workshops_You_Have_Requested'
%p=_'articles.conference_registration.paragraphs.Workshops_You_Have_Requested', :p
= render 'workshops/workshop_previews', :workshops => @requested_workshops
- if @workshops_in_need.present?
= columns(medium: 12) do
= columns(medium: 12, class: 'major-group') do
%h3=_'articles.conference_registration.headings.Workshops_Looking_For_Facilitators'
%p=_'articles.conference_registration.paragraphs.Workshops_Looking_For_Facilitators', :p
= render 'workshops/workshop_previews', :workshops => @workshops_in_need
- if @workshops.present?
= columns(medium: 12) do
= columns(medium: 12, class: 'major-group') do
%h3=_'articles.conference_registration.headings.All_Workshops'
-#%p=_'articles.conference_registration.paragraphs.All_Workshops', :p
= render 'workshops/workshop_previews', :workshops => @workshops
app/views/conferences/admin/_broadcast.html.haml
+6 -3
View File
@@ -2,6 +2,11 @@
- if @broadcast_step == :preview || @broadcast_step == :test
= hidden_field_tag :subject, @subject
= hidden_field_tag :body, @body
= hidden_field_tag :send_to, @send_to
- if @broadcast_step == :preview
%p= _'articles.conference_registration.paragraphs.admin.broadcast.test', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }
- else
.warning-info.make-room= _'articles.conference_registration.paragraphs.admin.broadcast.preview', vars: { send_to_count: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }
.test-preview
%h4=@subject
= richtext @body, 4
@@ -10,10 +15,8 @@
= button_with_confirmation :send, (_'modals.admin.broadcast.confirm', vars: { number: @subscriber_count || 0 }), value: :send, class: :delete if @broadcast_step == :test
= button_tag :edit, value: :edit
- else
= selectfield :send_to, nil, broadcast_options, full: true
= textfield :subject, @subject, required: true, big: true
= textarea :body, @body, lang: @this_conference.locale, edit_on: :focus
.actions.right
= button_tag :preview, value: :preview
-# I18n.backend.enabled_locales.each do | locale |
-# if locale.to_s != @this_conference.locale.to_s
-#= textarea "info_translations[#{locale.to_s}]", (richtext @this_conference._info(locale)), label: 'translate.pages.Locale_Translation', vars: { language: _("languages.#{locale}") }, lang: locale