Cherrypick of sandoz last commit

Conflicts:
	app/views/pages/all.html.haml
	public/stylesheets/main.css
	public/stylesheets/print.css

app/helpers/pages_helper.rb

@@ -13,8 +13,12 @@ module PagesHelper
     WikiCloth.new({:data => body+"\n", :link_handler => Wikilink.new, :params => {:referer => title}}).to_html
   end
 
-  def link_to_wikipage(page)
-    link_to page.title, "/wiki/#{page.title}"
+  def link_to_wikipage(page, text = nil)
+    if text == nil
+      link_to page.title, "/wiki/#{page.title}"
+    else
+      link_to text, "/wiki/#{page.title}"
+    end
   end
 #  def generate_toc(body)
 #    toc = ""

app/views/pages/_form.html.haml

@@ -97,4 +97,4 @@
     |
     = f.submit "Speichern"
     |
-    = link_to "Abbrechen", :back
+    = link_to "Abbrechen", @page

app/views/pages/all.html.haml

@@ -1,10 +1,18 @@
-- title "Alle Wikiseiten"
+- title "Alle Wikiseiten", false
 
-%table
-  %tr
-    %th Titel
-    %th zuletzt aktualisiert
-  - for page in @pages
+.wiki_all
+  #breadcrump
+    = link_to_wikipage(Page.find_by_permalink("Home"), "Foodcoop-Wiki")
+
+  %h1 Alle Wikiseite
+
+  %p= link_to "Neue Seite anlegen", new_page_path
+
+  %table
     %tr
-      %td= link_to page.title, wiki_page_path(page.permalink)
-      %td= format_date page.updated_at
+      %th Titel
+      %th Zuletzt aktualisiert
+    - for page in @pages
+      %tr
+        %td= link_to page.title, wiki_page_path(page.permalink)
+        %td= format_date page.updated_at

app/views/pages/edit.html.haml

@@ -1,3 +1,14 @@
-- title "#{@page.title} bearbeiten"
+- title "#{@page.title} bearbeiten", false
 
-= render :partial => 'form'
+.wiki_edit
+  #breadcrump
+    = link_to_wikipage(Page.find_by_permalink("Home"), "Foodcoop-Wiki")
+    - for page in @page.ancestors.reverse
+      %span.wikiSeparator >
+      = link_to_wikipage(page)
+    %span.wikiSeparator >
+    = link_to_wikipage(@page)
+
+  %h1 #{@page.title} bearbeiten
+
+  = render :partial => 'form'

app/views/pages/new.html.haml

@@ -1,3 +1,16 @@
-- title "Neue Wikiseite anlegen"
+- title "Neue Wikiseite anlegen", false
 
-= render :partial => 'form'
+.wiki_new
+  #breadcrump
+    = link_to_wikipage(Page.find_by_permalink("Home"), "Foodcoop-Wiki")
+    - parent_page = Page.find_by_permalink(params[:parent])
+    - if parent_page != nil
+      - for page in parent_page.ancestors.reverse
+        %span.wikiSeparator >
+        = link_to_wikipage(page)
+    %span.wikiSeparator >
+    = @page.title
+
+  %h1 Neue Wikiseite anlegen
+
+  = render :partial => 'form'

app/views/pages/show.html.haml

@@ -1,36 +1,42 @@
 - title @page.title, false
 
-%h1
-  %span#breadcrump
+.wiki_show
+
+  #breadcrump
+    = link_to_wikipage(Page.find_by_permalink("Home"), "Foodcoop-Wiki")
     - for page in @page.ancestors.reverse
+      %span.wikiSeparator >
       = link_to_wikipage(page)
-      >>
-  = @page.title
+    %span.wikiSeparator >
+    = @page.title
 
-#sidebar
-  #page-versions
-    = link_to "Bearbeiten", edit_page_path(@page)
-    = link_to_function "Versionen (#{@page.versions.count})", "Element.toggle('versions')"
-    #versions{:style => "display:none"}
-      %ul
-        - for version in @page.versions.reverse
-          %li
-            = link_to I18n.l(version.updated_at, :format => "%d.%m.%y %H:%M"), version_page_path(@page, :version => version.lock_version)
-            = "(#{User.find(version.updated_by).nick})"
+  %h1
+    = @page.title
 
-  - unless @page.children.empty?
-    #subpages
-      %h2 Unterseiten
-      %ul
-        - for page in @page.children
-          %li= link_to_wikipage(page)
+  #sidebar
+    #page-versions
+      = link_to "Bearbeiten", edit_page_path(@page)
+      = link_to_function "Versionen (#{@page.versions.count})", "Element.toggle('versions')"
+      #versions{:style => "display:none"}
+        %ul
+          - for version in @page.versions.reverse
+            %li
+              = link_to I18n.l(version.updated_at, :format => "%d.%m.%y %H:%M"), version_page_path(@page, :version => version.lock_version)
+              = "(#{User.find(version.updated_by).nick})"
 
-= render :partial => 'body'
+    - unless @page.children.empty?
+      #subpages
+        %h2 Unterseiten
+        %ul
+          - for page in @page.children
+            %li= link_to_wikipage(page)
 
-%hr.clear/
-%p
-  = link_to "Seite bearbeiten", edit_page_path(@page)
-  |
-  = link_to "Seite löschen", @page, :method => :delete, :confirm => "Achtung, auch alle Unterseiten werden gelöscht. Bist Du sicher?"
-  |
-  = "Zuletzt bearbeitet am #{format_datetime @page.updated_at} (#{@page.user.nick})"
+  = render :partial => 'body'
+
+  %hr.clear/
+  %p
+    = link_to "Seite bearbeiten", edit_page_path(@page)
+    |
+    = link_to "Seite löschen", @page, :method => :delete, :confirm => "Achtung, auch alle Unterseiten werden gelöscht. Bist Du sicher?"
+    |
+    = "Zuletzt bearbeitet am #{format_datetime @page.updated_at} (#{@page.user.nick})"

app/views/pages/version.html.haml

@@ -1,11 +1,23 @@
-- title @page.title 
+- title @page.title, false
 
-#sidebar
-  %b= "Version vom #{format_datetime @version.updated_at}"
-  %ul
-    %li= "Autor: #{User.find(@version.updated_by).nick}"
-    %li= link_to "Aktuelle Version sehen", wiki_page_path(:permalink => @page.permalink)
-    %li= link_to "Auf diese Version zurücksetzen", revert_page_path(@page, :version => @version.lock_version)
+.wiki_version
+  #breadcrump
+    = link_to_wikipage(Page.find_by_permalink("Home"), "Foodcoop-Wiki")
+    - for page in @page.ancestors.reverse
+      %span.wikiSeparator >
+      = link_to_wikipage(page)
+    %span.wikiSeparator >
+    = link_to_wikipage(@page)
 
-= wikified_body @version.body
+  %h1
+    = @page.title
+
+  #sidebar
+    %b= "Version vom #{format_datetime @version.updated_at}"
+    %ul
+      %li= "Autor: #{User.find(@version.updated_by).nick}"
+      %li= link_to "Aktuelle Version sehen", wiki_page_path(:permalink => @page.permalink)
+      %li= link_to "Auf diese Version zurücksetzen", revert_page_path(@page, :version => @version.lock_version)
+
+  = wikified_body @version.body