Add type,topic lists to /events sidebar

[Fixes #18106617]
techieshark · May 31, 2012 · c31c76c · c31c76c
1 parent 88a659a
commit c31c76c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/themes/activate/stylesheets/site.css b/themes/activate/stylesheets/site.css
@@ -5729,6 +5729,9 @@ a.topic {
 a.type {
   background-color: #f89406;
 }
+div.types, div.topics {
+  margin-bottom: 9px;
+}
 table {
   border: none;
 }

diff --git a/themes/activate/stylesheets/site.less b/themes/activate/stylesheets/site.less
@@ -82,6 +82,10 @@ a.type {
   .label-warning;
 }
 
+div.types, div.topics {
+  margin-bottom: 9px;
+}
+
 //Table styles
 
 table {

diff --git a/themes/activate/views/events/index.html.erb b/themes/activate/views/events/index.html.erb
@@ -9,7 +9,7 @@
 
 <% content_for :sidebar do %>
   <div id='list_filters' class='box'>
-    
+
     <h3 class='first'>Filter by date</h3>
 
     <%= form_tag events_url, :method => 'get' do  -%>
@@ -29,7 +29,10 @@
       </div>
     </div>
     <% end %>
-
+
+    <%= render 'site/topic_list' %>
+    <%= render 'site/type_list' %>
+
     <h3>Subscribe to</h3>
     <ul>
       <li><%= link_to "iCalendar feed", url_for(:action => "index", :protocol => "webcal", :only_path => false)+".ics" %></li>
@@ -42,7 +45,7 @@
       <li><%= link_to "iCalendar file", events_url(:format => "ics") %></li>
       <li><%= link_to "Google Calendar", "http://www.google.com/calendar/render?cid="+events_url(:format => 'ics') %></li>
     </ul>
-    
+
   </div>
 <% end %>