Permalink
Browse files

Remove whitespace [Gun.io WhitespaceBot]

  • Loading branch information...
1 parent af156a6 commit aa95b7ac1da58d9e1f1c257e308a679f50f1b54b Gun.io Whitespace Robot committed Dec 21, 2011
Showing with 438 additions and 438 deletions.
  1. +2 −2 COPYING
  2. +7 −7 Rakefile
  3. +10 −10 app/controllers/application_controller.rb
  4. +11 −11 app/controllers/attendance_adm_controller.rb
  5. +5 −5 app/controllers/certificates_adm_controller.rb
  6. +4 −4 app/controllers/conferences_controller.rb
  7. +1 −1 app/controllers/logos_controller.rb
  8. +11 −11 app/controllers/people_adm_controller.rb
  9. +7 −7 app/controllers/people_controller.rb
  10. +14 −14 app/controllers/sys_conf_adm_controller.rb
  11. +26 −26 app/helpers/application_helper.rb
  12. +4 −4 app/helpers/attendance_adm_helper.rb
  13. +9 −9 app/helpers/certificates_adm_helper.rb
  14. +1 −1 app/helpers/conferences_adm_helper.rb
  15. +20 −20 app/helpers/conferences_helper.rb
  16. +1 −1 app/helpers/date_helper.rb
  17. +2 −2 app/helpers/people_adm_helper.rb
  18. +1 −1 app/helpers/people_helper.rb
  19. +4 −4 app/helpers/sys_conf_adm_helper.rb
  20. +3 −3 app/models/attendance.rb
  21. +2 −2 app/models/certif_format.rb
  22. +3 −3 app/models/certif_format_line.rb
  23. +3 −3 app/models/conf_invite.rb
  24. +4 −4 app/models/conference.rb
  25. +4 −4 app/models/document.rb
  26. +2 −2 app/models/logo.rb
  27. +10 −10 app/models/nametag_format.rb
  28. +2 −2 app/models/notification.rb
  29. +12 −12 app/models/person.rb
  30. +3 −3 app/models/photo.rb
  31. +1 −1 app/models/rescue_session.rb
  32. +16 −16 app/models/timeslot.rb
  33. +1 −1 app/models/translation.rb
  34. +2 −2 app/views/attendance_adm/_by_session.html.erb
  35. +3 −3 app/views/attendance_adm/_list_by_attendances.html.erb
  36. +5 −5 app/views/attendance_adm/att_by_tslot.html.erb
  37. +1 −1 app/views/attendance_adm/for_person.html.erb
  38. +6 −6 app/views/attendance_adm/list.html.erb
  39. +1 −1 app/views/attendance_adm/take.html.erb
  40. +4 −4 app/views/certificates_adm/_details.html.erb
  41. +4 −4 app/views/certificates_adm/_test_form.html.erb
  42. +1 −1 app/views/certificates_adm/list.html.erb
  43. +14 −14 app/views/certificates_adm/show.html.erb
  44. +1 −1 app/views/conferences/list.html.erb
  45. +3 −3 app/views/conferences_adm/list.html.erb
  46. +1 −1 app/views/conferences_adm/mail_attendees.html.erb
  47. +2 −2 app/views/conferences_adm/show.html.erb
  48. +3 −3 app/views/conferences_adm/timeslots.html.erb
  49. +1 −1 app/views/inc/_redcloth_help.html.erb
  50. +1 −1 app/views/layouts/application.html.erb
  51. +1 −1 app/views/notification/added_as_coauthor.text.plain.erb
  52. +2 −2 app/views/notification/conference_invitation.text.plain.erb
  53. +1 −1 app/views/notification/request_passwd.text.plain.erb
  54. +2 −2 app/views/notification/welcome.text.plain.erb
  55. +1 −1 app/views/people/_pers_data.html.erb
  56. +3 −3 app/views/people/confirm_duplicate.html.erb
  57. +3 −3 app/views/people/invite.html.erb
  58. +2 −2 app/views/people/login.html.erb
  59. +2 −2 app/views/people/new.html.erb
  60. +2 −2 app/views/people/profile.html.erb
  61. +2 −2 app/views/people_adm/_form.html.erb
  62. +1 −1 app/views/people_adm/_people_for_task.html.erb
  63. +2 −2 app/views/people_adm/by_task.html.erb
  64. +2 −2 app/views/people_adm/graph_list.html.erb
  65. +2 −2 app/views/people_adm/list.html.erb
  66. +1 −1 app/views/people_adm/mass_mail.html.erb
  67. +1 −1 app/views/people_adm/new.html.erb
  68. +1 −1 app/views/people_adm/show.html.erb
  69. +3 −3 app/views/proposals/_form.html.erb
  70. +4 −4 app/views/proposals/author_add_confirm.html.erb
  71. +2 −2 app/views/proposals/authors.html.erb
  72. +1 −1 app/views/proposals/edit.html.erb
  73. +3 −3 app/views/proposals/new.html.erb
  74. +22 −22 app/views/sys_conf_adm/_nametag_format_form.html.erb
  75. +1 −1 app/views/sys_conf_adm/edit.html.erb
  76. +2 −2 app/views/sys_conf_adm/edit_table_field.html.erb
  77. +2 −2 app/views/sys_conf_adm/list.html.erb
  78. +1 −1 app/views/sys_conf_adm/nametag_format_edit.html.erb
  79. +4 −4 app/views/sys_conf_adm/nametag_format_list.html.erb
  80. +1 −1 app/views/sys_conf_adm/nametag_format_new.html.erb
  81. +4 −4 app/views/sys_conf_adm/show_catalog.html.erb
  82. +3 −3 app/views/translation/stat_by_lang.html.erb
  83. +3 −3 config/environment.rb
  84. +1 −1 config/initializers/time_formats.rb
  85. +6 −6 config/routes.rb
  86. +1 −1 db/migrate/007_create_attendance.rb
  87. +2 −2 db/migrate/012_short_conference_name.rb
  88. +1 −1 db/migrate/013_sized_conf_logos.rb
  89. +1 −1 db/migrate/015_create_certif_formats.rb
  90. +1 −1 db/migrate/021_add_max_height.rb
  91. +2 −2 lib/classinherit.rb
  92. +1 −1 lib/date_validator.rb
  93. +3 −3 lib/menu_tree.rb
  94. +10 −10 lib/nametags.rb
  95. +5 −5 lib/pdf_dimensions.rb
  96. +2 −2 lib/rfc822.rb
  97. +1 −1 lib/simplexls.rb
  98. +3 −3 public/.htaccess
  99. +23 −23 public/stylesheets/comas.css
  100. +23 −23 public/stylesheets/comas_layout.css
  101. +5 −5 script/nametags
  102. +1 −1 test/unit/conference_test.rb
View
@@ -77,7 +77,7 @@ modification follow.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
-
+
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
@@ -510,7 +510,7 @@ actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
-
+
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
View
@@ -10,21 +10,21 @@ require 'rake/rdoctask'
require 'tasks/rails'
-begin
+begin
require 'gettext/utils'
- desc "Create mo-files for L10n"
+ desc "Create mo-files for L10n"
task :makemo do
GetText.create_mofiles(true, "po", "locale")
end
- desc "Update pot/po files to match new version."
+ desc "Update pot/po files to match new version."
task :updatepo do
- MY_APP_TEXT_DOMAIN = "comas"
- MY_APP_VERSION = "comas 1.0"
+ MY_APP_TEXT_DOMAIN = "comas"
+ MY_APP_VERSION = "comas 1.0"
- string_sources = Dir.glob("{app,lib}/**/*.{rb,erb,rhtml,glade}")
- string_sources << 'script/nametags' << 'script/create_user'
+ string_sources = Dir.glob("{app,lib}/**/*.{rb,erb,rhtml,glade}")
+ string_sources << 'script/nametags' << 'script/create_user'
GetText.update_pofiles(MY_APP_TEXT_DOMAIN,
string_sources,
@@ -36,7 +36,7 @@ def get_user
def require_user_for_non_public_areas
return true if @user
- public = {:people => [:login, :logout, :validate, :new, :register,
+ public = {:people => [:login, :logout, :validate, :new, :register,
:request_passwd, :recover, :profile, :claim_invite,
:get_photo],
:conferences => [:index, :list, :show, :proposals],
@@ -66,9 +66,9 @@ def check_auth
#
# def SomeThingController < Admin
# Menu = [[_('General list'), :list], [_('Status overview'), :status]]
- #
+ #
# Yes, don't forget i18n.
- #
+ #
# Menu items that have their link set to nil will be shown as labels
# only; menu items can stack other menus as their third parameter, thus:
#
@@ -100,13 +100,13 @@ def generate_menu
personal.add(_('Change password'),
url_for(:controller => '/people', :action => 'password'))
personal.add(_('My public profile'),
- url_for(:controller => '/people', :action => 'profile',
+ url_for(:controller => '/people', :action => 'profile',
:id => @user.id))
- @link_to_nametag and personal.add(_('Generate nametag'),
+ @link_to_nametag and personal.add(_('Generate nametag'),
url_for(:controller => '/people', :action => 'my_nametag'))
@user.can_submit_proposals_now? and
personal.add(_('My proposals'),
- url_for(:controller=>'/people', :action => 'proposals'))
+ url_for(:controller=>'/people', :action => 'proposals'))
@user.conferences.size > 0 and
personal.add(_('Invite a friend'),
url_for(:controller=>'/people', :action => 'invite'))
@@ -118,7 +118,7 @@ def generate_menu
@user.admin_tasks.sort_by(&:sys_name).each do |task|
begin
control = "#{task.sys_name.camelcase}Controller".constantize
- menu = menu_subtree_for((control.constants.include?('Menu') ?
+ menu = menu_subtree_for((control.constants.include?('Menu') ?
control::Menu : []), task)
rescue NameError
# Probably caused by an unimplemented controller? A
@@ -136,7 +136,7 @@ def menu_subtree_for(tree, task)
menu = MenuTree.new
tree.each do |elem|
- link = url_for(:controller => task.sys_name,
+ link = url_for(:controller => task.sys_name,
:action => elem[1]) if elem[1]
sub = menu_subtree_for(elem[2], task) if elem[2]
menu.add(_(elem[0]), link, sub)
@@ -156,7 +156,7 @@ def set_lang
end
if (set_lang and set_lang != lang)
- cookies['lang'] = {:value => set_lang,
+ cookies['lang'] = {:value => set_lang,
:expires => Time.now+1.day,
:path => '/'}
end
@@ -209,7 +209,7 @@ def choose_layout
# the Flash is set up - We can only report this to the default
# logger.
RAILS_DEFAULT_LOGGER.warn _('Requested layout "%s" not found, ' +
- 'in "%s" - using default layout') %
+ 'in "%s" - using default layout') %
[sys_layout, layout_dir]
return default
end
@@ -21,7 +21,7 @@ class AttendanceAdmController < Admin
# is true.
def choose_session
options = {:per_page => 10,
- :include => [:room, :conference],
+ :include => [:room, :conference],
:page => params[:page]}
if params[:show_all]
@tslots = Timeslot.by_time_distance(options)
@@ -46,10 +46,10 @@ def take
# Results are received by this same controller, the form is shown
# again ad nauseam
if @person
- register_attendance(@person, @tslot)
+ register_attendance(@person, @tslot)
end
- @last_att = Attendance.find(:all,
+ @last_att = Attendance.find(:all,
:limit => 5,
:order => 'created_at DESC',
:conditions => ['timeslot_id = ?', @tslot.id])
@@ -109,11 +109,11 @@ def xls_list
:filename => '%s_list.xls' % @conference.short_name)
end
- # Produces the attendance detail for a given timeslot
+ # Produces the attendance detail for a given timeslot
def att_by_tslot
begin
@tslot = Timeslot.find_by_id(params[:timeslot_id])
- raise ActiveRecord::RecordInvalid unless
+ raise ActiveRecord::RecordInvalid unless
@conference.timeslots.include? @tslot
rescue
flash[:error] << _('Invalid timeslot requested')
@@ -153,13 +153,13 @@ def certificates_by_attendances
### /!\ I am hard-wiring the first CertifFormat here. Not nice!
### :-/ Provide a way to choose one... soon :-}
send_data(CertifFormat.find(:first).generate_pdf_for(people, @conference),
- :filename => 'certificate.pdf',
+ :filename => 'certificate.pdf',
:type => 'application/pdf')
end
protected
def register_attendance(person, tslot)
- if previous = person.attendances.find(:first, :conditions =>
+ if previous = person.attendances.find(:first, :conditions =>
['timeslot_id = ?', tslot.id])
flash[:notice] << _('This person has already been registered for this ' +
'timeslot. No action taken.')
@@ -173,7 +173,7 @@ def register_attendance(person, tslot)
if ! person.conferences.include?(conf)
unless conf.accepts_registrations?
flash[:error] << _('<em>%s</em> is not registered for <em>%s</em>, ' +
- 'and registrations are closed.') %
+ 'and registrations are closed.') %
[person.name, conf.name]
return false
end
@@ -187,15 +187,15 @@ def register_attendance(person, tslot)
flash[:notice] << _('Attendance successfully registered')
else
flash[:error] << _('Could not register person <em>%s</em> for this ' +
- 'timeslot: %s') %
+ 'timeslot: %s') %
[person.name, att.errors.full_messages.join('<br/>')]
end
end
# Get either the conference specified in the parameters, or the
# latest one with registered timeslots which started already
def get_conference
- @conference = Conference.find_by_id(params[:conference_id]) ||
+ @conference = Conference.find_by_id(params[:conference_id]) ||
Conference.past_with_timeslots[0]
return false unless @conference
end
@@ -204,7 +204,7 @@ def get_person
pers_id = params[:person_id]
return true if pers_id.nil? or pers_id.blank?
@person = Person.find_by_id(pers_id) rescue nil
- flash[:error] << _('Invalid person specified: %s') %
+ flash[:error] << _('Invalid person specified: %s') %
h(pers_id) if @person.nil?
end
end
@@ -11,13 +11,13 @@ class NotForUs < Exception; end
# format
def for_person
send_data(@format.generate_pdf_for(@person, @conference),
- :filename => 'certificate.pdf',
+ :filename => 'certificate.pdf',
:type => 'application/pdf')
end
# Lists the registered certificate formats
def list
- @formats = CertifFormat.paginate(:all, :order => :id,
+ @formats = CertifFormat.paginate(:all, :order => :id,
:include => :certif_format_lines,
:page => params[:page])
@new_fmt = CertifFormat.new
@@ -87,7 +87,7 @@ def gen_sample
# Get either the conference specified in the parameters, or the
# latest one with registered timeslots which started already
def get_conference
- @conference = Conference.find_by_id(params[:conference_id]) ||
+ @conference = Conference.find_by_id(params[:conference_id]) ||
Conference.past_with_timeslots[0]
return false unless @conference
end
@@ -100,10 +100,10 @@ def get_person
end
def get_format
- @format = CertifFormat.find_by_id(params[:id],
+ @format = CertifFormat.find_by_id(params[:id],
:include => :certif_format_lines)
return true if @format
flash[:error] << _('Invalid format specified')
false
- end
+ end
end
@@ -24,7 +24,7 @@ def list
item = klass.find_by_id(value)
next unless item
- @cond << '%s: %s' % [Translation.for(catalog.humanize),
+ @cond << '%s: %s' % [Translation.for(catalog.humanize),
Translation.for(item.name)]
cond_k << '%s = ?' % catalog
cond_v << value
@@ -35,7 +35,7 @@ def list
cond_v << Date.today
end
- @rss_links[_('Conferences where %s') %
+ @rss_links[_('Conferences where %s') %
@cond.join(', ')] = rss_link_for(params) unless @cond.empty?
cond = [cond_k.join(' and '), cond_v].flatten
@@ -157,13 +157,13 @@ def check_auth
end
def rss_links
- @rss_links = {
+ @rss_links = {
_('Upcoming conferences') => rss_link_for(:hide_old => 1)
}
end
def rss_link_for(params={})
- url_for(params.merge('action' => 'list',
+ url_for(params.merge('action' => 'list',
'format' => 'rss',
'lang' => Locale.get))
end
@@ -1,7 +1,7 @@
class LogosController < ApplicationController
['data', 'medium', 'thumb'].each do |size|
eval "def #{size}
- return render(:text => '',
+ return render(:text => '',
:status => '304 Not Modified') if is_cached?(params[:id])
logo = Logo.find(params[:id])
send_logo(logo.updated_at, logo.#{size})
@@ -14,7 +14,7 @@ def index
end
def list
- @order_by = 'people.' + sort_for_fields(['id', 'login', 'firstname',
+ @order_by = 'people.' + sort_for_fields(['id', 'login', 'firstname',
'famname', 'last_login_at'])
@filter_by = params[:filter_by]
@conferences = Conference.find(:all).sort_by(&:begins)
@@ -36,7 +36,7 @@ def list
xls.add_row( columns.map {|col| pers.send(col) rescue nil } )
end
- send_data(xls.to_s, :type => 'application/vnd.ms-excel',
+ send_data(xls.to_s, :type => 'application/vnd.ms-excel',
:filename => 'list.xls')
else
@people = people.paginate(:page => params[:page])
@@ -67,7 +67,7 @@ def create
end
def show
- return true unless request.post?
+ return true unless request.post?
begin
@person.transaction do
# Split the HABTM-tasks into each of their components, so in
@@ -90,8 +90,8 @@ def show
begin
if desired
- @person.conferences += [conf]
- else
+ @person.conferences += [conf]
+ else
@person.conferences -= [conf]
end
rescue ActiveRecord::RecordNotSaved => err
@@ -105,7 +105,7 @@ def show
if @person == @user and !@person.admin_tasks.include? this_task
flash[:notice] << _('Removing this administrative task from your ' +
'own account is not allowed - Restoring.')
- @person.admin_tasks << this_task
+ @person.admin_tasks << this_task
end
flash[:notice] << _('Person data successfully updated')
@@ -116,7 +116,7 @@ def show
end
def destroy
- if request.post?
+ if request.post?
if @person != @user and @person.destroy
flash[:notice] << _('Successfully removed requested attendee')
else
@@ -141,15 +141,15 @@ def by_task
def mass_mail
@recipients = Person.mailable
return true unless request.post?
- if params[:title].nil? or params[:title].empty? or
+ if params[:title].nil? or params[:title].empty? or
params[:body].nil? or params[:body].empty?
flash[:error] << _('You must specify both email title and body')
return false
end
@recipients.each do |rcpt|
begin
- Notification.deliver_admin_mail(@user, rcpt,
+ Notification.deliver_admin_mail(@user, rcpt,
params[:title], params[:body])
rescue Notification::InvalidEmail
flash[:warning] << _('User %s (ID: %s) is registered with an ' +
@@ -158,7 +158,7 @@ def mass_mail
end
end
- flash[:notice] << _('The %d requested mails have been sent.') %
+ flash[:notice] << _('The %d requested mails have been sent.') %
@recipients.size
redirect_to :action => 'list'
end
@@ -216,7 +216,7 @@ def get_graph
end
warn gruff.labels.to_yaml
- send_data(gruff.to_blob('png'),
+ send_data(gruff.to_blob('png'),
:type => 'image/png',
:disposition => 'inline')
end
Oops, something went wrong.

0 comments on commit aa95b7a

Please sign in to comment.