diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml index 2a5d9ae2a..d0cf2a07a 100644 --- a/app/views/common/_calendar.rhtml +++ b/app/views/common/_calendar.rhtml @@ -1,12 +1,12 @@ -<% 7.times do |i| %><% end %> +<% 7.times do |i| %><% end %> <% day = calendar.startdt while day <= calendar.enddt %> -<%= "" if day.cwday == calendar.first_wday %> +<%= "" if day.cwday == calendar.first_wday %>
<%= day_name( (calendar.first_wday+i)%7 ) %>
<%= day_name( (calendar.first_wday+i)%7 ) %>
#{day.cweek}#{day.cweek}

<%= day.day %>

<% calendar.events_on(day).each do |i| %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 49366cc96..4c4d5f50e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -519,10 +519,11 @@ vertical-align: bottom; /***** Calendar *****/ table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;} -table.cal thead th {width: 14%;} +table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; } +table.cal thead th.week-number {width: auto;} table.cal tbody tr {height: 100px;} -table.cal th { background-color:#EEEEEE; padding: 4px; } table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;} +table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;} table.cal td p.day-num {font-size: 1.1em; text-align:right;} table.cal td.odd p.day-num {color: #bbb;} table.cal td.today {background:#ffffdd;}