Merge branch 'wiki'

Conflicts: app/helpers/pages_helper.rb public/stylesheets/main.css public/stylesheets/print.css
2009-09-28 15:04:07 +02:00 · 2009-09-28 15:04:07 +02:00 · 529956ea5a
commit 529956ea5a
parent 8bba70594d 67661cb716
15 changed files with 381 additions and 180 deletions
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@ -60,6 +60,8 @@ class PagesController < ApplicationController
      render :action => 'edit'
    else
      if @page.save
+        @page.parent_id = parent_id if (!params[:parent_id].blank? \
+            and params[:parent_id] != @page_id)
        flash[:notice] = 'Seite wurde aktualisiert.'
        redirect_to wiki_page_path(@page.permalink)
      else
@ -83,7 +85,7 @@ class PagesController < ApplicationController
  end

  def all
-    @pages = Page.all :order => 'created_at', :conditions => {:redirect => nil}
+    @pages = Page.all :order => 'updated_at DESC', :conditions => {:redirect => nil}
  end

  def version
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -12,6 +12,10 @@ module ApplicationHelper
  def format_datetime(time = Time.now)
    I18n.l(time) unless time.nil?
  end
+
+  def format_datetime_timespec(time, format)
+    I18n.l(time, :format => format) unless (time.nil? or format.nil?)
+  end
  
  # Creates ajax-controlled-links for pagination
  # see also the plugin "will_paginate"
--- a/app/helpers/pages_helper.rb
+++ b/app/helpers/pages_helper.rb
@ -1,14 +1,6 @@
 module PagesHelper
  include WikiCloth

-#  def build_anchors(body)
-#    body.gsub(/(<h\d{1}>(.+)<\/h\d{1}>)/) do
-#      header = $1
-#      token = $2.downcase.gsub(' ', '-')
-#      "<a name='#{token}'> </a>#{header}"
-#    end
-#  end
-
  def wikified_body(body, title = nil)
    WikiCloth.new({:data => body+"\n", :link_handler => Wikilink.new, :params => {:referer => title}}).to_html
  end
@ -36,22 +28,24 @@ module PagesHelper
      end
    end
  end
-#  def generate_toc(body)
-#    toc = ""
-#    body.gsub(/^([=]{1,6})\s*(.*?)\s*(\1)/) do
-#      number = $1.length - 1
-#      name = $2
-#
-#      toc << "#" * number + " #{name}\n"
-#    end
-#    toc = WikiCloth.new({:data => toc, :link_handler => Wikilink.new}).to_html
-#
-#    toc.gsub(/<li>([^<>\n]*)/) do
-#      name = $1
-#      token = name.downcase.gsub(' ', '-')
-#
-#      "<li><a href='##{token}'>#{name}</a>"
-#    end
-#  end

+  def generate_toc(body)
+    toc = String.new
+    body.gsub(/^([=]{1,6})\s*(.*?)\s*(\1)/) do
+      number = $1.length - 1
+      name = $2
+
+      toc << "*" * number + " #{name}\n"
+    end
+    logger.debug toc.inspect
+    unless toc.blank?
+      toc = WikiCloth.new({:data => toc, :link_handler => Wikilink.new}).to_html
+
+      section_count = 0
+      toc.gsub(/<li>([^<>\n]*)/) do
+        section_count += 1
+        "<li><a href='#section-#{section_count}'>#{$1}</a>"
+      end
+    end
+  end
 end
--- a/app/views/finance/balancing/new.html.haml
+++ b/app/views/finance/balancing/new.html.haml
@ -10,7 +10,7 @@
    = render :partial => "summary", :locals => {:order => @order}

 - unless @order.stockit?
-  .left_column{:style => 'width: 24em'}
+  .middle_column{:style => 'width: 24em'}
    .box_title
      %h2 Rechnung
    .column_content#invoice
--- a/app/views/pages/_body.html.haml
+++ b/app/views/pages/_body.html.haml
@ -1,5 +1,9 @@
 - content = wikified_body @page.body, @page.title
-//#toc
-//%h2 Inhaltsverzeichnis
-//= generate_toc @page.body
+- toc = generate_toc @page.body
+- unless toc.blank?
+  #wikitoc
+    %h2 
+      Inhaltsverzeichnis
+      %span= link_to_function "[verstecken]", "Element.toggle('wikitoc-content')"
+    #wikitoc-content= toc
 #wiki_content= content
--- a/app/views/pages/_form.html.haml
+++ b/app/views/pages/_form.html.haml
@ -3,87 +3,85 @@
  #preview= render :partial => 'body'

 #wiki-syntax-help
-  %p
-    .box_title
-      %h2 Schnelle Formatierungshilfe
-    .column_content
-      %table(frame="void")
-        %tbody
-          %tr
-            %td(colspan=2)
-              %b Zeichenformatierung
-          %tr
-            %td
-              %i kursiv
-            %td
-              %pre 
-                ''kursiv''<br />
-          %tr
-            %td
-              %b fett
-            %td
-              %pre '''Fett'''<br />
-          %tr
-            %td
-              Keine Wiki-<br/>Formatierung
-            %td
-              %pre &lt;nowiki&gt;text&lt;/nowiki&gt;
-          %tr
-            %td(colspan=2)
-              %b Block-Formatierung
-          %tr
-            %td
-              Überschriften
-            %td
-              %pre
-                \== Ebene 1 ==
-              %pre
-                \=== Ebene 2 ===
-              %pre
-                \==== Ebene 3 ====
-          %tr
-            %td
-              Listen mit Punkten
-            %td
-              %pre
-                * Erster Punkt
-              %pre
-                ** Zweiter Punkt
-          %tr
-            %td
-              Listen mit Zahlen
-            %td
-              %pre
-                1. Ersten Punkt
-              %pre
-                1. Zweiter Punkt
-          %tr
-            %td(colspan=2)
-              %b Link-Formatierung
-          %tr
-            %td
-              Wiki-Links
-            %td
-              %pre
-                [[Foodsoft Wiki Seite]]
-          %tr
-            %td
-              Externe Links
-            %td
-              %pre
-                [http://addresse.net Externe Seite]
-          %tr
-            %td(colspan=2)
-              %b Tabellenformatierung
-          %tr
-            %td
-              Siehe
-              = link_to "Tabellen", "http://www.mediawiki.org/wiki/Help:Tables", :target => '_blank'
+  .box_title
+    %h2 Schnelle Formatierungshilfe
+  .column_content
+    %table(frame="void")
+      %tbody
+        %tr
+          %td(colspan=2)
+            %b Zeichenformatierung
+        %tr
+          %td
+            %i kursiv
+          %td
+            %pre
+              ''kursiv''<br />
+        %tr
+          %td
+            %b fett
+          %td
+            %pre '''Fett'''<br />
+        %tr
+          %td
+            Keine Wiki-<br/>Formatierung
+          %td
+            %pre &lt;nowiki&gt;text&lt;/nowiki&gt;
+        %tr
+          %td(colspan=2)
+            %b Block-Formatierung
+        %tr
+          %td
+            Überschriften
+          %td
+            %pre
+              \== Ebene 1 ==
+            %pre
+              \=== Ebene 2 ===
+            %pre
+              \==== Ebene 3 ====
+        %tr
+          %td
+            Listen mit Punkten
+          %td
+            %pre
+              * Erster Punkt
+            %pre
+              ** Zweiter Punkt
+        %tr
+          %td
+            Listen mit Zahlen
+          %td
+            %pre
+              \# Ersten Punkt
+            %pre
+              \# Zweiter Punkt
+        %tr
+          %td(colspan=2)
+            %b Link-Formatierung
+        %tr
+          %td
+            Wiki-Links
+          %td
+            %pre
+              [[Foodsoft Wiki Seite]]
+        %tr
+          %td
+            Externe Links
+          %td
+            %pre
+              [http://addresse.net Externe Seite]
+        %tr
+          %td(colspan=2)
+            %b Tabellenformatierung
+        %tr
+          %td
+            Siehe
+            = link_to "Tabellen", "http://www.mediawiki.org/wiki/Help:Tables", :target => '_blank'

 - form_for @page do |f|
  = f.error_messages
  = f.hidden_field :lock_version
-  = f.hidden_field :parent_id
  %p
    %b Titel
    %br/
@ -91,10 +89,14 @@
  %p
    %b Inhalt
    %br/
-    = f.text_area :body, :size => "60x30"
+    = f.text_area :body, :size => "65x30"
  %p
    = f.submit "Vorschau", :name => 'preview'
    |
    = f.submit "Speichern"
    |
-    = link_to "Abbrechen", @page
+    = link_to "Abbrechen", @page
+    | Oberseite ändern:
+    = collection_select(:page, :parent_id, Page.all, :id, :permalink, {:prompt => "Neue Oberseite?"})
+
+%div(style="clear:right; height:1px")
--- a/app/views/pages/all.html.haml
+++ b/app/views/pages/all.html.haml
@ -4,7 +4,7 @@
  #breadcrump
    = link_to_wikipage_by_permalink("Home", "Foodcoop-Wiki")

-  %h1 Alle Wikiseite
+  %h1 Alle Wikiseiten

  %p= link_to "Neue Seite anlegen", new_page_path

@ -15,4 +15,4 @@
    - for page in @pages
      %tr
        %td= link_to page.title, wiki_page_path(page.permalink)
-        %td= format_date page.updated_at
+        %td= format_datetime page.updated_at
--- a/app/views/pages/edit.html.haml
+++ b/app/views/pages/edit.html.haml
@ -11,4 +11,4 @@

  %h1 #{@page.title} bearbeiten

-  = render :partial => 'form'
+  = render :partial => 'form'
--- a/app/views/pages/new.html.haml
+++ b/app/views/pages/new.html.haml
@ -13,4 +13,4 @@

  %h1 Neue Wikiseite anlegen

-  = render :partial => 'form'
+  = render :partial => 'form'
--- a/app/views/pages/show.html.haml
+++ b/app/views/pages/show.html.haml
@ -17,7 +17,12 @@
    #page-versions
      = link_to "Bearbeiten", edit_page_path(@page)
      = link_to_function "Versionen (#{@page.versions.count})", "Element.toggle('versions')"
-      #versions{:style => "display:none"}
+      - unless @page.children.empty?
+        = link_to_function "Unterseiten", "Element.toggle('subpages')"
+    #versions{:style => "display:none"}
+      .box_title
+        %h2 Versionen
+      .column_content
        %ul
          - for version in @page.versions.reverse
            %li
@ -25,11 +30,13 @@
              = "(#{User.find(version.updated_by).nick})"

    - unless @page.children.empty?
-      #subpages
-        %h2 Unterseiten
-        %ul
-          - for page in @page.children
-            %li= link_to_wikipage(page)
+      #subpages{:style => "display:none"}
+        .box_title
+          %h2 Unterseiten
+        .column_content
+          %ul
+            - for page in @page.children
+              %li= link_to_wikipage(page)

  = render :partial => 'body'

@ -38,5 +45,7 @@
    = 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})"
+    | Zuletzt bearbeitet von
+    %b
+      = "#{@page.user.nick}"
+    = "am #{format_datetime @page.updated_at}"
--- a/app/views/pages/version.html.haml
+++ b/app/views/pages/version.html.haml
@ -13,11 +13,15 @@
    = @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)
+    .box_title
+      %h2 Version
+    .column_content
+      %b= "#{format_datetime_timespec(@version.updated_at, "%a, %d.%m.%Y, %H:%M Uhr") }"
+      %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
+  %div(style="clear:right")