diff --git a/app.rb b/app.rb index 0e502999d931030c50c871561d7fb082048dbd06..c2602c7685c7129f8840e5df6407b99c31a964a7 100644 --- a/app.rb +++ b/app.rb @@ -29,6 +29,10 @@ DIRECTORY_URL = 'https://directory.unl.edu/' NIS_SS_ID = ServiceSpace.where(:name => 'Innovation Studio').first.id NIS_TOOL_RESOURCE_CLASS_ID = 1 +HALF_HOUR_HEIGHT = 28 # pixel height of half-hour sections in calendar. DO NOT CHANGE RESPONSIVELY +SIX_AM_MINUTES = 360 # start time of calendar +EIGHT_PM_MINUTES = 1200 # end time of calendar + # this gives the user messages def flash(type, header, message) session["notice"] ||= [] diff --git a/views/calendar.erb b/views/calendar.erb index c669623830b151e6ddde776b852c5ff31f03e86c..cc288c2e9a780e20e0cd80ef3fcf1e189f46f9b0 100644 --- a/views/calendar.erb +++ b/views/calendar.erb @@ -1,10 +1,6 @@ <% events_groups = events.group_by do |event| event.start_time.in_time_zone.strftime("%Y/%m/%d") -end - -HALF_HOUR_HEIGHT = 28 # pixel height of half-hour sections in calendar. DO NOT CHANGE RESPONSIVELY -SIX_AM_MINUTES = 360 # start time of calendar -EIGHT_PM_MINUTES = 1200 # end time of calendar +end %> <div id="pagetitle"> diff --git a/views/reserve.erb b/views/reserve.erb index 952c653b987315555cbcc2adc14bbb7a753410ce..c73b10c038f7fedd71dc93999d5ef1c68089dccd 100644 --- a/views/reserve.erb +++ b/views/reserve.erb @@ -12,11 +12,7 @@ unless reservation.nil? end start_hour += 12 if start_hour == 0 start_minute = reservation.start_time.in_time_zone.min -end - -HALF_HOUR_HEIGHT = 28 # pixel height of half-hour sections in calendar. DO NOT CHANGE RESPONSIVELY -SIX_AM_MINUTES = 360 # start time of calendar -EIGHT_PM_MINUTES = 1200 # end time of calendar +end %> <h3 class="dcf-txt-h4"><%= reservation.nil? ? 'Reserve Time for ' : 'Edit Reservation for ' %><%= resource.name %></h3> diff --git a/views/resource_calendar.erb b/views/resource_calendar.erb index c1758b03239c8d4017ab681a8e34545cf073137a..1383c02ab90fd693f90cd73955bb82dbfefd13ef 100644 --- a/views/resource_calendar.erb +++ b/views/resource_calendar.erb @@ -1,10 +1,6 @@ <% reservation_groups = reservations.group_by do |reservation| reservation.start_time.in_time_zone.strftime("%Y/%m/%d") -end - -HALF_HOUR_HEIGHT = 28 # pixel height of half-hour sections in calendar. DO NOT CHANGE RESPONSIVELY -SIX_AM_MINUTES = 360 # start time of calendar -EIGHT_PM_MINUTES = 1200 # end time of calendar +end %> <% if kiosk_mode %>