Changed Ruby syntax in views. Fixed #1326
This commit is contained in:
parent
b0a84ad1c6
commit
1ca448df6f
74 changed files with 371 additions and 376 deletions
|
|
@ -1,6 +1,6 @@
|
|||
%ul.nav.nav-stacked.nav-pills.mySidebar
|
||||
.btn-group
|
||||
%button{type:'button', class:'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
|
||||
%button{type:'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
|
||||
%span.fa.fa-cog
|
||||
= @conference.short_title
|
||||
%span.caret
|
||||
|
|
@ -23,12 +23,12 @@
|
|||
New Conference
|
||||
%hr
|
||||
- if can? :show, @conference
|
||||
%li{:class=> "#{active_nav_li(admin_conference_path(@conference.short_title))} nav-header nav-header-bigger"}
|
||||
%li{class: "#{active_nav_li(admin_conference_path(@conference.short_title))} nav-header nav-header-bigger"}
|
||||
= link_to(admin_conference_path(@conference.short_title)) do
|
||||
%span.fa.fa-tachometer
|
||||
Dashboard
|
||||
- if can? :show, @conference
|
||||
%li{:class=> "#{active_nav_li(edit_admin_conference_path(@conference.short_title))}"}
|
||||
%li{class: "#{active_nav_li(edit_admin_conference_path(@conference.short_title))}"}
|
||||
- if can? :edit, @conference
|
||||
= link_to(edit_admin_conference_path(@conference.short_title)) do
|
||||
%span.fa.fa-home
|
||||
|
|
@ -39,66 +39,66 @@
|
|||
Basics
|
||||
%ul
|
||||
- if can? :update, Contact.new(conference_id: @conference.id)
|
||||
%li{:class=> "#{active_nav_li(edit_admin_conference_contact_path(@conference.short_title))}"}
|
||||
%li{class: "#{active_nav_li(edit_admin_conference_contact_path(@conference.short_title))}"}
|
||||
= link_to 'Contact', edit_admin_conference_contact_path(@conference.short_title)
|
||||
- if can? :index, @conference.commercials.build
|
||||
%li{:class=> "#{active_nav_li(admin_conference_commercials_path(@conference.short_title))}"}
|
||||
%li{class: "#{active_nav_li(admin_conference_commercials_path(@conference.short_title))}"}
|
||||
= link_to 'Commercials', admin_conference_commercials_path(@conference.short_title)
|
||||
- if can? :update, @conference
|
||||
%li{:class=> active_nav_li(edit_admin_conference_splashpage_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(edit_admin_conference_splashpage_path(@conference.short_title))}
|
||||
= link_to 'Splashpage', admin_conference_splashpage_path(@conference.short_title)
|
||||
- if can? :show, Venue.new(conference_id: @conference.id)
|
||||
%li{:class=> "#{active_nav_li(admin_conference_venue_path(@conference.short_title))}"}
|
||||
%li{class: "#{active_nav_li(admin_conference_venue_path(@conference.short_title))}"}
|
||||
= link_to(admin_conference_venue_path(@conference.short_title)) do
|
||||
%span.fa.fa-road
|
||||
Venue
|
||||
%ul
|
||||
- if @conference.venue && @conference.venue.persisted? && (can? :update, @conference.venue.rooms.build)
|
||||
%li{:class=> active_nav_li(admin_conference_venue_rooms_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_venue_rooms_path(@conference.short_title))}
|
||||
= link_to 'Rooms', admin_conference_venue_rooms_path(@conference.short_title)
|
||||
- if can? :update, @conference.lodgings.build
|
||||
%li{ class: active_nav_li(admin_conference_lodgings_path(@conference.short_title)) }
|
||||
= link_to 'Lodgings', admin_conference_lodgings_path(@conference.short_title)
|
||||
- if can? :show, @conference.program
|
||||
%li{:class=> "#{active_nav_li(admin_conference_program_path(@conference.short_title))}"}
|
||||
%li{class: "#{active_nav_li(admin_conference_program_path(@conference.short_title))}"}
|
||||
= link_to admin_conference_program_path(@conference.short_title) do
|
||||
%span.fa.fa-calendar
|
||||
Program
|
||||
- if @conference.program
|
||||
%ul
|
||||
- if can? :update, Cfp.new(program_id: @conference.program.id)
|
||||
%li{:class=> active_nav_li(admin_conference_program_cfp_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_program_cfp_path(@conference.short_title))}
|
||||
= link_to 'Call for Papers', admin_conference_program_cfp_path(@conference.short_title)
|
||||
- if can? :update, @conference.program.events.build
|
||||
%li{:class=> active_nav_li(admin_conference_program_events_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_program_events_path(@conference.short_title))}
|
||||
= link_to 'Events', admin_conference_program_events_path(@conference.short_title)
|
||||
- if can? :update, @conference.program.tracks.build
|
||||
%li{:class=> active_nav_li(admin_conference_program_tracks_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_program_tracks_path(@conference.short_title))}
|
||||
= link_to 'Tracks', admin_conference_program_tracks_path(@conference.short_title)
|
||||
- if can? :update, @conference.program.event_types.build
|
||||
%li{:class=> active_nav_li(admin_conference_program_event_types_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_program_event_types_path(@conference.short_title))}
|
||||
= link_to 'Event Types', admin_conference_program_event_types_path(@conference.short_title)
|
||||
- if can? :update, @conference.program.difficulty_levels.build, conference_id: @conference.id
|
||||
%li{:class=> active_nav_li(admin_conference_program_difficulty_levels_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_program_difficulty_levels_path(@conference.short_title))}
|
||||
= link_to 'Difficulty Levels', admin_conference_program_difficulty_levels_path(@conference.short_title)
|
||||
- if can? :update, @conference.program.schedules.build
|
||||
%li{class: active_nav_li(admin_conference_schedules_path(@conference.short_title))}
|
||||
= link_to 'Schedules', admin_conference_schedules_path(@conference.short_title)
|
||||
- if can? :update, @conference.program.events.build
|
||||
%li{:class=> active_nav_li(reports_admin_conference_program_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(reports_admin_conference_program_path(@conference.short_title))}
|
||||
= link_to 'Reports', reports_admin_conference_program_path(@conference.short_title)
|
||||
|
||||
- if can? :update, Registration.new(conference_id: @conference.id)
|
||||
%li{:class=> active_nav_li(admin_conference_registrations_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_registrations_path(@conference.short_title))}
|
||||
= link_to(admin_conference_registrations_path(@conference.short_title)) do
|
||||
%span.fa.fa-user
|
||||
Registrations
|
||||
%ul
|
||||
- if can? :update, @conference
|
||||
%li{:class=> active_nav_li(admin_conference_registration_period_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_registration_period_path(@conference.short_title))}
|
||||
= link_to 'Registration Period', admin_conference_registration_period_path(@conference.short_title)
|
||||
- if can? :update, Question.new(conference_id: @conference.id)
|
||||
%li{:class=> active_nav_li(admin_conference_questions_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_questions_path(@conference.short_title))}
|
||||
= link_to 'Questions', admin_conference_questions_path(@conference.short_title)
|
||||
|
||||
- if (can? :manage, @conference.sponsorship_levels.build) || (can? :manage, @conference.sponsors.build) || (can? :manage, @conference.tickets.build)
|
||||
|
|
@ -108,13 +108,13 @@
|
|||
Donations
|
||||
%ul
|
||||
- if can? :update, @conference.sponsorship_levels.build
|
||||
%li{:class=> "#{active_nav_li(admin_conference_sponsorship_levels_path(@conference.short_title))}" }
|
||||
%li{class: "#{active_nav_li(admin_conference_sponsorship_levels_path(@conference.short_title))}" }
|
||||
= link_to 'Sponsorship Levels', admin_conference_sponsorship_levels_path(@conference.short_title)
|
||||
- if !@conference.sponsorship_levels.empty? && @conference.sponsorship_levels.first.persisted? && (can? :update, @conference.sponsors.build)
|
||||
%li{:class=> active_nav_li(admin_conference_sponsors_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_sponsors_path(@conference.short_title))}
|
||||
= link_to 'Sponsors', admin_conference_sponsors_path(@conference.short_title)
|
||||
- if can? :update, @conference.tickets.build
|
||||
%li{ class: active_nav_li(admin_conference_tickets_path(@conference.short_title)) }
|
||||
%li{class: active_nav_li(admin_conference_tickets_path(@conference.short_title)) }
|
||||
= link_to 'Tickets', admin_conference_tickets_path(@conference.short_title)
|
||||
|
||||
- if (can? :manage, @conference.targets.build) || (can? :manage, @conference.campaigns.build)
|
||||
|
|
@ -127,15 +127,15 @@
|
|||
%li{class: active_nav_li(admin_conference_campaigns_path(@conference.short_title))}
|
||||
= link_to 'Campaigns', admin_conference_campaigns_path(@conference.short_title)
|
||||
- if can? :update, @conference.targets.build
|
||||
%li{:class=> "#{active_nav_li(admin_conference_targets_path(@conference.short_title))}"}
|
||||
%li{class: "#{active_nav_li(admin_conference_targets_path(@conference.short_title))}"}
|
||||
= link_to 'Goals', admin_conference_targets_path(@conference.short_title)
|
||||
- if can? :update, @conference.email_settings
|
||||
%li{:class=> active_nav_li(admin_conference_emails_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_emails_path(@conference.short_title))}
|
||||
= link_to(admin_conference_emails_path(@conference.short_title)) do
|
||||
%span.fa.fa-envelope
|
||||
E-Mails
|
||||
- if can? :index, Role.new(resource: @conference)
|
||||
%li{:class=> active_nav_li(admin_conference_roles_path(@conference.short_title))}
|
||||
%li{class: active_nav_li(admin_conference_roles_path(@conference.short_title))}
|
||||
= link_to(admin_conference_roles_path(@conference.short_title)) do
|
||||
%span.fa.fa-group
|
||||
Roles
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
- flash.each do |type, message|
|
||||
.row
|
||||
.col-md-12
|
||||
%div{:class=>"alert alert-dismissable #{bootstrap_class_for(type)}", :id=>"flash"}
|
||||
%div{class: "alert alert-dismissable #{bootstrap_class_for(type)}", id: "flash"}
|
||||
.button.close{"data-dismiss" => "alert", "aria-hidden"=>"true"}
|
||||
×
|
||||
%p
|
||||
= message
|
||||
= message
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
.navbar.navbar-default.navbar-fixed-top.nav-osem{:role=>"navigation"}
|
||||
.navbar.navbar-default.navbar-fixed-top.nav-osem{role: 'navigation'}
|
||||
.container
|
||||
.navbar-header
|
||||
%button{"data-target"=>".navbar-collapse", "data-toggle"=>"collapse", :class=>"navbar-toggle", :type=>"button"}
|
||||
%button{"data-target"=>".navbar-collapse", "data-toggle"=>"collapse", class: 'navbar-toggle', type: 'button'}
|
||||
%span.sr-only
|
||||
Toggle navigation
|
||||
%span.icon-bar
|
||||
|
|
@ -16,19 +16,19 @@
|
|||
.btn-group.pull-right
|
||||
%ul.nav.navbar-nav.navbar-right
|
||||
%li.dropdown
|
||||
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "current-user-detail"}
|
||||
%a.dropdown-toggle{"data-toggle" => "dropdown", href: '#', id: "current-user-detail"}
|
||||
- if not current_user.name.blank?
|
||||
#{current_user.name}
|
||||
-else
|
||||
#{current_user.email}
|
||||
= image_tag(current_user.gravatar_url(size: '18'), title: "Yo #{current_user.name}!", :alt => '')
|
||||
= image_tag(current_user.gravatar_url(size: '18'), title: "Yo #{current_user.name}!", alt: '')
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
= render 'layouts/user_menu'
|
||||
- if can? :index, Comment
|
||||
%ul.nav.navbar-nav.navbar-right
|
||||
%li.dropdown
|
||||
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
|
||||
%a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'}
|
||||
- if unread_notifications(current_user)
|
||||
Notifications (#{unread_notifications(current_user).length})
|
||||
%span.fa.fa-comment
|
||||
|
|
@ -44,17 +44,17 @@
|
|||
- else
|
||||
%ul.nav.navbar-nav.navbar-right
|
||||
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
|
||||
%li{:class=> "#{active_nav_li(new_ichain_registration_path('user'))}"}
|
||||
%li{class: "#{active_nav_li(new_ichain_registration_path('user'))}"}
|
||||
= link_to(new_ichain_registration_path('user')) do
|
||||
%span.fa.fa-heart
|
||||
Sign Up
|
||||
- else
|
||||
%li{:class=> "#{active_nav_li(new_registration_path('user'))}"}
|
||||
%li{class: "#{active_nav_li(new_registration_path('user'))}"}
|
||||
= link_to(new_registration_path('user')) do
|
||||
%span.fa.fa-heart
|
||||
Sign Up
|
||||
%li.dropdown.visible-desktop
|
||||
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
|
||||
%a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'}
|
||||
%span.fa.fa-user
|
||||
Sign In
|
||||
%span.caret
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
My Submissions
|
||||
%li
|
||||
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
|
||||
= link_to(destroy_user_ichain_session_path, :method=>'delete') do
|
||||
= link_to(destroy_user_ichain_session_path, method: 'delete') do
|
||||
%span.fa.fa-minus
|
||||
Sign out
|
||||
- else
|
||||
= link_to(destroy_user_session_path, :method=>'delete') do
|
||||
= link_to(destroy_user_session_path, method: 'delete') do
|
||||
%span.fa.fa-minus
|
||||
Sign out
|
||||
- if can? :access, Admin
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
%html{:xmlns => "http://www.w3.org/1999/html"}
|
||||
%html{xmlns: 'http://www.w3.org/1999/html'}
|
||||
%head
|
||||
%meta{:charset => "utf-8"}
|
||||
%meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
|
||||
%meta{charset: 'utf-8'}
|
||||
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
|
||||
%title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM')
|
||||
%meta{:content => "", :name => "description"}
|
||||
%meta{:content => "", :name => "author"}
|
||||
= stylesheet_link_tag "application", :media => "all"
|
||||
%meta{content: '', name: 'description'}
|
||||
%meta{content: '', name: 'author'}
|
||||
= stylesheet_link_tag "application", media: 'all'
|
||||
= javascript_include_tag "application"
|
||||
|
||||
= csrf_meta_tags
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue