diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb index 6f781320..cce3fea5 100644 --- a/app/helpers/pages_helper.rb +++ b/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 = "" diff --git a/app/views/pages/_form.html.haml b/app/views/pages/_form.html.haml index 7e996076..c085900c 100644 --- a/app/views/pages/_form.html.haml +++ b/app/views/pages/_form.html.haml @@ -97,4 +97,4 @@ | = f.submit "Speichern" | - = link_to "Abbrechen", :back \ No newline at end of file + = link_to "Abbrechen", @page \ No newline at end of file diff --git a/app/views/pages/all.html.haml b/app/views/pages/all.html.haml index 91515e68..b430f6fa 100644 --- a/app/views/pages/all.html.haml +++ b/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 diff --git a/app/views/pages/edit.html.haml b/app/views/pages/edit.html.haml index 23d473d7..9912ad19 100644 --- a/app/views/pages/edit.html.haml +++ b/app/views/pages/edit.html.haml @@ -1,3 +1,14 @@ -- title "#{@page.title} bearbeiten" +- title "#{@page.title} bearbeiten", false -= render :partial => 'form' \ No newline at end of file +.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' \ No newline at end of file diff --git a/app/views/pages/new.html.haml b/app/views/pages/new.html.haml index a7ac7eae..2c532b9b 100644 --- a/app/views/pages/new.html.haml +++ b/app/views/pages/new.html.haml @@ -1,3 +1,16 @@ -- title "Neue Wikiseite anlegen" +- title "Neue Wikiseite anlegen", false -= render :partial => 'form' \ No newline at end of file +.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' \ No newline at end of file diff --git a/app/views/pages/show.html.haml b/app/views/pages/show.html.haml index 0909a103..064f4fd5 100644 --- a/app/views/pages/show.html.haml +++ b/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})" diff --git a/app/views/pages/version.html.haml b/app/views/pages/version.html.haml index 1b176f89..dcfa477e 100644 --- a/app/views/pages/version.html.haml +++ b/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 diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index d396f77b..3b68b5c1 100644 --- a/public/stylesheets/main.css +++ b/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; } diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index fba1bc27..cffa4aca 100644 --- a/public/stylesheets/print.css +++ b/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; } diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass index 4a120515..11df0bd7 100644 --- a/public/stylesheets/sass/main.sass +++ b/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