Mercurial > hg > soundsoftware-site

diff .svn/pristine/eb/eb34c07a1c8b0e261ba996612b090515510add98.svn-base @ 935:fe0249c097f6 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author Chris Cannam
date Wed, 11 Jul 2012 13:33:14 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/eb/eb34c07a1c8b0e261ba996612b090515510add98.svn-base	Wed Jul 11 13:33:14 2012 +0100
@@ -0,0 +1,8 @@
+<% unless controller_name == 'admin' && action_name == 'index' %>
+  <% content_for :sidebar do %>
+    <h3><%=l(:label_administration)%></h3>
+    <%= render :partial => 'admin/menu' %>
+  <% end %>
+<% end %>
+
+<%= render :file => "layouts/base" %>