Merge branch 'wiki'

app/views/layouts/_main_tabnav.html.erb

@@ -18,6 +18,12 @@
           { :name => "Aufgaben", :url => "/tasks"}
         ]
       },
+      { :name => "Wiki", :url => "/wiki", :active => ["pages", "wiki"],
+        :subnav => [
+          { :name => "Startseite", :url => "/wiki" },
+          { :name => "Alle Seiten", :url => "/pages/all" }
+        ]
+      },
       { :name => "Bestellungen", :url => u.ordergroup ? "/ordering/" : "/orders",
         :active => ["orders", "ordering"],
         :subnav => [

app/views/layouts/application.haml

@@ -30,7 +30,7 @@
         - if flash[:error]
           %h3.error#flashError= flash[:error]
         #loader{:style => "display:none;"}= image_tag("loader.gif", :border => 0)
-        - if yield(:title)
+        - if show_title?
           %h1= yield(:title)
         = yield
     #ajax_box(style="display:none")