Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

app/views/layouts/default.rhtml

@@ -39,14 +39,15 @@
 <div id="Container">
 <div id="Content">
   <h1 id="pageName">
-    <% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %>
+    <%= render(:file => 'svg_logo') %>
+    <%- if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) -%>
       <%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
-    <% elsif @web %>
+    <%- elsif @web -%>
       <span class="webName"><%= @web.name %></span><br />
       <%= @title %>
-    <% else %>
+    <%- else -%>
       <%= @title %>
-    <% end %>
+    <%- end %>
   </h1>
 
 <%= render(:file => 'navigation') unless @web.nil? || @hide_navigation %>

app/views/svg_logo.html.erb

@@ -0,0 +1,19 @@
+<div id="svg_logo"><svg version="1.0" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1.5em" height="1.625em" viewBox="0 0 180 195">
+      <path fill="#<%= @web ? @web.color : "393" %>" stroke="#000" stroke-width="0.4" d="
+        M170.2,59.8l1.4,3.6l0.3,3.7l-0.5,3.5c-0.4,2.9-1.2,4.8-1.2,4.4c-1.4,1.9-1.5,2.2-2.4,3.2c-3,1.5-4.7,4.3-9.2,6.4
+        c-8.9,4.1-24.8,3.2-20.4,15.2c5.2,4.7,15.1,0,23.6,0.8c7.8,0.7,12,3.8,15.6,9.2c3.6,5.3,0.5,9-1.6,12c-10.1,14.8-35.4,5.9-48.4-0.8
+        c-8.3-4.3-14.8-10.4-20.4-13.2c-4.5-2.3-10.2-0.1-11.6,3.2c-0.5,12.9,14.6,10.2,21.6,15.6c0.6,0.2,0.2,0,0.8,0.4
+        c10.4,7.4,21.6,13.2,33.6,19.5c4.8,4.2,7.5,6.2,7.2,12.9c-0.4,8-7.5,10.9-16.4,10c-10.7-1-22.3-9.2-29.6-16.4
+        c-5.4-5.3-12.5-17.9-20.8-9.2c-1.6,5.7,1.7,10.6,4.8,13.6c9,8.5,22.2,13.8,22,31.2c-1.9,7.6-12,7.6-18,3.6
+        c-4.1-2.7-8.5-8.2-11.2-13.2c-3.3-6-5-17.7-12-18c-14-0.7-4.8,27.5-18,30c-8.7,1.6-12.8-8.5-12.4-16c0.7-13.5,12.4-23.9,20.8-30.8
+        c4.5-3.7,12.6-8.1,11.6-16.4c-0.8-6.5-8.4-7.5-13.2-3.2c-4.5,4-8,11.7-11.6,15.6c-6.5,7-16.9,16.1-31.2,14.8
+        c-4.7-0.4-9.1-2.2-11.6-5.6c-1.1-1.6-1.3-2.5-2.1-5.2c1.4-5.6,1.1-4.7,2.5-6.4c5.4-6.7,14.3-3.6,23.2-5.6c5.6-1.3,14.7-8,8.4-14.8
+        c-3.1-3.3-10.3-3.1-16.8-2.4c-12.3,1.2-26.6-3.7-26.8-14.4c-0.3-14.7,19.3-11,27.6-6c9.7,1.4,23.2,4,34.4,6.4
+        c5.5,1.2,16.9,4.4,18-4c1.5-11.4-11.8-7.3-20.8-8c-21.1-1.6-48.7-13.6-48.8-34.4c0-5.4,2.9-10.7,8-11.2
+        C31.3,42.2,33.8,65.2,42.2,67c6.4,1.4,8.9-2.5,8-9.2C49.1,49.2,38.3,40,39.8,24.6c0.5-5.3,3.5-15.3,12.8-13.6
+        c10.1,1.8,11.1,18.2,12.8,28.8c0.4,2.3,2.1,9.5,1.6,9.6c0.9,7.9,0.2,15.2,5.6,18.8c15.1-0.1,4.8-20.8,3.6-29.6
+        C74.1,23,78.1,6.5,86.6,1.4c2.9-1.7,9.2-1.6,12,0.8c1.4,2.9,3.1,4.9,3.6,8c1.7,11.2-8.4,21-2,30.4c8.4,1.8,10.7-6.1,14.4-11.6
+        c4.5-6.6,13.4-15,24.4-12c3.7,3.3,6.4,7.3,5.6,13.2c0,2,0.3,1.5-0.4,4c-3.7,10.1-11.2,15.4-16.4,21.2c-7,4.3-11.4,9.6-20,12.8
+        c-2.7,2.8-6.6,3.9-7.2,8c-0.7,5,2.6,8.3,8,6.8c2.9-0.8,6.4-4.5,10-8c7.9-7.6,21.4-18.5,32.8-21.2c5.7-1.4,12.7-0.3,16.8,2.8
+        C168.2,56.6,170.2,59.8,170.2,59.8"/>
+    </svg></div>

public/stylesheets/instiki.css

@@ -51,7 +51,7 @@ font-size:100%
 
 h1#pageName {
 line-height:1em;
-margin:0.2em 0 0;
+margin:0.2em 0 0.2em 0;
 padding:0;
 }
 
@@ -62,6 +62,11 @@ line-height:1em;
 padding:0;
 }
 
+#svg_logo {
+float:left;
+margin:.5em .25em 0 -.625em;
+}
+
 a.nav,a.nav:link,a.nav:visited {
 background-color:#FFF;
 color:#000;