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)
+  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,9 +1,17 @@
-- title "Alle Wikiseiten"
+- title "Alle Wikiseiten", false
+
+.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
       %th Titel
-    %th zuletzt aktualisiert
+      %th Zuletzt aktualisiert
     - for page in @pages
       %tr
         %td= link_to page.title, wiki_page_path(page.permalink)

app/views/pages/edit.html.haml

@@ -1,3 +1,14 @@
-- title "#{@page.title} bearbeiten"
+- title "#{@page.title} bearbeiten", false
+
+.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
+
+.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,10 +1,16 @@
 - title @page.title, false
 
-%h1
+.wiki_show
-  %span#breadcrump
+
+  #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 >
+    = @page.title
+
+  %h1
     = @page.title
 
   #sidebar

app/views/pages/version.html.haml

@@ -1,4 +1,16 @@
-- title @page.title 
+- title @page.title, false
+
+.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)
+
+  %h1
+    = @page.title
 
   #sidebar
     %b= "Version vom #{format_datetime @version.updated_at}"

public/stylesheets/main.css

@@ -441,7 +441,6 @@ ul.autocomplete .informal {
   top: -1em;
   left: 5%; }
 
-
 .stats-bar {
   height: 20px;
   min-width: 10px;
@@ -450,6 +449,10 @@ ul.autocomplete .informal {
   text-align: center;
   margin: 0 10px 10px 0; }
 
+.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
+  padding-left: 0;
+  padding-top: 10px; }
+
 a.new_wiki_link {
   color: grey; }
 
@@ -461,15 +464,22 @@ a.new_wiki_link {
   float: right; }
 
 #breadcrump {
-  font-size: 0.5em; }
+  font-size: 0.5em;
+  margin-bottom: 5px;
+  margin-top: 30px;
+  height: 1em;
+  color: #ED0606; }
   #breadcrump a {
-    color: #ed0606; }
+    color: #ed0606;
+    text-decoration: none; }
+  #breadcrump a:hover {
+    text-decoration: underline; }
 
 #sidebar {
   float: right;
   width: 20%; }
   #sidebar #page-versions {
-    margin-top: -4em;
+    margin-top: -60px;
     text-align: right; }
   #sidebar #subpages {
     margin-top: 2em; }

public/stylesheets/print.css

@@ -441,7 +441,6 @@ ul.autocomplete .informal {
   top: -1em;
   left: 5%; }
 
-
 .stats-bar {
   height: 20px;
   min-width: 10px;
@@ -450,6 +449,10 @@ ul.autocomplete .informal {
   text-align: center;
   margin: 0 10px 10px 0; }
 
+.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
+  padding-left: 0;
+  padding-top: 10px; }
+
 a.new_wiki_link {
   color: grey; }
 
@@ -461,15 +464,22 @@ a.new_wiki_link {
   float: right; }
 
 #breadcrump {
-  font-size: 0.5em; }
+  font-size: 0.5em;
+  margin-bottom: 5px;
+  margin-top: 30px;
+  height: 1em;
+  color: #ED0606; }
   #breadcrump a {
-    color: #ed0606; }
+    color: #ed0606;
+    text-decoration: none; }
+  #breadcrump a:hover {
+    text-decoration: underline; }
 
 #sidebar {
   float: right;
   width: 20%; }
   #sidebar #page-versions {
-    margin-top: -4em;
+    margin-top: -60px;
     text-align: right; }
   #sidebar #subpages {
     margin-top: 2em; }

public/stylesheets/sass/main.sass

@@ -488,7 +488,6 @@ ul.autocomplete
   top: -1em
   left: 5%
 
-<<<<<<< HEAD:public/stylesheets/sass/main.sass
 // group stats
 .stats-bar
   height: 20px
@@ -497,8 +496,11 @@ ul.autocomplete
   background-color: #fff
   text-align: center
   margin: 0 10px 10px 0
-=======
 // *** wiki
+.wiki_show, .wiki_version, .wiki_new, .wiki_edit, .wiki_all
+  h1
+    padding-left: 0
+    padding-top: 10px
 a.new_wiki_link
   color: grey
 #preview
@@ -508,13 +510,20 @@ a.new_wiki_link
   float: right
 #breadcrump
   font-size: 0.5em
+  margin-bottom: 5px
+  margin-top: 30px
+  height: 1em
+  color: #ED0606
   a
     :color = !main_red
+    :text-decoration = none
+  a:hover
+    :text-decoration = underline
 #sidebar
   float: right
   width: 20%
   #page-versions
-    margin-top: -4em
+    margin-top: -60px
     text-align: right
   #subpages
     margin-top: 2em
@@ -530,4 +539,3 @@ a.new_wiki_link
   float: right
   table
     border-color: #78b74e
->>>>>>> wiki:public/stylesheets/sass/main.sass