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

2017 refactor

Browse Source
This commit is contained in:
Godwin
2017-04-09 11:37:16 -07:00
parent 3d00b70087
commit d1db46ffaf
302 changed files with 7100 additions and 8082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin/new.html.haml
+1 -1
View File
@@ -19,6 +19,6 @@
= checkbox :is_featured, @this_conference.id.present? && @this_conference.is_featured != false, 'forms.labels.generic.is_featured'
= columns(medium: 12) do
.actions.next-prev
= button_tag :save, value: :save
= button :save, value: :save
- if @this_conference.id.present?
= button_with_confirmation :delete, value: :delete, class: 'delete'
app/views/application/500.html.haml
+1 -2
View File
@@ -1,6 +1,5 @@
= render :partial => 'application/header', :locals => {:image_file => 'parts.jpg'}
= render partial: 'application/header', locals: {image_file: 'parts.jpg'}
= row do
= columns(medium: 12) do
%p= _'error.500.description', :p
= render 'contact', cancel_btn: false, contact_reason: :website
app/views/application/_contact.html.haml
+1 -1
View File
@@ -9,6 +9,6 @@
= textfield :subject, nil, required: true, big: true
= textarea :message, nil, required: true, plain: true
.actions
= button_tag :send, value: :send
= button :send, value: :send
- if cancel_btn
%button.close.subdued=_'forms.actions.generic.cancel'
app/views/application/_login.html.haml
+1 -1
View File
@@ -2,5 +2,5 @@
= form_tag do_confirm_path, class: 'flex-form' do
= hidden_field_tag :dest, settings_path if dest.present?
= emailfield :email, nil, big: true
= button_tag :continue, :value => :confirm_email
= button :continue, value: :confirm_email
= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: dest), class: [:button, :facebook]
app/views/application/_login_confirm.html.haml
+1 -1
View File
@@ -4,4 +4,4 @@
= form_tag :do_confirm, :authenticity_token => false, class: 'flex-form' do
= emailfield :email, nil, required: true, big: true
= hidden_field_tag :token, @confirmation.token
= button_tag :login
= button :login
app/views/application/_login_confirmation_sent.html.haml
+3 -3
View File
@@ -1,4 +1,4 @@
= row do
= columns(medium: 12) do
%h2=_'articles.permission_denied.headings.confirmation_sent'
%p=_'articles.conference_registration.paragraphs.email_confirm', :p
= columns(medium: 12) do
%h2=_'articles.permission_denied.headings.confirmation_sent'
%p=_'articles.conference_registration.paragraphs.email_confirm', :p
app/views/application/_not_a_translator.html.haml
+1 -1
View File
@@ -6,4 +6,4 @@
= columns(medium: 6) do
= form_tag :translator_request do
= text_area_tag :comment, nil, placeholder: true, required: true
= button_tag :translator_request
= button :translator_request
app/views/application/_translator_login.html.haml
+1 -1
View File
@@ -8,4 +8,4 @@
.email-field.input-field
= email_field_tag :email, nil, required: true
= label_tag :email
= button_tag :login
= button :login
app/views/application/contact.html.haml
+8 -8
View File
@@ -1,10 +1,10 @@
= render :partial => 'application/header', :locals => {:image_file => @banner_image || 'grafitti.jpg'}
%article
= row do
= columns do
- if @sent
%h2=_'articles.contact.headings.sent', :t
%p=_'articles.contact.paragraphs.sent', :p
- else
%h2=_'articles.contact.headings.contact'
= render 'contact', cancel_btn: false
= row do
= columns do
- if @sent
%h2=_'articles.contact.headings.sent', :t
%p=_'articles.contact.paragraphs.sent', :p
- else
%h2=_'articles.contact.headings.contact'
= render 'contact', cancel_btn: false
app/views/application/home.html.haml
+2 -1
View File
@@ -1,5 +1,6 @@
- content_for :og_image do
= @conference.poster.full.url || image_path('default_poster.jpg')
- if @conference.present?
= @conference.poster.full.url || image_path('default_poster.jpg')
- if @conferences
- @conferences.each do | conference |
= render 'conferences/conference', conference: conference, links: [ :read_more, :register ]
app/views/application/permission_denied.html.haml
+8 -8
View File
@@ -1,10 +1,10 @@
= render :partial => 'application/header', :locals => {:image_file => @banner_image || '403.jpg'}
%article
- if @template.present?
=render @template
- else
= row do
= columns do
%h2=_'error.403.title','Sorry, you currently don\'t have access to this page'
%p=_'error.403.description', :p
= render 'contact', cancel_btn: false, contact_reason: :website
- if @template.present?
=render @template
- else
= row do
= columns do
%h2=_'error.403.title','Sorry, you currently don\'t have access to this page'
%p=_'error.403.description', :p
= render 'contact', cancel_btn: false, contact_reason: :website
app/views/application/update_user.html.haml
+1 -1
View File
@@ -6,4 +6,4 @@
%p=_'articles.conference_registration.paragraphs.provide_email', :p
= form_tag oauth_save_path, class: 'flex-form' do
= emailfield :email, nil, required: true, big: true
= button_tag :save, value: :save
= button :save, value: :save
app/views/application/user_settings.html.haml
+1 -1
View File
@@ -19,7 +19,7 @@
= radiobuttons :preferred_language, I18n.backend.enabled_locales, current_user.locale || I18n.locale, 'languages', heading: 'articles.conference_registration.headings.preferred_language'
= checkbox :email_subscribe, current_user.is_subscribed != false, 'articles.user_settings.email_subscribe', heading: 'articles.user_settings.headings.email_subscribe', help: 'articles.user_settings.paragraphs.email_subscribe', inline: true, right_help: true
.actions
= button_tag :save, value: :save
= button :save, value: :save
- else
%h2=_'forms.actions.generic.login'
= render 'login'
app/views/conference_administration/_administrators.html.haml
+5 -5
View File
@@ -4,7 +4,7 @@
= admin_update_form do
= checkboxes :organizations, (@organizations.map { |org| [org.name, org.id] }), @this_conference.organizations.map(&:id), 'test.test', vertical: true, big: true
.actions.right.small
= button_tag :save, value: :set_organizations
= button :save, value: :set_organizations
- @this_conference.organizations.each do | organization |
%h4=organization.name
- if organization.users.present?
@@ -16,11 +16,11 @@
= admin_update_form class: [:inline, :right] do
= hidden_field_tag :user_id, user.id
= hidden_field_tag :org_id, organization.id
= button_tag :remove_member, value: :remove_org_member, class: [:small, :delete]
= button :remove_member, value: :remove_org_member, class: [:small, :delete]
= admin_update_form class: 'mini-flex-form' do
= hidden_field_tag :org_id, organization.id
= emailfield :email, nil, required: true
= button_tag :add_member, value: :add_org_member, class: :small
= button :add_member, value: :add_org_member, class: :small
%h3=_'articles.admin.info.headings.External_Administrators'
%p=_'articles.admin.info.descriptions.External_Administrators'
@@ -32,10 +32,10 @@
- unless user.id == current_user.id && !current_user.administrator?
= admin_update_form class: [:inline, :right] do
= hidden_field_tag :user_id, user.id
= button_tag :remove_member, value: :remove_administrator, class: [:small, :delete]
= button :remove_member, value: :remove_administrator, class: [:small, :delete]
= admin_update_form class: 'mini-flex-form' do
= userfield :email, nil, required: true
-#= emailfield :email, nil, required: true
= button_tag :add_member, value: :add_administrator, class: :small
= button :add_member, value: :add_administrator, class: :small
= columns(large: 2) do
 
app/views/conference_administration/_broadcast.html.haml
+3 -3
View File
@@ -12,12 +12,12 @@
%h3=@subject
= richtext @body, 4
.actions.right
= button_tag :test, value: :test, class: :secondary if @broadcast_step == :preview
= button :test, value: :test, class: :secondary if @broadcast_step == :preview
= button_with_confirmation :send, (_'modals.admin.broadcast.confirm', vars: { number: "<strong>#{(@send_to_count || 0)}</strong>".html_safe }), value: :send, class: :delete if @broadcast_step == :test
= button_tag :edit, value: :edit
= button :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
= button :preview, value: :preview
app/views/conference_administration/_dates.html.haml
+1 -1
View File
@@ -14,4 +14,4 @@
= row do
= columns(medium: 6, push: { medium: 1 }) do
.actions
= button_tag :save, value: :save
= button :save, value: :save
app/views/conference_administration/_description.html.haml
+1 -1
View File
@@ -2,4 +2,4 @@
= admin_update_form do
= translate_textarea :info, @this_conference, label: 'articles.conference_registration.headings.admin.edit.info', help: 'articles.conference_registration.paragraphs.admin.edit.info', edit_on: :focus
.actions.right
= button_tag :save, value: :save
= button :save, value: :save
app/views/conference_administration/_events.html.haml
+2 -2
View File
@@ -37,5 +37,5 @@
= length_select @length, small: true
= translate_fields @event, { title: { type: :textfield, big: true, label: 'forms.labels.generic.title' }, info: { type: :textarea, label: 'forms.labels.generic.info', edit_on: :focus } }
.actions.next-prev
= button_tag :save, value: :save
= button_tag :cancel, value: :cancel, class: :subdued, formnovalidate: true if @event.id.present?
= button :save, value: :save
= button :cancel, value: :cancel, class: :subdued, formnovalidate: true if @event.id.present?
app/views/conference_administration/_locations.html.haml
+3 -3
View File
@@ -36,7 +36,7 @@
= columns(medium: 12) do
.actions.next-prev
- if @location.present?
= button_tag :save, value: :save
= button_tag :cancel, value: :cancel, class: :subdued, formnovalidate: true
= button :save, value: :save
= button :cancel, value: :cancel, class: :subdued, formnovalidate: true
- else
= button_tag :create, value: :create
= button :create, value: :create
app/views/conference_administration/_meals.html.haml
+2 -2
View File
@@ -20,7 +20,7 @@
%td.form
= admin_update_form do
= hidden_field_tag :meal, time
= button_tag :delete, value: :delete, class: [:small, :delete]
= button :delete, value: :delete, class: [:small, :delete]
= admin_update_form do
%h3=_'articles.admin.locations.headings.add_meal', :t
.flex-inputs
@@ -30,6 +30,6 @@
= textfield :title, nil, required: true, big: true, help: 'articles.admin.locations.paragraphs.meal_title'
= textfield :info, nil, help: 'articles.admin.locations.paragraphs.meal_info'
.actions.next-prev
= button_tag :add_meal, value: :add_meal
= button :add_meal, value: :add_meal
- else
.warning-info=_'articles.admin.meals.no_locations_warning'
app/views/conference_administration/_payment_message.html.haml
+1 -1
View File
@@ -3,4 +3,4 @@
= translate_textarea :payment_message, @this_conference, default: 'articles.conference_registration.paragraphs.Payment', help: 'articles.conference_registration.paragraphs.admin.payment.message', edit_on: :focus, short: true
.actions.right
= button_tag :save, value: :save
= button :save, value: :save
app/views/conference_administration/_paypal.html.haml
+1 -1
View File
@@ -5,4 +5,4 @@
= passwordfield :paypal_password, @this_conference.paypal_password
= textfield :paypal_signature, @this_conference.paypal_signature
.actions.right
= button_tag :save, value: :save
= button :save, value: :save
app/views/conference_administration/_poster.html.haml
+1 -1
View File
@@ -2,4 +2,4 @@
= form_tag administration_update_path(@this_conference.slug, :poster), multipart: true do
= filefield :poster, @this_conference.poster, required: true, label: false, preview: true
.actions.left
= button_tag :upload, value: :upload, id: 'upload-file'
= button :upload, value: :upload, id: 'upload-file'
app/views/conference_administration/_providers.html.haml
+1 -1
View File
@@ -7,4 +7,4 @@
= selectfield :distance_unit, @conditions['distance']['unit'], [:km, :mi], label: false, inline: true
= columns(medium: 12) do
.actions.right
= button_tag :save, value: :save_distance
= button :save, value: :save_distance
app/views/conference_administration/_publish_schedule.html.haml
+2 -2
View File
@@ -2,7 +2,7 @@
= form_tag administration_update_path(@this_conference.slug, @admin_step) do
- if @this_conference.workshop_schedule_published
%p=_'articles.conference_registration.paragraphs.admin.schedule.published', :p
.actions= button_tag :un_publish, value: :publish, class: :delete
.actions= button :un_publish, value: :publish, class: :delete
- else
%p=_'articles.conference_registration.paragraphs.admin.schedule.un_published', :p
.actions= button_tag :publish, value: :publish
.actions= button :publish, value: :publish
app/views/conference_administration/_registration_status.html.haml
+1 -1
View File
@@ -2,4 +2,4 @@
= form_tag administration_update_path(@this_conference.slug, @admin_step) do
= selectfield :registration_status, @this_conference.registration_status || 'closed', registration_status_options_list, inline_label: true
.actions.left
= button_tag :save, value: :save
= button :save, value: :save
app/views/conference_administration/_registrations.html.haml
+1 -1
View File
@@ -14,4 +14,4 @@
= html_edit_table @excel_data, registrations_edit_table_options
.actions.right
%a.button.subdued{data: { 'closes-modal': 'new-registration' }}='Cancel'
= button_tag :save, value: :save, class: :modify
= button :save, value: :save, class: :modify
app/views/conference_administration/_schedule.html.haml
+84 -83
View File
@@ -1,85 +1,86 @@
= columns(medium: 12) do
- conference = @this_conference || @conference
- if conference.event_locations.blank? && @entire_page
.warning-info=_'articles.admin.schedule.no_locations_warning'
- else
- add_inline_script :schedule if @entire_page
#schedule-preview
- @schedule.each do | day, data |
%h4=date(day, :weekday)
%table.schedule{class: [data[:locations].present? ? 'has-locations' : 'no-locations', "locations-#{data[:num_locations]}"]}
- if data[:locations].present? && data[:locations].values.first != :add
%thead
%tr
%th.corner
- data[:locations].each do | id, location |
%th=location.is_a?(Symbol) ? '' : location.title
%tbody
- data[:times].each do | time, time_data |
%tr
- rowspan = (time_data[:length] * 2).to_i
%th=time(time)
- if time_data[:type] == :workshop
- data[:locations].each do | id, location |
- if time_data[:item][:workshops][id].present?
- workshop = time_data[:item][:workshops][id][:workshop]
- status = time_data[:item][:workshops][id][:status]
- else
- workshop = status = nil
%td{class: [time_data[:type], workshop.present? ? :filled : :open], rowspan: rowspan, data: workshop.present? ? nil : { block: time_data[:item][:block], day: day, location: id }}
- if workshop.present? && workshop.event_location.present?
= link_to view_workshop_path(@conference.slug, workshop.id), class: 'event-detail-link' do
.details
.title=workshop.title
%template.event-details{data: { href: view_workshop_path(@conference.slug, workshop.id) }}
%h1.title=workshop.title
%p.address
= workshop.event_location.title + _!(': ')
= location_link workshop.event_location
.workshop-description= richtext workshop.info, 1
- if @can_edit
= form_tag administration_update_path(conference.slug, @admin_step), class: 'deschedule-workshop' do
.status
.conflict-score
%span.title Conflicts:
%span.value="#{status[:conflict_score]} / #{workshop.interested.size}"
- if status[:errors].present?
.errors
- status[:errors].each do | error |
.error=_"errors.messages.schedule.#{error[:name].to_s}", vars: error[:i18nVars]
= hidden_field_tag :id, workshop.id
= button_tag :deschedule, value: :deschedule_workshop, class: [:delete, :small]
- elsif @can_edit
.title="Block #{time_data[:item][:block] + 1}"
- elsif time_data[:type] != :nil
%td{class: time_data[:type], rowspan: rowspan, colspan: data[:locations].present? ? data[:locations].size : 1}
- case time_data[:type]
- when :meal
- location = EventLocation.where(id: time_data[:item]['location'].to_i).first
- if location.present?
%a.event-detail-link
= row do
= columns(medium: 12) do
- conference = @this_conference || @conference
- if conference.event_locations.blank? && @entire_page
.warning-info=_'articles.admin.schedule.no_locations_warning'
- else
- add_inline_script :schedule if @entire_page
#schedule-preview
- @schedule.each do |day, data|
%h4=date(day, :weekday)
%table.schedule{class: [data[:locations].present? ? 'has-locations' : 'no-locations', "locations-#{data[:num_locations]}"]}
- if data[:locations].present? && data[:locations].values.first != :add
%thead
%tr
%th.corner
- data[:locations].each do |id, location|
%th=location.is_a?(Symbol) ? '' : _!(location.title)
%tbody
- data[:times].each do |time, time_data|
%tr
- rowspan = (time_data[:length] * 2).to_i
%th=time(time)
- if time_data[:type] == :workshop
- data[:locations].each do |id, location|
- if time_data[:item][:workshops][id].present?
- workshop = time_data[:item][:workshops][id][:workshop]
- status = time_data[:item][:workshops][id][:status]
- else
- workshop = status = nil
%td{class: [time_data[:type], workshop.present? ? :filled : :open], rowspan: rowspan, data: workshop.present? ? nil : { block: time_data[:item][:block], day: day, location: id }}
- if workshop.present? && workshop.event_location.present?
= link_to view_workshop_path(@conference.slug, workshop.id), class: 'event-detail-link' do
.details
.title= time_data[:item]['title']
.location= location.title
%template.event-details
%h1.title=time_data[:item]['title']
.title=_!workshop.title
%template.event-details{data: { href: view_workshop_path(@conference.slug, workshop.id) }}
%h1.title=_!workshop.title
%p.address
= location.title + _!(': ')
= location_link location
- when :event
- if time_data[:item].event_location.present?
%a.event-detail-link
.details
.title= time_data[:item][:title]
.location= time_data[:item].event_location.title
%template.event-details
%h1.title=time_data[:item][:title]
%p.address
= time_data[:item].event_location.title + _!(': ')
= location_link time_data[:item].event_location
= richtext time_data[:item][:info], 1
- if @entire_page
#workshop-selector
= form_tag administration_update_path(@this_conference.slug, @admin_step), class: 'workshop-dlg', id: 'workshop-table-form' do
%h3 Select a Workshop
#table
= _!("#{workshop.event_location.title}:")
= location_link workshop.event_location
.workshop-description= richtext workshop.info, 1
- if @can_edit
= form_tag administration_update_path(conference.slug, @admin_step), class: 'deschedule-workshop' do
.status
.conflict-score
%span.title Conflicts:
%span.value="#{status[:conflict_score]} / #{workshop.interested.size}"
- if status[:errors].present?
.errors
- status[:errors].each do |error|
.error=_"errors.messages.schedule.#{error[:name].to_s}", vars: error[:i18nVars]
= hidden_field_tag :id, workshop.id
= button :deschedule, value: :deschedule_workshop, class: [:delete, :small]
- elsif @can_edit
.title="Block #{time_data[:item][:block] + 1}"
- elsif time_data[:type] != :nil
%td{class: time_data[:type], rowspan: rowspan, colspan: data[:locations].present? ? data[:locations].size : 1}
- case time_data[:type]
- when :meal
- location = EventLocation.where(id: time_data[:item]['location'].to_i).first
- if location.present?
%a.event-detail-link
.details
.title=_!(time_data[:item]['title'])
.location=_!location.title
%template.event-details
%h1.title=_!(time_data[:item]['title'])
%p.address
= _!("#{location.title}:")
= location_link location
- when :event
- if time_data[:item].event_location.present?
%a.event-detail-link
.details
.title=_!(time_data[:item][:title]) if time_data[:item][:title]
.location=_!(time_data[:item].event_location.title)
%template.event-details
%h1.title=_!(time_data[:item][:title]) if time_data[:item][:title]
%p.address
= _!("#{time_data[:item].event_location.title}:")
= location_link time_data[:item].event_location
= richtext time_data[:item][:info], 1
- if @entire_page
#workshop-selector
= form_tag administration_update_path(@this_conference.slug, @admin_step), class: 'workshop-dlg', id: 'workshop-table-form' do
%h3 Select a Workshop
#table
app/views/conference_administration/_suggested_amounts.html.haml
+1 -1
View File
@@ -5,4 +5,4 @@
- for i in 1..5 do
= numberfield "payment_amounts[#{i - 1}]", payment_amounts[i - 1], step: 0.01, min: 0.00, label: false
.actions.right
= button_tag :save, value: :save
= button :save, value: :save
app/views/conference_administration/_workshop_times.html.haml
+2 -2
View File
@@ -15,5 +15,5 @@
.table-td=checkboxes :days, @block_days, info['days'].map(&:to_i), 'date.day_names', vertical: true, small: true
.table-td.form
= hidden_field_tag :workshop_block, block
= button_tag :delete_block, value: :delete_block, class: [:small, :delete] if block == @workshop_blocks.length - 2
= button_tag (is_new ? :add_block : :update_block), value: :save_block, class: [:small, :add]
= button :delete_block, value: :delete_block, class: [:small, :delete] if block == @workshop_blocks.length - 2
= button (is_new ? :add_block : :update_block), value: :save_block, class: [:small, :add]
app/views/conferences/_administration.html.haml
-6
View File
@@ -1,6 +0,0 @@
= columns(medium: 3, large: 2) do
= admin_menu
= columns(medium: 9, large: 10) do
%h3.subtitle=_("menu.submenu.admin.#{@admin_step.titlecase.gsub(/\s/, '_')}")
%p=(_"articles.admin.#{@admin_step.gsub(/\s/, '_')}.description", :p) unless @hide_description === true
%div{id: "admin-#{@admin_step}"}= render "conferences/admin/#{@admin_step}"
app/views/conferences/_conference.html.haml
+14 -15
View File
@@ -1,18 +1,17 @@
- links ||= [ :register ]
- sections ||= [ :info ]
= row(tag: :header) do
= columns(class: 'conference-banner') do
.title
%h1=_!conference.title
.details
%h2.primary=location(conference.city || conference.location) if conference.city_name.present?
- if conference.start_date.present? && conference.end_date.present?
.secondary
= date_span(conference.start_date.to_date, conference.end_date.to_date)
- if conference.poster.present?
%img{src: conference.poster.full.url, role: :presentation, alt: (_'images.conference.poster', vars: { conference_title: conference.title })}
%article
= row(tag: :header) do
= columns(class: 'conference-banner') do
.title
%h1=_!conference.title
.details
%h2.primary=location(conference.city || conference.location) if conference.city_name.present?
- if conference.start_date.present? && conference.end_date.present?
.secondary
= date_span(conference.start_date.to_date, conference.end_date.to_date)
- if conference.poster.present?
%img{src: conference.poster.full.url || image_path('default_poster.jpg'), role: :presentation, alt: (_'images.conference.poster', vars: { conference_title: conference.title })}
= row(class: 'conference-details') do
= columns(medium: 10, push: {medium: 1}) do
%h2=_!conference.title if conference.poster.present?
@@ -21,13 +20,13 @@
- if conference.workshop_schedule_published
- add_inline_script :home_schedule
%h3=_'articles.workshops.headings.Schedule'
= render 'conferences/admin/schedule'
= render 'conference_administration/schedule'
- else
%h3=_'articles.workshops.headings.Proposed_Workshops'
%p=_'articles.workshops.paragraphs.Proposed_Workshops'
= render 'workshops/workshop_previews', :workshops => (conference.workshops.sort { |a, b| a.title.downcase <=> b.title.downcase })
= render 'workshops/workshop_previews', workshops: (conference.workshops.sort { |a, b| a.title.downcase <=> b.title.downcase })
.links
= (link_to (_'forms.actions.generic.register'), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.registration_status == :open
= (link_to (_'forms.actions.generic.register'), register_path(conference.slug), class: [:button, :register]) if links.include?(:register) && conference.can_register?
= (link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: :button) if links.include?(:read_more)
= (link_to (_'forms.actions.generic.administrate'), administrate_conference_path(conference.slug), class: [:button]) if links.include?(:administrate)
= (link_to (_'forms.actions.generic.edit'), edit_conference_path(conference.slug), class: [:button, :subdued]) if links.include?(:edit)
app/views/conferences/_confirm_email.html.haml
+10 -10
View File
@@ -1,13 +1,13 @@
= columns(medium: 12) do
%p=_"articles.conference_registration.paragraphs.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
%h3=_'articles.conference_registration.headings.Verify_Account'
%p=_'articles.conference_registration.paragraphs.Verify_Account'
%p=_"articles.conference_registration.paragraphs.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
%h3=_'articles.conference_registration.headings.Verify_Account'
%p=_'articles.conference_registration.paragraphs.Verify_Account'
= form_tag register_path(@this_conference.slug), class: 'flex-form' do
.email-field.input-field.big
= email_field_tag :email, nil, required: true
= label_tag :email
= button_tag :continue, :value => :confirm_email
= form_tag register_path(@this_conference.slug), class: 'flex-form' do
.email-field.input-field.big
= email_field_tag :email, nil, required: true
= label_tag :email
= button :continue, value: :confirm_email
= columns(medium: 12, class: 'flex-column') do
%p.stretch-item=_'articles.conference_registration.paragraphs.facebook_sign_in'
= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(:provider => :facebook), class: [:button, :facebook]
%p.stretch-item=_'articles.conference_registration.paragraphs.facebook_sign_in'
= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(:provider => :facebook), class: [:button, :facebook]
app/views/conferences/_contact_info.html.haml
+2 -2
View File
@@ -5,5 +5,5 @@
= textfield :location, (params[:location] || location(@registration.city ||lookup_ip_location)), required: true, heading: 'articles.conference_registration.headings.location'
= checkboxes :languages, User.AVAILABLE_LANGUAGES, (current_user.languages || [I18n.locale]).map(&:to_sym), 'languages', heading: 'articles.conference_registration.headings.languages'
.actions.next-prev
= button_tag (params[:step] == :save ? :save : :next), value: :contact_info
= button_tag :previous, value: :prev_contact_info, class: :subdued, formnovalidate: true
= button (params[:step] == :save ? :save : :next), value: :contact_info
= button :previous, value: :prev_contact_info, class: :subdued, formnovalidate: true
app/views/conferences/_done.html.haml
+1 -1
View File
@@ -48,4 +48,4 @@
- if @conference.registration_open
= form_tag register_path(@this_conference.slug) do
.actions
= button_tag :edit_registration, :value => :register
= button :edit_registration, :value => :register
app/views/conferences/_email_confirm.html.haml
+5 -5
View File
@@ -1,6 +1,6 @@
%article
= row do
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.email_confirm','Please confirm your email address'
= columns(medium: 12) do
%p=_'articles.conference_registration.paragraphs.email_confirm', :p
= row do
= columns(medium: 12) do
%h2=_'articles.conference_registration.headings.email_confirm','Please confirm your email address'
= columns(medium: 12) do
%p=_'articles.conference_registration.paragraphs.email_confirm', :p
app/views/conferences/_hosting.html.haml
+2 -2
View File
@@ -16,5 +16,5 @@
= checkboxes :considerations, ConferenceRegistration.all_considerations, @hosting_data['considerations'], 'articles.conference_registration.host.considerations', heading: 'articles.conference_registration.headings.host.considerations', help: 'articles.conference_registration.paragraphs.host.considerations', vertical: true
= textarea :notes, @hosting_data['notes'], help: 'articles.conference_registration.paragraphs.host.notes', edit_on: :focus
.actions.next-prev
= button_tag (params[:step] == :save ? :save : :next), value: :hosting
= button_tag :previous, value: :prev_contact_info, class: :subdued, formnovalidate: true
= button (params[:step] == :save ? :save : :next), value: :hosting
= button :previous, value: :prev_contact_info, class: :subdued, formnovalidate: true
app/views/conferences/_payment.html.haml
+5 -4
View File
@@ -9,21 +9,22 @@
- else
%p=@this_conference.payment_message || (_'articles.conference_registration.paragraphs.Payment', :p)
= columns(large: 9, push: 1) do
= show_errors :payment
= form_tag register_path(@this_conference.slug), class: :payment do
= hidden_field_tag :button, :payment
- payment_amounts = @this_conference.payment_amounts.present? ? @this_conference.payment_amounts : Conference.default_payment_amounts
.graded-options{class: "option-count-#{payment_amounts.size}"}
- payment_amounts.each_with_index do | amount, i |
= button_tag :amount_25, name: :amount, value: amount.to_f.to_s, class: "option-#{i + 1}" do
= button :amount_25, name: :amount, value: amount.to_f.to_s, class: "option-#{i + 1}" do
=_! (number_to_currency amount, unit: '$')
= form_tag register_path(@this_conference.slug), class: ['custom-payment', :centered] do
%span.currency=_!'$'
%span.currency=_!'$' # TODO: this needs to be localized
= numberfield :amount, nil, required: true, step: 0.01, min: 0.00, label: false
= button_tag :custom_amount, value: :payment
= button :custom_amount, value: :payment
%p=_'articles.conference_registration.paragraphs.currency','(amounts are in $USD)'
= form_tag register_path(@this_conference.slug), class: :payment do
= hidden_field_tag :button, :payment
.actions.skip
= button_tag :skip, name: :amount, value: '0.0'
= button :skip, name: :amount, value: '0.0'
= columns(large: 2)
app/views/conferences/_paypal_confirm.html.haml
+4 -4
View File
@@ -1,5 +1,5 @@
= columns(medium: 12) do
%h3=_'articles.conference_registration.headings.payment_confirm'
%p=_'articles.conference_registration.paragraphs.payment_confirm', vars: {:amount => @amount}
= form_tag register_path(@this_conference.slug), :class => :payment do
.actions= button_tag :confirm_amount, :value => :paypal_confirmed
%h3=_'articles.conference_registration.headings.payment_confirm'
%p=_'articles.conference_registration.paragraphs.payment_confirm', vars: {:amount => @amount}
= form_tag register_path(@this_conference.slug), :class => :payment do
.actions= button :confirm_amount, :value => :paypal_confirmed
app/views/conferences/_policy.html.haml
+5 -5
View File
@@ -1,8 +1,8 @@
= columns(medium: 12) do
%p=_'articles.conference_registration.paragraphs.Policy_Agreement', :s, 2
%p=_'articles.conference_registration.paragraphs.Policy_Agreement', :s, 2
= columns(medium: 10, push: 1) do
= render 'application/policy'
= render 'application/policy'
= columns(medium: 12) do
%p=_'articles.conference_registration.paragraphs.Confirm_Agreement', :p
= form_tag register_path(@this_conference.slug) do
.actions= button_tag :agree, :value => :policy
%p=_'articles.conference_registration.paragraphs.Confirm_Agreement', :p
= form_tag register_path(@this_conference.slug) do
.actions= button :agree, value: :policy
app/views/conferences/_questions.html.haml
+1 -1
View File
@@ -11,4 +11,4 @@
= emailfield :companion, (@registration.housing_data['companions'] || [nil]).first, heading: 'articles.conference_registration.headings.companion', help: 'articles.conference_registration.paragraphs.companion', big: true
= textfield :allergies, @registration.allergies, heading: 'articles.conference_registration.headings.allergies'
= textarea :other, @registration.other, plain: true, heading: 'articles.conference_registration.headings.other'
= button_tag :register, :value => :questions
= button :register, value: :questions
app/views/conferences/_register.html.haml
+1 -1
View File
@@ -8,4 +8,4 @@
.email-field.input-field
= email_field_tag :email, nil, required: true
= label_tag :email
= button_tag :register, :value => :register
= button :register, value: :register
app/views/conferences/_registration_register.html.haml
-45
View File
@@ -1,45 +0,0 @@
.columns{:class => @host_privledges ? 'medium-8' : 'medium-12'}
= f.fields_for @user do |u|
.columns#step-1.registration-step= u.email_field :email
%button#submit-email.next=_'form.Next'
= f.fields_for @user do |u|
.columns#step-2.registration-step= u.text_field :username
-# .columns.medium-6
= select_tag :is_attending, options_for_select(ConferenceRegistration::AttendingOptions, @conference_registration.try(:is_attending)), :label => true
%ol
- @conference.registration_form_fields.each do |ff|
%li
- response = @conference_registration ? ConferenceRegistrationResponse.find_by(conference_registration_id: @conference_registration.id, registration_form_field_id: ff.id) : nil
= form_field ff, response
= f.actions :register
- content_for :scripts do
:plain
function updateForm(data, step) {
$('.registration-step').each(function() {
var $this = $(this);
var this_step = parseInt($this.attr('id').replace(/^step\-(\d+)$/, '$1'));
if (this_step > step) {
$this.find('input,select').each(function(){
var $input = $(this);
var params = $input.attr('name').match(/\[(.*?)\]/g);
var val = data.conference;
for (key in params) {
var k = params[key].replace(/\[(.*)\]/, '$1');
val = val[params[key].replace(/\[(.*)\]/, '$1')];
}
$input.val(val)
});
}
});
}
- dom_ready do
:plain
$('#submit-email').click(function(e){
e.preventDefault();
$.post('register/step/1', $('form.edit_conference').serialize(), function(data) {
//console.log(data.conference.user.username);
updateForm(data, 1);
});
});
app/views/conferences/_workshops.html.haml
+18 -18
View File
@@ -1,22 +1,22 @@
= 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
= render 'workshops/workshop_previews', :workshops => @my_workshops
- else
%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 @my_workshops.present?
%h3=_'articles.conference_registration.headings.Your_Workshops'
%p=_'articles.conference_registration.paragraphs.Your_Workshops', :p
= render 'workshops/workshop_previews', :workshops => @my_workshops
- else
%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, 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
= 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, 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
= 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, class: 'major-group') do
%h3=_'articles.conference_registration.headings.All_Workshops'
= render 'workshops/workshop_previews', :workshops => @workshops
= columns(medium: 12, class: 'major-group') do
%h3=_'articles.conference_registration.headings.All_Workshops'
= render 'workshops/workshop_previews', :workshops => @workshops
app/views/conferences/broadcast.html.haml
+7 -7
View File
@@ -19,17 +19,17 @@
- else
.text-field.input-field.big
= label_tag :subject
= text_field_tag :subject, @subject, :required => true
= text_field_tag :subject, @subject, required: true
.select-field.input-field
= label_tag :content
= text_area_tag :content, @content, :required => true
= text_area_tag :content, @content, required: true
.actions.right
- if @email_sent == :test
.note=_('articles.conference_registration.notes.Test_Email_Sent',"An email was sent to #{current_user.email}", vars: {:email_address => current_user.email})
.note=_('articles.conference_registration.notes.Test_Email_Sent',"An email was sent to #{current_user.email}", vars: {email_address: current_user.email})
- if @email_sent == :preview # let the user send the
= button_tag :edit, :value => :edit
= button_tag :send, :value => :send
= button :edit, value: :edit
= button :send, value: :send
- else
= button_tag :preview, :value => :preview
= button_tag :test, :value => :test
= button :preview, value: :preview
= button :test, value: :test
app/views/conferences/edit.html.haml
+22 -22
View File
@@ -1,30 +1,30 @@
= render 'page_header', :page_key => 'Edit'
= render 'page_header', page_key: 'Edit'
%article
= row do
= columns(medium: 12) do
= form_tag save_conference_path(@this_conference.slug), class: 'composition' do
.text-editor.input-field
= label_tag :info
= text_area_tag :info, @this_conference.info, :required => true
.actions.right
.left
- I18n.backend.enabled_locales.each do |locale|
= (link_to (_'actions.conference.Translate', "Edit #{language_name(locale)} version", :vars => {:language => language_name(locale)}), edit_conference_path(@this_conference.slug, url_params(locale)), :class => 'translate') if locale.to_sym != I18n.locale.to_sym
= row do
= columns(medium: 12) do
= form_tag save_conference_path(@this_conference.slug), class: 'composition' do
.text-editor.input-field
= label_tag :info
= text_area_tag :info, @this_conference.info, :required => true
.actions.right
.left
- I18n.backend.enabled_locales.each do |locale|
= (link_to (_'actions.conference.Translate', "Edit #{language_name(locale)} version", vars: {:language => language_name(locale)}), edit_conference_path(@this_conference.slug, url_params(locale)), class: 'translate') if locale.to_sym != I18n.locale.to_sym
= button_tag :save, :value => :save
= button :save, value: :save
/ :javascript
/ window.jQuery || document.write('<script src="https://code.jquery.com/jquery-2.1.3.min.js"><\/script>')
/ window.jQuery || document.write('<script src="https://code.jquery.com/jquery-2.1.3.min.js"><\/script>')
-#= javascript_include_tag "froala_editor.min.js"
-#= stylesheet_link_tag "froala_editor.min.css"
-#= stylesheet_link_tag "font-awesome.min.css"
/ :javascript
/ $(function() {
/ $('.text-editor textarea').editable({
/ language: '<% I18n.locale.to_s %>',
/ inlineMode: false,
/ blockTags: ["n", "p", "h2", "blockquote", "pre"],
/ buttons: ["formatBlock", "bold", "italic", "underline", "insertOrderedList", "insertUnorderedList", "sep", "createLink", "html", "undo", "redo"],
/ colors: ['#00ADEF', '#DD57EF', '#E6C74B', 'REMOVE']
/ });
/ });
/ $(function() {
/ $('.text-editor textarea').editable({
/ language: '<% I18n.locale.to_s %>',
/ inlineMode: false,
/ blockTags: ["n", "p", "h2", "blockquote", "pre"],
/ buttons: ["formatBlock", "bold", "italic", "underline", "insertOrderedList", "insertUnorderedList", "sep", "createLink", "html", "undo", "redo"],
/ colors: ['#00ADEF', '#DD57EF', '#E6C74B', 'REMOVE']
/ });
/ });
app/views/conferences/hosts.html.haml
-13
View File
@@ -1,13 +0,0 @@
- page_style :form
= tabs!
.row
= form_for @conference do |f|
.columns.medium-4
%h2=_'conference.hosts.help.title', :t
%p=_'conference.hosts.help', :p
.columns.medium-8
.clearfix
= f.fields_for :conference_host_organizations, :include_id => true do |u|
= u.organization_select_field :id, @conference.organizations[u.index] #, attrs: @conference
= f.actions :save
app/views/conferences/list.html.haml
+1 -1
View File
@@ -24,7 +24,7 @@
- list.each do | conference |
%li.conference{id: "conference-#{conference.id}", data: {a: conference.city.latitude, o: conference.city.longitude, y: conference.year, t: conference.conferencetype}, class: conference.is_public ? nil : 'not-public'}
.info
%h4.title= conference.title
%h4.title= _!conference.title
.conference-details
.location=location(conference.city)
- if conference.start_date.present? && conference.end_date.present?
app/views/conferences/register.html.haml
+1 -1
View File
@@ -9,4 +9,4 @@
= columns(medium: 12) do
%h2=_(@page_title)
= registration_step_menu
= render "conferences/#{@register_template.to_s}"
= render "conferences/#{@register_template}"
app/views/conferences/registration.html.haml
-14
View File
@@ -1,14 +0,0 @@
= render 'header'
- page_style :form
= tabs!
.row
= form_for @conference do |f|
- if @host_privledges
.columns.medium-4
=sub_tabs!
%h2=_'conference.hosts.help.title', :t
%p=_'conference.hosts.help', :p
= render @sub_action, :f => f
= yield_or_default(:after_form)
app/views/conferences/view.html.haml
+1 -1
View File
@@ -2,4 +2,4 @@
= @this_conference.poster.full.url || image_path('default_poster.jpg')
- content_for :title do
=@this_conference.title
= render 'conferences/conference', conference: @this_conference, links: @links
= render 'conferences/conference', conference: @this_conference, links: @links, sections: [:info, :workshops]
app/views/layouts/application.html.haml
+1 -1
View File
@@ -68,7 +68,7 @@
= form_tag do_confirm_path, class: 'flex-form' do
= hidden_field_tag :dest, settings_path
= emailfield :email, nil, big: true
= button_tag :continue, :value => :confirm_email
= button :continue, value: :confirm_email
.flex-form
= link_to (_'forms.actions.generic.facebook_sign_in','Facebook Sign In'), auth_at_provider_path(provider: :facebook, dest: settings_path), class: [:button, :facebook]
%button.close.subdued=_'forms.actions.generic.cancel'
app/views/layouts/user_mailer.html.haml
+25 -25
View File
@@ -1,27 +1,27 @@
!!! Strict
%html{:xmlns => "http://www.w3.org/1999/xhtml"}
%head
%meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
%meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}/
%title=@subject
= stylesheet_link_tag 'user-mailer'
%body
%table{:border => "0", :cellpadding => "0", :cellspacing => "0", id: @wrapper_id.present? ? "bb_#{@wrapper_id.to_s}" : 'backgroundTable'}
%tr
%td
%table{:align => "center", :border => "0", :cellpadding => "0", :cellspacing => "0"}
- if @banner
%tr
%td{:valign => "top", :style => 'text-align: center', colspan: 2}
%img.image_fix{:src => @banner}
%tr
%td{:valign => "top", colspan: 2}= yield
%tr
%td{colspan: 2, style: 'height: 16px'}='&nbsp;'.html_safe
%tr
%td{style: 'width: 50%; text-align: left'}
%img.image_fix{:src => ((Rails.env.development? || Rails.env.test? ? 'https://preview-en.bikebike.org/' : @host) + image_url('bblogo-paypal'))}
%td{style: 'width: 50%; text-align: left'}
%a{href: @host}="&copy; Bike!Bike! #{Date.today.year}".html_safe
%tr
%td{colspan: 2, style: 'height: 16px'}='&nbsp;'.html_safe
%head
%meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
%meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}/
%title=_!(@subject)
= stylesheet_link_tag 'user-mailer'
%body
%table{:border => "0", :cellpadding => "0", :cellspacing => "0", id: @wrapper_id.present? ? "bb_#{@wrapper_id.to_s}" : 'backgroundTable'}
%tr
%td
%table{:align => "center", :border => "0", :cellpadding => "0", :cellspacing => "0"}
- if @banner
%tr
%td{:valign => "top", :style => 'text-align: center', colspan: 2}
%img.image_fix{:src => @banner}
%tr
%td{:valign => "top", colspan: 2}= yield
%tr
%td{colspan: 2, style: 'height: 16px'}='&nbsp;'.html_safe
%tr
%td{style: 'width: 50%; text-align: left'}
%img.image_fix{:src => ((Rails.env.development? || Rails.env.test? ? 'https://preview-en.bikebike.org' : @host) + image_url('bblogo-paypal'))}
%td{style: 'width: 50%; text-align: left'}
%a{href: @host}=_!("&copy; Bike!Bike! #{Date.today.year}")
%tr
%td{colspan: 2, style: 'height: 16px'}='&nbsp;'.html_safe
app/views/schedule/edit.html.haml
+4 -4
View File
@@ -19,12 +19,12 @@
= (hidden_field_tag :location_id, @location.id) if @location
.actions
- if @this_conference.workshop_schedule_published
= button_tag :Unpublish, :value => :unpublish, :class => 'delete'
= button :Unpublish, value: :unpublish, class: 'delete'
- elsif @error_count < 1
= button_tag :Publish, :value => :publish
= button_tag :Preview, :value => :preview, :class => 'secondary'
= button :Publish, value: :publish
= button :Preview, value: :preview, class: 'secondary'
- unless @this_conference.workshop_schedule_published && @error_count > 0
= button_tag :save, :value => :save
= button :save, value: :save
- unless @saved
.unsaved=_'errors.schedule.unsaved','Your changes will not be saved until you press Save or Publish'
= row do
app/views/shared/_footer.html.haml
-7
View File
@@ -3,12 +3,10 @@
.facebook
=_'links.footer.help_text.facebook', 'Join our facebook group' do |title|
%a{href: 'https://www.facebook.com/groups/648758205249998/', target: :_blank, title: title}
-#= svg_sprite 'icons', 'bb-icon-fb', 'facebook logo'
= svg 'facebook', 'facebook logo'
.github
=_'links.footer.text.Help_contribute' do |title|
%a{href: 'https://github.com/bikebike/BikeBike', target: :_blank, title: title}
-#= svg_sprite 'icons', 'bb-icon-github', 'github logo'
= svg 'github', 'github logo'
.user-controls
- if logged_in?
@@ -18,11 +16,6 @@
- else
= signin_link
%ul.locales
-# - @alt_lang_urls.each do |locale, url|
-# %li
-# - locale_translation = language_name(locale, true)
-# %a{href: url, lang: locale}
-# =_'translate.content.change_locale', "Read in #{locale_translation}", vars: {language: locale_translation}, locale: locale if locale != I18n.locale.to_s
.site-info
.contact-us=link_to (_'links.footer.help_text.contact'), contact_path, id: 'contact-link'
.copy
app/views/shared/_navbar.html.haml
+1 -3
View File
@@ -4,8 +4,6 @@
= columns(medium: 3) do
- protect do
= link_to home_path, :class => 'logo' do
-#= svg_sprite('icons', "bb-icon-logo", "Logo")
-#= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
= svg 'logo', (_!'Bike Bike')
= svg 'logo-text', (_!'Bike Bike')
= off_screen _!'Bike Bike'
@@ -22,6 +20,6 @@
- locale_translation = language_name(locale, true)
- translation_text = (_'translate.content.change_locale', "Read in #{locale_translation}", vars: {language: locale_translation}, locale: locale)
%a{href: url, lang: locale, title: translation_text}
%span{aria: {hidden: true}}=locale
%span{aria: {hidden: true}}=_!locale
= off_screen translation_text
app/views/shared/_translation_control.html.haml
+26 -26
View File
@@ -1,27 +1,27 @@
- if ThereAreTranslationsOnThisPage?
- counts = {'one' => _('translation.count.one'), 'zero' => _('translation.count.zero'), 'two' => _('translation.count.two'), 'few' => _('translation.count.few'), 'many' => _('translation.count.many')}
- save_str = _ 'active_record.save'
= javascript_include_tag 'translate'
%div#translation-control
= form_tag '/translate/' do
= hidden_field_tag :translationlang, I18n.locale
.row
.columns.medium-3
= select_tag :translationkey, options_for_select(get_all_translations().invert())
.columns.medium-8
= text_area_tag :translationvalue, '', :rows => '1'
#translatepluralizations
= hidden_field_tag :translationhascount, I18n.locale
- counts.each do |count_key,count_name|
.row
.columns.medium-2
= check_box_tag ('translationpluralization_' + count_key.to_s)
= label_tag ('translationpluralization_' + count_key.to_s), count_name.to_s
.columns.medium-10
= text_area_tag ('translationvalue_' + count_key.to_s), '', :rows => '1'
#translatevars
%strong Parameters:
%ul
.columns.medium-1
= button_tag save_str
- counts = {'one' => _('translation.count.one'), 'zero' => _('translation.count.zero'), 'two' => _('translation.count.two'), 'few' => _('translation.count.few'), 'many' => _('translation.count.many')}
- save_str = _ 'active_record.save'
= javascript_include_tag 'translate'
%div#translation-control
= form_tag '/translate/' do
= hidden_field_tag :translationlang, I18n.locale
.row
.columns.medium-3
= select_tag :translationkey, options_for_select(get_all_translations().invert())
.columns.medium-8
= text_area_tag :translationvalue, '', :rows => '1'
#translatepluralizations
= hidden_field_tag :translationhascount, I18n.locale
- counts.each do |count_key,count_name|
.row
.columns.medium-2
= check_box_tag ('translationpluralization_' + count_key.to_s)
= label_tag ('translationpluralization_' + count_key.to_s), count_name.to_s
.columns.medium-10
= text_area_tag ('translationvalue_' + count_key.to_s), '', :rows => '1'
#translatevars
%strong Parameters:
%ul
.columns.medium-1
= button save_str
app/views/user_mailer/contact.html.haml
+4 -4
View File
@@ -1,5 +1,5 @@
%h1 From
%p=@from.is_a?(User) ? @from.named_email : @from
%h1=_!'From'
%p=_!(@from.is_a?(User) ? @from.named_email : @from)
%h1 Message
%blockquote=markdown(@message)
%h1=_!'Message'
%blockquote=_!markdown(@message)
app/views/user_mailer/contact_details.html.haml
+27 -27
View File
@@ -1,46 +1,46 @@
%h1 From
%h1=_!('From')
%table.error-report
%tr
%th Key
%th Value
%th=_!'Key'
%th=_!'Value'
%tr
%td User ID
%td=@from.is_a?(User) ? @from.id : ''
%td=_!'User ID'
%td=_!(@from.is_a?(User) ? @from.id : '')
%tr
%td User Name
%td=@from.is_a?(User) ? @from.name : ''
%td=_!'User Name'
%td=_!(@from.is_a?(User) ? @from.name : '')
%tr
%td User Email
%td=@from.is_a?(User) ? @from.email : @from
%td=_!'User Email'
%td=_!(@from.is_a?(User) ? @from.email : @from)
%tr
%td IP Address
%td=@request['remote_ip']
%td=_!'IP Address'
%td=_!@request['remote_ip']
%tr
%td UUID
%td=@request['uuid']
%td=_!'UUID'
%td=_!@request['uuid']
%tr
%td URL
%td=@request['original_url']
%td=_!'URL'
%td=_!@request['original_url']
%h1 Message
%blockquote=markdown(@message)
%h1=_!'Message'
%blockquote=_!markdown(@message)
%h1 Params
%h1=_!'Params'
%table.error-report
%tr
%th Key
%th Value
%th=_!'Key'
%th=_!'Value'
- @params.each do | key, value |
%tr
%td=key
%td=value
%td=_!key
%td=_!value
%h1 Request Environment
%h1=_!'Request Environment'
%table.error-report
%tr
%th Key
%th Value
%th=_!'Key'
%th=_!'Value'
- @request['env'].each do | key, value |
%tr
%td=key
%td=value
%td=_!key
%td=_!value
app/views/user_mailer/email_confirmation.html.haml
+1 -2
View File
@@ -1,6 +1,5 @@
%p=_'email.confirmation.paragraph.please_confirm','Hello! To gain access to registration and other features of Bike!Bike!, please confirm your email address by clicking on following link:'
- link = "#{@host}/confirm/#{@confirmation.token}"
%p
%h3
%b
%a{href: link}=_'email.confirmation.link.please_confirm'
%a{href: confirm_url(@confirmation.token)}=_'email.confirmation.link.please_confirm'
app/views/user_mailer/workshop_comment.html.haml
+2 -2
View File
@@ -11,5 +11,5 @@
%p
=_'email.workshop.paragraph.view_workshop'
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
- workshop_link = view_workshop_url(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=_!(workshop_link)
app/views/user_mailer/workshop_facilitator_request.html.haml
+3 -3
View File
@@ -1,10 +1,10 @@
%p=_'email.workshop.paragraph.request_message',"Below is a message from #{@requester.firstname}:", :vars => {:workshop_title => @workshop.title, :user_name => @requester.name}
%blockquote=CGI::escapeHTML(@message || '').gsub(/\n/, '<br>').html_safe
%blockquote=_!(CGI::escapeHTML(@message || '').gsub(/\n/, '<br>'))
%p
=_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: "
- workshop_link = @host + view_workshop_path(@conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
- workshop_link = @host + view_workshop_url(@conference.slug, @workshop.id).html_safe
%a{href: workshop_link}=_!(workshop_link)
%p=_'email.workshop.paragraph.request_reply_instructions',"You can also reply directly to this email to ask follow-up questions."
app/views/user_mailer/workshop_facilitator_request_approved.html.haml
+2 -2
View File
@@ -1,4 +1,4 @@
%p
- workshop_link = link_to (_!@workshop.title), @host + view_workshop_path(@conference.slug, @workshop.id).html_safe
=_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link}.", :vars => {:workshop_title => workshop_link}
- workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id)
=_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link.html_safe}.", vars: {workshop_title: workshop_link.html_safe}
app/views/user_mailer/workshop_facilitator_request_denied.html.haml
+2 -2
View File
@@ -1,3 +1,3 @@
%p
- workshop_link = link_to (_!@workshop.title), @host + view_workshop_path(@conference.slug, @workshop.id).html_safe
=_'email.workshop.paragraph.request_denied',"Your request to become a facilitator of #{workshop_link} has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.", :vars => {:workshop_title => workshop_link}
- workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id).html_safe
=_'email.workshop.paragraph.request_denied',"Your request to become a facilitator of #{workshop_link} has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.", vars: {workshop_title: workshop_link.html_safe}
app/views/user_mailer/workshop_translated.html.haml
+2 -2
View File
@@ -10,5 +10,5 @@
%p
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
- workshop_link = @host + view_workshop_url(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=_!(workshop_link)
app/views/user_mailer/workshop_translated.text.haml
-25
View File
@@ -1,25 +0,0 @@
=_('email.translations.paragraph.workshop_translated', "#{@translator.firstname} has modified the #{@locale_name} translation for #{@workshop.title}.", vars: {user_name: @translator.firstname, language: @locale_name, workshop_title: @workshop.title})
- @data.each do |field, values|
=(_!'** ') + (_"forms.labels.generic.#{field.to_s}")
=(_!' - ') + (_'email.translations.headings.new_value')
=(_!' ------------------------------ ')
=_!values[:new]
=(_!' ------------------------------ ')
=(_!' - ') + (_'email.translations.headings.old_value')
=(_!' ------------------------------ ')
=_!values[:old]
=(_!' ------------------------------ ')
=(_!' - ') + (_'email.translations.headings.diff')
=(_!' ------------------------------ ')
=(_!values[:diff][:text])
=(_!' ------------------------------ ')
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
= view_workshop_path(@workshop.conference.slug, @workshop.id)
app/views/workshops/_show.html.haml
+7 -7
View File
@@ -27,7 +27,7 @@
=_"roles.workshops.facilitator.#{workshop.role(u).to_s}"
- if is_facilitator && preview.blank?
.details
.email=u.email
.email=_!u.email
- if f.role.to_sym == :requested
=(link_to (_'actions.workshops.Approve'), approve_facilitate_workshop_request_path(workshop.conference.slug, workshop.id, f.user_id, 'approve'), :class => [:button, :modify])
=(link_to (_'actions.workshops.Deny'), approve_facilitate_workshop_request_path(workshop.conference.slug, workshop.id, f.user_id, 'deny'), :class => [:button, :delete])
@@ -46,7 +46,7 @@
= email_field_tag :email, nil, required: true
= label_tag :email
= off_screen (_'forms.actions.aria.add'), 'add-new-desc'
= button_tag :add, aria: { labelledby: 'add-new-desc' }
= button :add, aria: { labelledby: 'add-new-desc' }
- languages = JSON.parse(workshop.languages || '[]')
- if languages.present?
= columns(medium: 6) do
@@ -55,7 +55,7 @@
- if workshop.theme.present?
= columns(medium: 6) do
%h3=_'articles.workshops.headings.theme','Theme'
%p= Workshop.all_themes.include?((workshop.theme || '').to_sym) ? (_"workshop.options.theme.#{workshop.theme}") : workshop.theme
%p= Workshop.all_themes.include?((workshop.theme || '').to_sym) ? (_"workshop.options.theme.#{workshop.theme}") : _!(workshop.theme)
- if is_facilitator || workshop.conference.host?(current_user)
- needs = JSON.parse(workshop.needs || '[]')
- if needs.present?
@@ -69,21 +69,21 @@
= columns(medium: 12, id: :comments) do
%h3=_'articles.workshops.headings.Comments'
%ul.comments
- workshop.comments.each do | comment |
- workshop.comments.each do |comment|
%li.comment{id: "comment-#{comment.id}"}
= comment(comment)
- sub_comments = comment.comments
- if sub_comments.present?
%ul.sub-comments.comments
- sub_comments.each do | sub_comment |
- sub_comments.each do |sub_comment|
%li.sub-comment.comment{id: "comment-#{sub_comment.id}"}
= comment(sub_comment)
= form_tag workshop_comment_path(workshop.conference.slug, workshop.id) do
= hidden_field_tag :comment_id, comment.id
= textarea :reply, nil, plain: true, required: true, label: false, labelledby: "replyto-#{comment.id}"
.actions.right
= button_tag :reply, value: :reply, data: {opens: "#comment-#{comment.id} form", focus: :textarea}, class: :small, id: "replyto-#{comment.id}"
= button :reply, value: :reply, data: {opens: "#comment-#{comment.id} form", focus: :textarea}, class: :small, id: "replyto-#{comment.id}"
= form_tag workshop_comment_path(workshop.conference.slug, workshop.id) do
= textarea :comment, nil, plain: true, required: true, label: false, labelledby: :add_comment
.actions.right
= button_tag :add_comment, value: :add_comment, id: :add_comment
= button :add_comment, value: :add_comment, id: :add_comment
app/views/workshops/_workshop_previews.html.haml
+1 -1
View File
@@ -2,7 +2,7 @@
- workshops.sort_by{ |w| w.title.downcase }.each do |w|
- is_interested = w.interested?(current_user)
%li{class: [is_interested ? :interested : nil]}
%h4.title=w.title
%h4.title=_!(w.title)
.workshop-interest
- if w.can_show_interest?(current_user)
= form_tag toggle_workshop_interest_path(w.conference.slug, w.id), class: 'js-xhr' do
app/views/workshops/delete.html.haml
+8 -8
View File
@@ -1,11 +1,11 @@
= render 'conferences/page_header', :page_key => 'Delete_Workshop'
%article
= row do
= columns(medium: 12) do
%h2=_'articles.workshops.headings.Delete_Workshop',"Are you sure you want to delete the workshop: <em>#{@workshop.title}</em>?", :vars => {:title => "<em>#{@workshop.title}</em>".html_safe}
%p=_'articles.workshops.paragraphs.Delete_Workshop'
= form_tag delete_workshop_path(@this_conference.slug, @workshop.id), class: 'composition' do
.actions
= button_tag :confirm, :value => :confirm, :class => :delete
= button_tag :cancel, :value => :cancel
= row do
= columns(medium: 12) do
%h2=_'articles.workshops.headings.Delete_Workshop',"Are you sure you want to delete the workshop: <em>#{@workshop.title}</em>?", vars: {title: "<em>#{@workshop.title}</em>".html_safe}
%p=_'articles.workshops.paragraphs.Delete_Workshop'
= form_tag delete_workshop_path(@this_conference.slug, @workshop.id), class: 'composition' do
.actions
= button :confirm, value: :confirm, class: :delete
= button :cancel, value: :cancel
app/views/workshops/edit.html.haml
-6
View File
@@ -1,6 +0,0 @@
- page_style :form
= tabs!
.row
= render 'form'
app/views/workshops/facilitate.html.haml
+14 -14
View File
@@ -1,16 +1,16 @@
= render 'conferences/page_header', :page_key => 'Facilitate_Workshop'
= render 'conferences/page_header', page_key: 'Facilitate_Workshop'
%article
= row do
= form_tag facilitate_workshop_request_path(@this_conference.slug, @workshop.id), class: 'composition' do
= (hidden_field_tag :workshop_id, @workshop.id) if @workshop
= columns(medium: 12) do
%h2=_'articles.workshops.headings.facilitate', "Request to Facilitate ‘#{@workshop.title}’", :vars => { :workshop_title => @workshop.title }
= registration_step_menu
=m('articles.workshops.paragraphs.facilitate_request','Please tell the current workshop facilitators who you are, why you want to help facilitate the workshop, and how you think you will help make the workshop better. All of the current facilitators will be emailed and they may ask more questions before approving or denying your request. Please note that this will reveal your email address to the facilitators.')
.text-area-field.input-field
= label_tag :message
= text_area_tag :message, nil, :required => true
= columns(medium: 12) do
.actions.right
= button_tag :send, :value => :send
= row do
= form_tag facilitate_workshop_request_path(@this_conference.slug, @workshop.id), class: 'composition' do
= (hidden_field_tag :workshop_id, @workshop.id) if @workshop
= columns(medium: 12) do
%h2=_'articles.workshops.headings.facilitate', "Request to Facilitate ‘#{@workshop.title}’", vars: { workshop_title: @workshop.title }
= registration_step_menu
=_('articles.workshops.paragraphs.facilitate_request','Please tell the current workshop facilitators who you are, why you want to help facilitate the workshop, and how you think you will help make the workshop better. All of the current facilitators will be emailed and they may ask more questions before approving or denying your request. Please note that this will reveal your email address to the facilitators.')
.text-area-field.input-field
= label_tag :message
= text_area_tag :message, nil, required: true
= columns(medium: 12) do
.actions.right
= button :send, value: :send
app/views/workshops/facilitate_request_sent.html.haml
+9 -9
View File
@@ -1,12 +1,12 @@
= render 'conferences/page_header', :page_key => 'Conference_Registration'
%article
= row do
%h2=_'page_titles.conferences.Facilitate_Workshop'
= registration_step_menu
= columns(medium: 12) do
=m('articles.workshops.paragraphs.facilitate_request_sent','Your request has been sent. You will receive an email once your request is approved or denied or if the current facilitators have any questions.')
= columns(medium: 12) do
.actions
= link_to (_'actions.workshops.View'), view_workshop_path(@this_conference.slug, @workshop.id), :class => 'button'
= link_to (_'actions.workshops.View_All'), register_step_path(@this_conference.slug, :wokshops), :class => 'button'
= row do
%h2=_'page_titles.conferences.Facilitate_Workshop'
= registration_step_menu
= columns(medium: 12) do
=_('articles.workshops.paragraphs.facilitate_request_sent','Your request has been sent. You will receive an email once your request is approved or denied or if the current facilitators have any questions.')
= columns(medium: 12) do
.actions
= link_to (_'actions.workshops.View'), view_workshop_path(@this_conference.slug, @workshop.id), :class => 'button'
= link_to (_'actions.workshops.View_All'), register_step_path(@this_conference.slug, :wokshops), :class => 'button'
app/views/workshops/index.html.haml
+5 -4
View File
@@ -1,4 +1,4 @@
= render 'conferences/page_header', :page_key => 'Workshops'
= render 'conferences/page_header', page_key: 'Workshops'
%article
= row do
@@ -10,9 +10,10 @@
= row do
= columns(medium: 12) do
%h3=_'articles.workshops.headings.Your_Workshops'
= render 'workshops/workshop_previews', :workshops => @my_workshops
= render 'workshops/workshop_previews', workshops: @my_workshops
= link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: [:button, :modify] if @conference.registration_open
= row do
= columns(medium: 12) do
%h3=_'articles.workshops.headings.All_Workshops'
= render 'workshops/workshop_previews', :workshops => @workshops
%h3=_'articles.conference_registration.headings.All_Workshops'
-#%h3 All Workshops weather you like it or not
= render 'workshops/workshop_previews', workshops: @workshops
app/views/workshops/new.html.haml
+2 -2
View File
@@ -36,6 +36,6 @@
= textarea :notes, @workshop.notes, warning: 'articles.workshops.paragraphs.notes'
= columns(medium: 12) do
.actions.next-prev
= button_tag :save, value: :save
= button_tag :cancel, value: :cancel, class: :subdued, formnovalidate: true
= button :save, value: :save
= button :cancel, value: :cancel, class: :subdued, formnovalidate: true