hound fixes
This commit is contained in:
parent
e8990bfb12
commit
fc753282d3
14 changed files with 180 additions and 144 deletions
|
|
@ -34,10 +34,10 @@
|
|||
= event.id
|
||||
%td
|
||||
=link_to event.title, admin_conference_event_path(@conference.short_title, event)
|
||||
|
||||
|
||||
- if @conference.call_for_papers.rating != 0
|
||||
%td{:style => "width:96px"}
|
||||
- if event.average_rating.to_f > 0
|
||||
- if event.average_rating.to_f > 0
|
||||
#{event.average_rating}/#{@conference.call_for_papers.rating}
|
||||
%br
|
||||
#{pluralize(event.voters.length, 'voter')}
|
||||
|
|
@ -52,9 +52,9 @@
|
|||
0/#{@conference.call_for_papers.rating}
|
||||
%br
|
||||
|
||||
- if event.submitter.registrations.count < 1
|
||||
- if event.submitter.registrations.count < 1
|
||||
- bgcolor="#F7819F"
|
||||
- else
|
||||
- else
|
||||
- bgcolor=""
|
||||
%td{:style=>"background-color: #{bgcolor}"}
|
||||
- if !event.submitter.nil?
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
.row
|
||||
.col-md-12
|
||||
= semantic_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
|
||||
= f.inputs :name => "Profile" do
|
||||
= f.fields_for :user do |u|
|
||||
= u.input :name, :as => :string
|
||||
= u.input :nickname, :as => :string
|
||||
= u.input :affiliation, :as => :string, :hint => "This could be a company, a user group, or nothing at all."
|
||||
= u.input :biography, :input_html => {:rows => 5, "onkeyup" => "word_count(this, 'biography-count', 150)"}
|
||||
You have used
|
||||
%span#biography-count #{current_user.biography_word_count}
|
||||
words. Biographies are limited to 150 words.
|
||||
%br
|
||||
%br
|
||||
= render :partial => 'devise/registrations/volunteeruser', :locals => {:u => u}
|
||||
= f.inputs :name => 'OpenID' do
|
||||
= semantic_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
|
||||
= f.inputs name: 'Profile' do
|
||||
= f.input :name, as: :string
|
||||
= f.input :nickname, as: :string
|
||||
= f.input :affiliation, as: :string,
|
||||
hint: 'This could be a company, a user group, or nothing at all.'
|
||||
= f.input :biography, input_html: {rows: 5,
|
||||
'onkeyup' => "word_count(this, 'biography-count', 150)"}
|
||||
You have used
|
||||
%span#biography-count #{current_user.biography_word_count}
|
||||
words. Biographies are limited to 150 words.
|
||||
%br
|
||||
%br
|
||||
= f.inputs name: 'OpenID' do
|
||||
%h4
|
||||
Currently using the following openIDs:
|
||||
- @openids.each do |openid|
|
||||
|
|
@ -25,9 +25,10 @@
|
|||
openID while logged in to OSEM
|
||||
= render 'devise/shared/openid'
|
||||
|
||||
= f.inputs :name => "Account" do
|
||||
= f.input :email, :required => false
|
||||
= f.input :password, :hint => "(Leave blank if you don't want to change it)", :input_html => {:autocomplete => "off"}
|
||||
= f.input :password_confirmation, :input_html => {:autocomplete => "off"}
|
||||
= f.input :current_password, :input_html => {:autocomplete => "off"}, :hint => "(we need your current password to confirm password or email changes)"
|
||||
= f.action :submit, :as => :button, :label => "Update", :button_html => {:class => "btn btn-primary"}
|
||||
= f.inputs name: 'Account' do
|
||||
= f.input :email, :required => false, :input_html => {autocomplete: "off"}
|
||||
= f.input :password, hint: "(Leave blank if you don't want to change it)", input_html: {autocomplete: 'off'}
|
||||
= f.input :password_confirmation, input_html: {autocomplete: 'off'}
|
||||
= f.input :current_password, input_html: {autocomplete: 'off'},
|
||||
hint: '(we need your current password to confirm password or email changes)'
|
||||
= f.action :submit, as: :button, label: 'Update', button_html: {class: 'btn btn-primary'}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue