- <% 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 -%>
<%= @web.name %>
<%= @title %>
- <% else %>
+ <%- else -%>
<%= @title %>
- <% end %>
+ <%- end %>
<%= render(:file => 'navigation') unless @web.nil? || @hide_navigation %>
diff --git a/app/views/svg_logo.html.erb b/app/views/svg_logo.html.erb
new file mode 100644
index 00000000..9c1dc26b
--- /dev/null
+++ b/app/views/svg_logo.html.erb
@@ -0,0 +1,19 @@
+
diff --git a/public/images/green.png b/public/images/green.png
new file mode 100644
index 00000000..26db21e1
Binary files /dev/null and b/public/images/green.png differ
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index f496801e..b7b4f7a9 100644
--- a/public/stylesheets/instiki.css
+++ b/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;