gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Restructuring the assets

Browse source 
- Worked on the schedule
- Removed some gems
This commit is contained in:
Matt Barringer 2013-01-11 15:00:54 +01:00
parent a9207671b8
commit b801f0dc19
123 changed files with 13587 additions and 33123 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/views/admin/events/_proposal.html.haml
View file

@ -5,8 +5,10 @@
%i= @event.subtitle
.span2
= link_to "Edit Submission", edit_admin_conference_event_path(@conference.short_title, @event),
:class => "btn btn-mini btn-primary pull-right", :style => "margin-top:20px;"
-#= link_to "Edit Submission", edit_admin_conference_event_path(@conference.short_title, @event),
-# :class => "btn btn-mini btn-primary pull-right", :style => "margin-top:20px;", :onclick => "javascript:alert('Not ready yet');"
= link_to "Edit Submission", "#",
:class => "btn btn-mini btn-primary pull-right", :style => "margin-top:20px;", :onclick => "javascript:alert('Not ready yet');"
.row-fluid
.span12
@ -36,12 +38,38 @@
- if @event.transition_possible? :cancel
%li= link_to "Cancel event", update_state_admin_conference_event_path(@conference.short_title, @event, :transition => :cancel),
:method => :put, :hint => "Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance."
%tr
%td
%b Track
%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
- if !@event.room.nil?
%tr
%td
%b Room
%td
= @event.room.name
- if !@event.start_time.nil?
%tr
%td
%b Scheduled time
%td
= @event.start_time
%tr
%td
%b Submitter
%td
= link_to @event.submitter.public_name, admin_person_path(@conference.short_title, @event.submitter)
= link_to @event.submitter.public_name, admin_person_path(@event.submitter)
(
= link_to @event.submitter.email, "mailto: #{@event.submitter.email}"
)
@ -109,4 +137,4 @@
%br
- @comments.each do |comment|
%div
= raw format_comments(comment)
= raw format_comments(comment)

26
app/views/admin/schedule/_day_tab.html.haml
View file

@ -1,4 +1,22 @@
- @tracks.each do |track|
.schedule-track-column-header
= track.name
.schedule-track-column
.schedule-time-column
.schedule-time-column-header
= Time
- (7..23).each do |hour|
.schedule-time-slot
= "#{hour}:00"
.schedule-time-slot
= "#{hour}:15"
.schedule-time-slot
= "#{hour}:30"
.schedule-time-slot
= "#{hour}:45"
- @rooms.each do |room|
.schedule-room-column{:id => "schedule-room-#{room.guid}", "room-guid" => room.guid}
.schedule-room-column-header
= room.name
- (7..23).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"}

79
app/views/admin/schedule/show.html.haml
View file

@ -1,43 +1,48 @@
.schedule-content
.unscheduled
Unscheduled Events
#test1.schedule-event
Test
#test2.schedule-event
Test2
.schedule
.tabbable
%ul.nav.nav-tabs
%h2
= "Schedule for #{@conference.title}"
#unscheduled.unscheduled
.unscheduled-header
Unscheduled Events
#schedule.schedule
.schedule-dates-header
%ul#date-tabs
- @dates.each do |date|
-if date == @dates.first
%li.active
= link_to "#{date}", "##{date}-content", "data-toggle"=>"tab"
- else
%li
= link_to "#{date}", "##{date}-content", "data-toggle"=>"tab"
.tab-content
- @dates.each do |date|
- if date == @dates.first
.tab-pane.active{:id => "#{date}-content"}
= render 'day_tab'
- else
.tab-pane{:id => "#{date}-content"}
= render 'day_tab'
%li.date-selector
= link_to "#{date}", "#", :id => "#{date}-selector", :onclick => "Schedule.changeDay('#{date}')"
.schedule-rooms-container
= render 'day_tab'
:javascript
$(document).ready( function() {
$('.schedule-track-column').droppable({
accept: '.schedule-event',
drop: function(event, ui) {
var evtName = ui.draggable.text();
var evtDay = $(this).attr('title');
alert('Moved \'' + evtName + '\' to ' + evtDay);
}
});
$('.schedule-event').draggable({
grid: [150,20],
containment: '.schedule-content',
opacity: 0.7,
zIndex: 2
});
//Schedule.loadDaysAndTracks("#{@conference.short_title}");
var conference = "#{@conference.short_title}"
Schedule.loadEvents("#{@conference.short_title}", "#{@dates.first}");
$('.schedule-room-slot').droppable({
accept: '.schedule-event',
tolerance: "pointer",
drop: function(event, ui) {
$(ui.draggable).appendTo(this);
var myId = $(ui.draggable).attr("guid");
var myRoom = $(this).attr("room-guid")
var myDate = $(this).attr("date");
var myTime = $(this).attr("hour");
var length = $(ui.draggable).attr("length");
$(ui.draggable).css("left", 0);
$(ui.draggable).css("top", 0);
$(this).css("background-color", "#ffffff");
// 15 minute slots on the schedule are 30px,
// thus the magic multiplier here
$(ui.draggable).height(length * 2 - 7);
$(ui.draggable).width($(this).width() - 10);
Schedule.save(conference, myId, myRoom, myDate, myTime);
},
over: function(event, ui) {
$(this).css("background-color", "#009ED8");
},
out: function(event, ui) {
$(this).css("background-color", "#ffffff");
}
});
});

2
app/views/admin/tracks/_track_fields.html.erb
View file

@ -1,7 +1,7 @@
<div class="nested-fields">
<%= f.inputs do %>
<%= f.input :name %>
<%= f.input :color, :input_html => {:size => 6} %>
<%= f.input :color, :input_html => {:size => 6, :type => "color"}, :required=> true %>
<%= f.input :description, :input_html => {:rows => 2 } %>
<%= remove_association_link :track, f %>
<% end %>