From ce3f9e422ab4fca79d7f0cbb5d0d9d25dc898f6c Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 4 Jun 2020 02:04:07 -0700 Subject: [PATCH] Tidy up some text around logins and proposals --- .../devise/shared/_openid_links.html.haml | 3 +- .../shared/_sign_up_form_embedded.html.haml | 4 +++ .../proposals/_encouragement_text.html.haml | 8 ++--- app/views/proposals/new.html.haml | 29 ++++++++++--------- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/app/views/devise/shared/_openid_links.html.haml b/app/views/devise/shared/_openid_links.html.haml index 2e7916b3..31b4a176 100644 --- a/app/views/devise/shared/_openid_links.html.haml +++ b/app/views/devise/shared/_openid_links.html.haml @@ -5,7 +5,8 @@ = link_to "user_#{provider}_omniauth_authorize".to_sym, class: "btn btn-success btn-lg", id: "omniauth-#{provider}", title: "Your #{provider} login" do - %i{class: "fa fa-#{provider}"} + -# %i{class: "fa fa-#{provider}"} + = provider.capitalize - else = link_to("user_#{provider}_omniauth_authorize".to_sym, class: "btn btn-success btn-lg", diff --git a/app/views/devise/shared/_sign_up_form_embedded.html.haml b/app/views/devise/shared/_sign_up_form_embedded.html.haml index 5bc038f0..fa4bb502 100644 --- a/app/views/devise/shared/_sign_up_form_embedded.html.haml +++ b/app/views/devise/shared/_sign_up_form_embedded.html.haml @@ -1,4 +1,8 @@ - unless current_user + %p + %strong Create an account directly for Snap!Con, or sign in using Google. + %p + Snap!Con uses a different account system, but please use the same username or email address if possible. (We're working on improving this!) = semantic_fields_for @user do |u| = u.input :username, input_html: { required: 'required', autocomplete: 'off' } = u.input :email, input_html: { required: 'required', autocomplete: 'off' } diff --git a/app/views/proposals/_encouragement_text.html.haml b/app/views/proposals/_encouragement_text.html.haml index ad9f01ea..5c4ccb73 100644 --- a/app/views/proposals/_encouragement_text.html.haml +++ b/app/views/proposals/_encouragement_text.html.haml @@ -7,7 +7,7 @@ = "#{pluralize(@program.tracks.confirmed.cfp_active.count, 'track')}:" = "#{tracks(@conference)}." - if @program.cfp_open? - The submission period has begun + The submission period is open from %em.notranslate = @program.cfp.start_date.strftime('%A, %B %-d. %Y') and closes @@ -16,9 +16,7 @@ That means you have %b.notranslate= pluralize(@program.cfp.remaining_days, 'day') left! - Remember - %span.notranslate - = @conference.title + %span.notranslate #{@conference.title} will only be as good as the content you present. Submit early, submit often! - -else + - else The submission period is closed now. diff --git a/app/views/proposals/new.html.haml b/app/views/proposals/new.html.haml index bab6eebd..256cad22 100644 --- a/app/views/proposals/new.html.haml +++ b/app/views/proposals/new.html.haml @@ -2,7 +2,7 @@ .row .col-md-12 .page-header - %h1 New Proposal + %h1 New #{@conference.title} Proposal - if @program.cfp_open? - if @program.cfp.description.present? .row @@ -16,12 +16,12 @@ - unless current_user %legend %span - =link_to('#signup', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do - = ENV['OSEM_NAME'] || 'OSEM' - Account + = link_to('#signup', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do + Create a Snap!Con Account + %span.pull-right#account-already - =link_to('#signin', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do - Already have an account? + = link_to('#signin', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do + Already have a Snap!Con account? .tab-content .tab-pane.active{role: 'tabpanel', id: 'signup'} @@ -36,22 +36,24 @@ data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]}, include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' } + - @program.event_types.each do |event_type| + %div{ class: 'help-block event_event_type_id collapse', id: "#{event_type.id}-help"} + %strong Directions + %div + = markdown(event_type.description) + - 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" } - = markdown(event_type.description) - = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, hint: markdown_hint %p You have used %span#abstract-count #{@event.abstract_word_count} - words. Abstracts must be between + words. Abstracts must be between %span#abstract-minimum-word-count 0 and @@ -63,13 +65,14 @@ = 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 + = link_to '#description', 'data-toggle' => 'collapse', id: 'description_link' do Do you require something special? .collapse#description + Tell us if you'd like to try something unique or interesting or need help in sharing your presentation online. = 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' + = f.submit 'Submit Proposal', class: 'btn btn-success' .tab-pane{role: 'tabpanel', id: 'signin'} = render partial: 'devise/shared/sign_in_form_embedded'