* Add ID and track to the event overview

* Get rid of the timezones in the schedule, need to deal with that on output
* Skip auth token verfiy on schedule updates
* Make it possible to withdraw confirmed submissions
* Show if people are not registerd
This commit is contained in:
Henne Vogelsang 2013-06-14 13:17:40 +02:00 committed by Henne Vogelsang
parent 2b5e40bc96
commit 73013bd3e6
14 changed files with 96 additions and 48 deletions

View file

@ -7,25 +7,49 @@
.well
%table.table.table-striped.table-bordered.table-hover#events
%thead
%th
%b ID
%th
%b Title
%th
%b Submitter
%th
%b Type
%th
%b Track
%th
%b State
- @events.each do |event|
%tr
%td
=link_to event.title, admin_conference_event_path(@conference.short_title, event)
= event.id
%td
=link_to event.title, admin_conference_event_path(@conference.short_title, event)
- if event.submitter.registrations.count < 1
- bgcolor="#F7819F"
- else
- bgcolor=""
%td{:style=>"background-color: #{bgcolor}"}
- if !event.submitter.nil?
=link_to event.submitter.public_name, admin_person_path(event.submitter)
- if event.submitter.registrations.count < 1
(Unregistered!)
- else
Unknown submitter
%td
= event.event_type.title
%td
.dropdown
= link_to "#", :class => "dropdown-toggle", :id => "track-dropdown" do
- if event.track.nil?
Track
- else
= event.track.name
<b class="caret"></b>
%ul.dropdown-menu
- @tracks.each do |track|
%li= link_to track.name, admin_conference_event_path(@conference.short_title, event, :track_id => track.id) ,
:method => :put, :track_id => track.id
%td
- if event.state == "withdrawn"
Withdrawn

View file

@ -28,8 +28,7 @@
:javascript
$(document).ready(function() {
$('#people').dataTable( {
"bScrollInfinite": true,
"bScrollCollapse": true,
"sScrollY": "200px"
"bPaginate": false,
"bLengthChange": false
} );
} );

View file

@ -1,7 +1,7 @@
.schedule-time-column
.schedule-time-column-header
= Time
- (7..23).each do |hour|
- (9..18).each do |hour|
.schedule-time-slot
= "#{hour}:00"
.schedule-time-slot
@ -15,8 +15,9 @@
.schedule-room-column{:id => "schedule-room-#{room.guid}", "room-guid" => room.guid}
.schedule-room-column-header
= room.name
- (7..23).each do |hour|
= "(#{room.size} people)"
- (9..18).each do |hour|
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-0", "room-guid" => room.guid, "hour" => "#{hour}:00"}
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-15", "room-guid" => room.guid, "hour" => "#{hour}:15"}
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-30", "room-guid" => room.guid, "hour" => "#{hour}:30"}
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-45", "room-guid" => room.guid, "hour" => "#{hour}:45"}
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-45", "room-guid" => room.guid, "hour" => "#{hour}:45"}

View file

@ -8,6 +8,10 @@
.well
%table.table.table-striped.table-bordered.table-hover#users
%thead
%th
%b ID
%th
%b State
%th
%b Email
%th
@ -21,7 +25,15 @@
%th
%th
- @users.each do |user|
- person = Person.find_person_by_user_id(user.id)
%tr
%td
= user.id
%td
- if user.confirmed?
confirmed
- else
unconfirmed
%td
= user.email
%td
@ -63,8 +75,7 @@
:javascript
$(document).ready(function() {
$('#users').dataTable( {
"bScrollInfinite": true,
"bScrollCollapse": true,
"sScrollY": "200px"
"bPaginate": false,
"bLengthChange": false
} );
} );