First version of the non-js schedule. Removed the assets from version control.

Gemfile

@@ -17,7 +17,7 @@ group :assets do
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # gem 'therubyracer', :platforms => :ruby
 
-#  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier', '>= 1.2.2'
 end
 
 gem 'will_paginate'

Gemfile.lock

@@ -51,6 +51,8 @@ GEM
       railties (~> 3.1)
       warden (~> 1.2.1)
     erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
     formtastic-bootstrap (2.1.1)
@@ -143,6 +145,9 @@ GEM
       polyglot (>= 0.3.1)
     ttfunk (1.0.3)
     tzinfo (0.3.37)
+    uglifier (2.1.1)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
     warden (1.2.1)
       rack (>= 1.0)
     will_paginate (3.0.4)
@@ -169,4 +174,5 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   sqlite3
   transitions
+  uglifier (>= 1.2.2)
   will_paginate

app/assets/stylesheets/osem.css

@@ -151,5 +151,4 @@ div.dataTables_scrollBody tbody tr:first-child td {
 
 div.dataTables_scrollFoot table {
     border-top: none;
-}
-
+}

app/controllers/home_controller.rb

@@ -3,5 +3,4 @@ class HomeController < ApplicationController
     @today = Date.current
     @conferences = Conference.where("start_date >= ?", @today)
   end
-
 end

app/controllers/schedule_controller.rb

@@ -0,0 +1,12 @@
+class ScheduleController < ApplicationController
+
+  layout "application"
+
+  def index
+    @conference = Conference.find_all_by_short_title(params[:conference_id]).first
+    @events = @conference.events
+    @dates = @conference.start_date..@conference.end_date
+    @rooms = @conference.rooms
+    end
+
+end

app/views/home/index.html.haml

@@ -2,38 +2,40 @@
   %h1.center-text{:style => "padding-bottom: 30px"}
     Upcoming Conferences
   - @conferences.each do |conference|
-    - if conference.cfp_open? || conference.registration_open?
-      .well
-        .row-fluid
-          .span3
-            = image_tag conference.logo(:original)
-          .span9
-            %h2.center-text
-              = conference.title
-            %h4.center-text
-              = conference.date_range_string
-            .center-text
-              %i
-                %a= link_to conference.venue.name, conference.venue.website, :target => "_new"
-                ,
-                %a= link_to conference.venue.address, "http://maps.google.com/maps?q=#{conference.venue.address}", :target => "_new"
-        .row-fluid
-          .span12
-            .center-text
-              = simple_format(conference.venue.description)
-        .row-fluid{:style => "padding-top: 30px;"}
-          .span3
-            - if conference.registration_open?
-              - if conference.user_registered?(current_user)
-                = link_to "Modify Registration", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
-
-              - else
-                = link_to "Register", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
+    .well
+      .row-fluid
+        .span3
+          = image_tag conference.logo(:original)
+        .span9
+          %h2.center-text
+            = conference.title
+          %h4.center-text
+            = conference.date_range_string
+          .center-text
+            %i
+              %a= link_to conference.venue.name, conference.venue.website, :target => "_new"
+              ,
+              %a= link_to conference.venue.address, "http://maps.google.com/maps?q=#{conference.venue.address}", :target => "_new"
+      .row-fluid
+        .span12
+          .center-text
+            = simple_format(conference.venue.description)
+      .row-fluid{:style => "padding-top: 30px;"}
+        .span4
+          - if conference.registration_open?
+            - if conference.user_registered?(current_user)
+              = link_to "Modify Registration", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
             - else
-              %b Registration is closed.
-          .span9
-            - if conference.cfp_open?
-              - if !current_user.nil? && current_user.person.proposal_count(conference) > 0
-                = link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"
-              - else
-                = link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"
+              = link_to "Register", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
+          - else
+            %b Registration is closed.
+        .span4
+          = link_to "Schedule", conference_schedule_path(conference.short_title), :class => "btn btn-success btn-large"
+        .span4
+          - if conference.cfp_open?
+            - if !current_user.nil? && current_user.person.proposal_count(conference) > 0
+              = link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"
+            - else
+              = link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"
+          - else
+            %b.pull-right Call for Papers is closed.

app/views/schedule/index.html.erb

@@ -0,0 +1,64 @@
+<div id="schedule-content">
+  <h2> Schedule for <%= @conference.title %></h2>
+  <ul class="nav nav-tabs">
+    <% @dates.each do |date| %>
+      <li <%= "class=active" if @dates.first == date %>>
+        <%= link_to date, "#" + "#{date}", "data-toggle" => "tab" %>
+      </li>
+   <% end %>
+   </ul>
+
+  <div class="tab-content">
+    <% @dates.each do |date| %>
+      <div class="tab-pane <%= 'active' if @dates.first == date %>" id ="<%= date %>" >
+        <table class="table table-striped table-bordered" width="100%">
+          <tr>
+            <th>Time</th>
+            <% @rooms.each do |room| %>
+              <th><%= room.name %></th>
+            <% end %>
+          </tr>
+
+              <% span = {} %>
+              <% @rooms.each do |room| %>
+                <% span[room.id] = 1 %>
+              <% end %>
+
+          <% conf_start = DateTime.parse("#{date} 09:00") %>
+          <% conf_end = DateTime.parse("#{date} 19:00") %>
+
+          <% while conf_start < conf_end %>
+
+            <tr>
+              <td style="width:10%">
+                <%= conf_start.strftime("%H:%M") %>
+              </td>
+
+              <% @rooms.each do |room| %>
+                <% event = @events.find_all{|event|event.start_time and event.start_time.strftime("%Y-%m-%d %H:%M").eql? conf_start.strftime("%Y-%m-%d %H:%M") and event.room_id == room.id } %>
+                <% if !event.empty? %>
+                  <!-- There is an event, calculate the span and show it -->
+                  <% span[room.id] = event[0].event_type.length / 15 %>
+                  <td style="width:45%" rowspan ="<%= span[room.id] %>">
+                    <%= event[0].title %><br>
+                   </td>
+                   <% span[room.id] = span[room.id] + 1 %>
+                  <% end %>
+                  <% if span[room.id] == 1 %>
+                    <!-- span equals 1 show an empty td -->
+                    <td  style="width:45%"class="empty <%= "room" + "#{room.id}" %>">
+                      Empty
+                    </td>
+                  <% end %>
+                  <% if span[room.id] > 1 %>
+                  <!-- span is <%= span[room.id] %> and bigger than 1, substract 1 from span -->
+                    <% span[room.id] = ( span[room.id] - 1 ) if span[room.id] > 1 %>
+                  <% end %>
+               <%end %>
+            </tr>
+            <% conf_start += 15.minutes %>
+          <%end %>
+        </table>
+      </div>
+    <% end %>
+  </div>

config/environments/development.rb

@@ -30,9 +30,8 @@ Osem::Application.configure do
   config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   config.assets.compress = false
-  config.assets.compile = false
+  config.assets.compile = true
 
   # Expands the lines which load the assets
-  config.assets.debug = true
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 end

config/routes.rb

@@ -44,6 +44,9 @@ Osem::Application.routes.draw do
       resources :event_attachment, :controller => "EventAttachments"
       put "/confirm" => "proposal#confirm"
     end
+    resource :schedule, :only => [] do
+      get "/" => "schedule#index"
+    end
     member do
       get "/register" => "ConferenceRegistration#register"
       put "/register" => "ConferenceRegistration#update"

public/assets/manifest.yml

@@ -1,73 +0,0 @@
----
-images/back_disabled.png: images/back_disabled-7a902951219d10f938f642f8dcfbd0b2.png
-images/back_disabled/index.png: images/back_disabled-7a902951219d10f938f642f8dcfbd0b2.png
-images/back_enabled.png: images/back_enabled-6eb9125f3bb6cbca38c2f71664f9e000.png
-images/back_enabled/index.png: images/back_enabled-6eb9125f3bb6cbca38c2f71664f9e000.png
-images/back_enabled_hover.png: images/back_enabled_hover-e11d6a4aa2aa496d78fed7bff91f0391.png
-images/back_enabled_hover/index.png: images/back_enabled_hover-e11d6a4aa2aa496d78fed7bff91f0391.png
-images/forward_disabled.png: images/forward_disabled-10ad4081bf103bebc99f20024705d8cc.png
-images/forward_disabled/index.png: images/forward_disabled-10ad4081bf103bebc99f20024705d8cc.png
-images/forward_enabled.png: images/forward_enabled-952186037fd3150a8c26c63d6821be93.png
-images/forward_enabled/index.png: images/forward_enabled-952186037fd3150a8c26c63d6821be93.png
-images/forward_enabled_hover.png: images/forward_enabled_hover-87cb64d8d30217716f02b8a3b3f8689c.png
-images/forward_enabled_hover/index.png: images/forward_enabled_hover-87cb64d8d30217716f02b8a3b3f8689c.png
-images/sort_asc.png: images/sort_asc-b440c910821de562a607440560813a58.png
-images/sort_asc/index.png: images/sort_asc-b440c910821de562a607440560813a58.png
-images/sort_asc_disabled.png: images/sort_asc_disabled-4c81c1c19c1ef728b804da6f1f4126ec.png
-images/sort_asc_disabled/index.png: images/sort_asc_disabled-4c81c1c19c1ef728b804da6f1f4126ec.png
-images/sort_both.png: images/sort_both-a1388e5946f84e0aa3b42e8e5b9590a3.png
-images/sort_both/index.png: images/sort_both-a1388e5946f84e0aa3b42e8e5b9590a3.png
-images/sort_desc.png: images/sort_desc-76c41b0b01dc2abe9a85bd390d17591a.png
-images/sort_desc/index.png: images/sort_desc-76c41b0b01dc2abe9a85bd390d17591a.png
-images/sort_desc_disabled.png: images/sort_desc_disabled-7c66b34fc55413ed9b80f2a8f53760e4.png
-images/sort_desc_disabled/index.png: images/sort_desc_disabled-7c66b34fc55413ed9b80f2a8f53760e4.png
-images/ui-bg_glass_55_fcf0ba_1x400.png: images/ui-bg_glass_55_fcf0ba_1x400-a4f67bf469297b24eec88f4d112ae41b.png
-images/ui-bg_glass_55_fcf0ba_1x400/index.png: images/ui-bg_glass_55_fcf0ba_1x400-a4f67bf469297b24eec88f4d112ae41b.png
-images/ui-bg_gloss-wave_100_ece8da_500x100.png: images/ui-bg_gloss-wave_100_ece8da_500x100-a8e979ed48b8dca11987e53ab2ea4af3.png
-images/ui-bg_gloss-wave_100_ece8da_500x100/index.png: images/ui-bg_gloss-wave_100_ece8da_500x100-a8e979ed48b8dca11987e53ab2ea4af3.png
-images/ui-bg_highlight-hard_100_f5f3e5_1x100.png: images/ui-bg_highlight-hard_100_f5f3e5_1x100-a78c00206328c2918bc4afc14127c2ca.png
-images/ui-bg_highlight-hard_100_f5f3e5_1x100/index.png: images/ui-bg_highlight-hard_100_f5f3e5_1x100-a78c00206328c2918bc4afc14127c2ca.png
-images/ui-bg_highlight-hard_100_fafaf4_1x100.png: images/ui-bg_highlight-hard_100_fafaf4_1x100-d0247d04766a6885cbd5d9c362d9c2b5.png
-images/ui-bg_highlight-hard_100_fafaf4_1x100/index.png: images/ui-bg_highlight-hard_100_fafaf4_1x100-d0247d04766a6885cbd5d9c362d9c2b5.png
-images/ui-bg_highlight-hard_15_459e00_1x100.png: images/ui-bg_highlight-hard_15_459e00_1x100-6af1e83eb2203de895da80d83a25da44.png
-images/ui-bg_highlight-hard_15_459e00_1x100/index.png: images/ui-bg_highlight-hard_15_459e00_1x100-6af1e83eb2203de895da80d83a25da44.png
-images/ui-bg_highlight-hard_95_cccccc_1x100.png: images/ui-bg_highlight-hard_95_cccccc_1x100-a4b85b21d7efa7357a9ffd2ed5793daf.png
-images/ui-bg_highlight-hard_95_cccccc_1x100/index.png: images/ui-bg_highlight-hard_95_cccccc_1x100-a4b85b21d7efa7357a9ffd2ed5793daf.png
-images/ui-bg_highlight-soft_25_67b021_1x100.png: images/ui-bg_highlight-soft_25_67b021_1x100-222d123a086ded5714ea1ea6fc90336b.png
-images/ui-bg_highlight-soft_25_67b021_1x100/index.png: images/ui-bg_highlight-soft_25_67b021_1x100-222d123a086ded5714ea1ea6fc90336b.png
-images/ui-bg_highlight-soft_95_ffedad_1x100.png: images/ui-bg_highlight-soft_95_ffedad_1x100-b48df7a6ef4088b45e47d8a0d41d95be.png
-images/ui-bg_highlight-soft_95_ffedad_1x100/index.png: images/ui-bg_highlight-soft_95_ffedad_1x100-b48df7a6ef4088b45e47d8a0d41d95be.png
-images/ui-bg_inset-soft_15_2b2922_1x100.png: images/ui-bg_inset-soft_15_2b2922_1x100-9f5631700dd0bd99fb6287498f8d23c6.png
-images/ui-bg_inset-soft_15_2b2922_1x100/index.png: images/ui-bg_inset-soft_15_2b2922_1x100-9f5631700dd0bd99fb6287498f8d23c6.png
-images/ui-icons_808080_256x240.png: images/ui-icons_808080_256x240-a0c69c1f1e3ce6948ad11fa321acf048.png
-images/ui-icons_808080_256x240/index.png: images/ui-icons_808080_256x240-a0c69c1f1e3ce6948ad11fa321acf048.png
-images/ui-icons_847e71_256x240.png: images/ui-icons_847e71_256x240-a22671b3eb8d881817d5cbfa1bab5063.png
-images/ui-icons_847e71_256x240/index.png: images/ui-icons_847e71_256x240-a22671b3eb8d881817d5cbfa1bab5063.png
-images/ui-icons_8DC262_256x240.png: images/ui-icons_8DC262_256x240-8bee7c40b9bae4ba7ce3fd71ba09f887.png
-images/ui-icons_8DC262_256x240/index.png: images/ui-icons_8DC262_256x240-8bee7c40b9bae4ba7ce3fd71ba09f887.png
-images/ui-icons_cd0a0a_256x240.png: images/ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png
-images/ui-icons_cd0a0a_256x240/index.png: images/ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png
-images/ui-icons_eeeeee_256x240.png: images/ui-icons_eeeeee_256x240-c2379642443800302cea31bed13d686b.png
-images/ui-icons_eeeeee_256x240/index.png: images/ui-icons_eeeeee_256x240-c2379642443800302cea31bed13d686b.png
-images/ui-icons_ffffff_256x240.png: images/ui-icons_ffffff_256x240-72e106fbaa40ef9c0f5f4376620a2a14.png
-images/ui-icons_ffffff_256x240/index.png: images/ui-icons_ffffff_256x240-72e106fbaa40ef9c0f5f4376620a2a14.png
-img/glyphicons-halflings-white.png: img/glyphicons-halflings-white-6cccd17a7aed91dbc0157d343c68c0d9.png
-img/glyphicons-halflings-white/index.png: img/glyphicons-halflings-white-6cccd17a7aed91dbc0157d343c68c0d9.png
-img/glyphicons-halflings.png: img/glyphicons-halflings-2851b489e8c39f8fad44fc10efb99c3e.png
-img/glyphicons-halflings/index.png: img/glyphicons-halflings-2851b489e8c39f8fad44fc10efb99c3e.png
-person_large.png: person_large-a1dc981da5d1712bc762f3078f201174.png
-person_large/index.png: person_large-a1dc981da5d1712bc762f3078f201174.png
-person_small.png: person_small-6f00a05842ef93f01e648d1c80c3710f.png
-person_small/index.png: person_small-6f00a05842ef93f01e648d1c80c3710f.png
-person_tiny.png: person_tiny-eb905998ae5686c9eeb2693a7bc0f898.png
-person_tiny/index.png: person_tiny-eb905998ae5686c9eeb2693a7bc0f898.png
-rails.png: rails-a3386665c05a2d82f711a4aaa72d247c.png
-rails/index.png: rails-a3386665c05a2d82f711a4aaa72d247c.png
-application.js: application-de190a7c31ac96412db0e87e58fe3c42.js
-application/index.js: application-de190a7c31ac96412db0e87e58fe3c42.js
-application.css: application-52eec79b5d740b983837d63ecaa1163a.css
-application/index.css: application-52eec79b5d740b983837d63ecaa1163a.css
-loading.gif: loading-b7ff30d20adcf2b850f420d17048930c.gif
-loading/index.gif: loading-b7ff30d20adcf2b850f420d17048930c.gif
-progressbar.gif: progressbar-bc538af0ba6ff3d792217a96651cd58a.gif
-progressbar/index.gif: progressbar-bc538af0ba6ff3d792217a96651cd58a.gif

public/javascripts/schedule/schedule.js

@@ -30,7 +30,7 @@ var scheduleDayEvents = {};
 var Schedule = {
     loadEvents: function(conference_id, start_date) {
         var eventDates = {};
-        var url = '/osem/admin/conference/' + conference_id + '/events';
+        var url = '/admin/conference/' + conference_id + '/events';
         var params = { start: $('#start').text(), end: $('#end').text()};
         var callback = function(data) {
             $.each(data, function(key, val) {
@@ -104,7 +104,7 @@ var Schedule = {
         var e =  $("#" + element);
         var unscheduled = $("#unscheduled");
 
-        var url = '/osem/admin/conference/' + conference_id + '/schedule';
+        var url = '/admin/conference/' + conference_id + '/schedule';
         var params = {
             event: e.attr("guid"),
             room: "none",
@@ -156,7 +156,7 @@ var Schedule = {
         }
     },
     save: function (conference_id, event_id, room_id, date, time) {
-        var url = '/osem/admin/conference/' + conference_id + '/schedule';
+        var url = '/admin/conference/' + conference_id + '/schedule';
         var params = {
             event: event_id,
             room: room_id,