diff options
| -rw-r--r-- | app/assets/stylesheets/main/calendar.css.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/time_tables.css.scss | 2 | ||||
| -rw-r--r-- | app/views/time_tables/_show_time_table.html.erb | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/stylesheets/main/calendar.css.scss b/app/assets/stylesheets/main/calendar.css.scss index 9d597c544..b8c04b6f4 100644 --- a/app/assets/stylesheets/main/calendar.css.scss +++ b/app/assets/stylesheets/main/calendar.css.scss @@ -89,16 +89,16 @@ th.monthName { .excluded_date { background-color: $excluded_date_color !important; } -.overlap_date { background-color: $overlap_date_color !important; } +.overlaped_date { background-color: $overlap_date_color !important; } -.specialDay, .selected_period, .selected_date, .overlap_date, .excluded_date { +.specialDay, .selected_period, .selected_date, .overlaped_date, .excluded_date { a, a:visited, a:hover { color: white; text-decoration: none; } } -.specialDay a:hover, selected_period a:hover, selected_date a:hover, excluded_date a:hover, overlap_date a:hover{ +.specialDay a:hover, selected_period a:hover, selected_date a:hover, excluded_date a:hover, overlaped_date a:hover{ color: black; } diff --git a/app/assets/stylesheets/main/time_tables.css.scss b/app/assets/stylesheets/main/time_tables.css.scss index 6e26b6eb4..9161f03ab 100644 --- a/app/assets/stylesheets/main/time_tables.css.scss +++ b/app/assets/stylesheets/main/time_tables.css.scss @@ -24,7 +24,7 @@ .title{ font-weight: bold; } - .excluded_date, .overlap_date, .selected_date, .selected_period{ + .excluded_date, .overlaped_date, .selected_date, .selected_period{ margin-left: 20px; margin-right: 5px; } diff --git a/app/views/time_tables/_show_time_table.html.erb b/app/views/time_tables/_show_time_table.html.erb index e0842d754..a439aed1b 100644 --- a/app/views/time_tables/_show_time_table.html.erb +++ b/app/views/time_tables/_show_time_table.html.erb @@ -22,7 +22,7 @@ <div class="well legend"> <span class="title"><%= t(".legend") %></span> <span class="label excluded_date">X</span><%= t(".excluded_date") %> - <span class="label overlap_date">X</span><%= t(".overlap_date") %> + <span class="label overlaped_date">X</span><%= t(".overlap_date") %> <span class="label selected_date">X</span><%= t(".selected_date") %> <span class="label selected_period">X</span><%= t(".selected_period") %> </div> @@ -73,20 +73,27 @@ </div> + <% if @time_table.periods.present? %> <h3 class="time_table_periods"><%= @time_table.human_attribute_name("periods") %></h3> <div class="periods content"> <%= render "time_tables/periods" %> </div> + <% end %> + <% if @time_table.dates.where("in_out = true").present? %> <h3 class="time_table_dates"><%= @time_table.human_attribute_name("dates") %></h3> <div class="dates content"> <%= render "time_tables/dates" %> </div> + <% end %> + <% if @time_table.dates.where("in_out = false").present? %> <h3 class="time_table_dates"><%= @time_table.human_attribute_name("excluded_dates") %></h3> <div class="excluded_dates content"> <%= render "time_tables/excluded_dates" %> </div> + <% end %> + </div> </div> |