some visual tweaks to calendars

jlapier · Apr 26, 2012 · 16b4bf4 · 16b4bf4
1 parent b2dee5c
commit 16b4bf4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/app/views/event_calendar/events/_calendar.html.erb b/app/views/event_calendar/events/_calendar.html.erb
@@ -4,7 +4,20 @@
 
 <div style="clear:both"></div>
 
-<div id="event_quick_description" class="span-12" style="display:none"></div>
+<div id="event_quick_description" class="span-10">
+  <p style="font-size: 1.2em; color: #999;">
+    <em>mouse over an event for more details</em>
+  </p>
+</div>
+
+<div class="span-6 last">
+  <br/>
+  <h2 style="text-align:center">Event Types</h2>
+  <%= event_type_legend("event_list") %>
+  <%= event_type_legend('event_calendar', 'display: none;') %>
+</div>
+
+<div style="clear:both"></div>
 
 <% content_for :javascript do %>
 <script type="text/javascript">

diff --git a/app/views/event_calendar/events/_details.html.erb b/app/views/event_calendar/events/_details.html.erb
@@ -1,4 +1,4 @@
-<div class="span-12 last">
+<div>
 <p>
   <strong>Topic:</strong> <%= details.topic %>
 </p>
@@ -17,7 +17,7 @@
 # ugly! maybe blocks will help here
 @event = details 
 -%>
-<div class="span-12 last">
+<div>
   <h3>Materials/Resources</h3>
   <%= render :partial => '/event_calendar/links/link', :collection => details.links.all %>
   <%= render :partial => 'file_attachments/file_attachment', :collection => details.file_attachments %>

diff --git a/app/views/event_calendar/events/index.html.erb b/app/views/event_calendar/events/index.html.erb
@@ -21,12 +21,6 @@
   <%= render :partial => 'calendar' %>
 </div>
 
-<div style="float: right;">
-  <h2>Event Types</h2>
-  <%= event_type_legend("event_list") %>
-  <%= event_type_legend('event_calendar', 'display: none;') %>
-</div>
-
 <div id="event_mini_description" style="display:none"></div>
 
 <%= render :partial => 'admin_links' %>
diff --git a/public/images/icons/bullet_arrow_down.png b/public/images/icons/bullet_arrow_down.png
diff --git a/public/images/icons/bullet_arrow_right.png b/public/images/icons/bullet_arrow_right.png
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -307,9 +307,10 @@ a.menu_highlight { background: #333; }
 }
 
 ul.events, ul.events ul { list-style: none; }
-ul.events .closed:before { content: '+ ' }
+ul.events .closed:before { content: url('/images/icons/bullet_arrow_right.png') }
+ul.events .closed { color: #006; }
 ul.events .closed:hover { text-decoration: underline; }
-ul.events .open:before { content: '- ' }
+ul.events .open:before { content: url('/images/icons/bullet_arrow_down.png') }
 .link_url { display:none; }
 
 .asset_list ul {