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

Merge 88dcc6a92f into 9f03531708

Browse source
This commit is contained in:
Stella Rouzi 2014-07-21 13:10:16 +00:00
commit 59ed523e73
6 changed files with 39 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/admin/schedules/show.html.haml → app/views/admin/schedules/edit.html.haml
View file

@ -1,6 +1,7 @@
.schedule-content
%h2
= "Schedule for #{@conference.title}"
= "Edit schedule for #{@conference.title} or go back to"
= link_to 'schedule', conference_schedule_path(@conference.short_title)
#unscheduled.unscheduled
.unscheduled-header
Unscheduled Events
@ -45,4 +46,4 @@
$(this).css("background-color", "#ffffff");
}
});
});
});

4
app/views/layouts/_admin_sidebar.html.haml
View file

@ -32,8 +32,8 @@
= link_to(admin_conference_registrations_path(@conference.short_title)) do
%span.glyphicon.glyphicon-user
Registrations
%li{class: active_nav_li(admin_conference_schedule_path(@conference.short_title))}
= link_to(admin_conference_schedule_path(@conference.short_title), target: '_blank') do
%li{class: active_nav_li(conference_schedule_path(@conference.short_title))}
= link_to(conference_schedule_path(@conference.short_title), target: '_blank') do
%span.glyphicon.glyphicon-calendar
Schedule
%li{class: active_nav_li(admin_conference_campaigns_path(@conference.short_title))}

16
app/views/schedule/index.html.erb
View file

@ -1,5 +1,9 @@
<div id="schedule-content">
<h2> Schedule for <%= @conference.title %></h2>
<h2> Schedule for <%= @conference.title %>
<% if has_role?(current_user, 'Admin')%>
<%= link_to "Edit", edit_admin_conference_schedule_path(@conference.short_title), :class => "btn btn-mini btn-primary pull-right"%>
<% end %>
</h2>
<ul class="nav nav-tabs">
<% @dates.each do |date| %>
<li <%= "class=active" if @dates.first == date %>>
@ -94,18 +98,18 @@
</div>
<%= javascript_tag do %>
jQuery( function($) {
$('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) {
jQuery( function($) {
$('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) {
if(e.which===1)
{
window.location = $(this).attr('data-href');
window.location = $(this).attr('data-href');
}
else if(e.which===2)
{
window.open($(this).attr('data-href'), '_blank');
}
});
});
});
});
$(function() {
// add a hash to the URL when the user clicks on a tab