Merge branch 'master' of ssh://git@svn.medienhaus.udk-berlin.de/usr/local/git/cccms

18 files changed, 249 insertions, 65 deletions

diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index 706cfcd..d548a34 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -10,7 +10,7 @@ class ContentController < ApplicationController
     
     @page = Node.find_page(path)
     
-    if @page
+    if @page and @page.public?
      template = @page.valid_template
 
       render(
@@ -25,4 +25,5 @@ class ContentController < ApplicationController
     end
     
   end
+
 end
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 81ead62..0c961b7 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -32,7 +32,7 @@ class NodesController < ApplicationController
     
     if parent and @node.save
       @node.move_to_child_of parent
-      redirect_to(@node)
+      redirect_to(edit_node_path(@node))
     else
       @node.errors.add("Parent node")
       render :action => :new
@@ -40,7 +40,15 @@ class NodesController < ApplicationController
   end
 
   def show
-    @nodes = Node.find(params[:id]).children
+    @page = Node.find(params[:id]).draft
+    
+    if @page
+     template = @page.valid_template
+     render(
+       :file => template,
+       :layout => "application"
+     )
+    end
   end
 
   def edit
diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index 68586c1..33d8a06 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -1,11 +1,14 @@
 module LinkHelper
   
-  def link_to_path path
-    url_for(
+  def link_to_path title, path
+    params[:locale] ||= I18n.locale
+    
+    link_to( 
+      title,
       :controller => :content,
-      :action     => :render_page,
-      :language   => I18n.locale,
-      :page_path  => path
+      :action => :render_page,
+      :locale => params[:locale],
+      :page_path => path
     )
   end
   
diff --git a/app/models/node.rb b/app/models/node.rb
index 7f2bca6..d2db4ba 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -59,7 +59,6 @@ class Node < ActiveRecord::Base
   def create_new_draft user
     empty_page = self.pages.new
     empty_page.user = user
-    
     empty_page.clone_attributes_from self.head
     
     self.draft = empty_page
@@ -70,11 +69,9 @@ class Node < ActiveRecord::Base
   def publish_draft!
     if self.draft
       self.head = self.draft
+      self.head.save!
       self.draft = nil
       self.save!
-      
-      self.head.published_at = Time.now
-      self.head.save!
     else
       nil
     end
diff --git a/app/models/page.rb b/app/models/page.rb
index a4817a3..af820e3 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,3 +1,5 @@
+require 'xml'
+
 class Page < ActiveRecord::Base
   
   PUBLIC_TEMPLATE_PATH = File.join(%w(custom page_templates public))
@@ -17,7 +19,7 @@ class Page < ActiveRecord::Base
   before_save :rewrite_links_in_body
   
   # Security
-  attr_accessible :title, :abstract, :body, :template_name
+  attr_accessible :title, :abstract, :body, :template_name, :published_at
   
   # Class Methods
   
@@ -57,24 +59,6 @@ class Page < ActiveRecord::Base
   end
   
   # Instance Methods
-  
-  def clone_attributes_from page
-    return nil unless page
-  
-    self.tag_list = page.tag_list.join(", ")
-    
-    locale_before = I18n.locale
-    
-    I18n.available_locales.each do |l|
-      next if l == :root
-      I18n.locale = l
-      self.title    = page.title
-      self.abstract = page.abstract
-      self.body     = page.body
-    end
-  
-    I18n.locale = locale_before
-  end
 
   def public_template_path
     File.join(PUBLIC_TEMPLATE_PATH, template_name)
@@ -104,8 +88,13 @@ class Page < ActiveRecord::Base
   def clone_attributes_from page
     return nil unless page
   
+    # Clone untranslated attributes
+  
     self.tag_list = page.tag_list.join(", ")
     self.template_name = page.template_name
+    self.published_at = page.published_at
+    
+    # Clone translated attributes
     
     locale_before = I18n.locale
     
@@ -120,27 +109,35 @@ class Page < ActiveRecord::Base
     I18n.locale = locale_before
   end
   
+  def public?
+    published_at.nil? ? true : published_at < Time.now 
+  end
+  
   private
     
     def rewrite_links_in_body
-      if self.body
-        tmp_body = "<div>#{self.body}</div>"
-        xml_string = XML::Parser.string( tmp_body )
-        xml_doc = xml_string.parse
-        links = xml_doc.find("a[not(starts-with(@href, 'http://'))]")
-        
-        locales = I18n.available_locales.reject {|l| l == :root}
-        
-        links.each do |link|
-          unless locales.include? link[:href].slice(1,2).to_sym
-            link[:href] = link[:href].sub(/^\//, "/#{I18n.locale}/")
+      begin
+        if self.body
+          tmp_body = "<div>#{self.body}</div>"
+          xml_string = XML::Parser.string( tmp_body )
+          xml_doc = xml_string.parse
+          links = xml_doc.find("//a[not(starts-with(@href, 'http://'))]")
+          
+          locales = I18n.available_locales.reject {|l| l == :root}
+          
+          links.each do |link|
+            unless locales.include? link[:href].slice(1,2).to_sym
+              link[:href] = link[:href].sub(/^\//, "/#{I18n.locale}/")
+            end
           end
+          
+          tmp_body = xml_doc.to_s.gsub(/(\n\<div\>|\<\/div\>\n)/, "")
+          tmp_body.gsub!("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "")
+          
+          self.body = tmp_body
         end
-        
-        tmp_body = xml_doc.to_s.gsub(/(\n\<div\>|\<\/div\>\n)/, "")
-        tmp_body.gsub!("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "")
-        
-        self.body = tmp_body
+      rescue
+        nil
       end
     end
   
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 840c37c..bede781 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -20,7 +20,8 @@
       theme_advanced_buttons2 : "",
       theme_advanced_buttons3 : "",
       extended_valid_elements : "aggregate[tags|limit|order_by|order_direction|partial]",
-      relative_urls : false
+      relative_urls : false,
+      entity_encoding : "raw"
     });
     </script>
   </head>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index be7e044..e6317fd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,10 +12,11 @@
         <![endif]-->
     </head>
     <body>
+        <%= render :partial => 'nodes/preview' if params[:action] == "show" %>
         <div id="logo">
             <a href="index.html" title="Startseite"><img src="/images/chaosknot.gif" alt="Chaosknoten" /></a>
         </div>
-        <!-- HEAD -->
+        <!-- HEAD -->        
         <div id="header">
             <div id="yellow">
             </div>
@@ -25,19 +26,19 @@
             <div id="topnav">
                 <ul id="navlist">
                     <li>
-                        <a href="<%= params[:locale] %>/club">Kennenlernen</a>
+                      <%= link_to_path "Kennenlernen", "club" %>
                     </li>
                     <li>
                         &bull;
                     </li>
                     <li>
-                        <a href="<%= params[:locale] %>/support">Unterstützen</a>
+                      <%= link_to_path "Unterstützen", "support" %>
                     </li>
                     <li>
                         &bull;
                     </li>
                     <li>
-                        <a href="<%= params[:locale] %>/contact">Erreichen</a>
+                      <%= link_to_path "Erreichen", "contact" %>
                     </li>
                     <% if current_user %>
                     <li>
diff --git a/app/views/nodes/_preview.html.erb b/app/views/nodes/_preview.html.erb
new file mode 100644
index 0000000..e8d7b9f
--- /dev/null
+++ b/app/views/nodes/_preview.html.erb
@@ -0,0 +1,5 @@
+<div id="preview_disclaimer">
+  <strong>Preview draft.</strong>
+  Clicking on links will redirected you to the public site.
+  <%= link_to 'Back to admin interface', nodes_path %>
+</div
\ No newline at end of file
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 929bbf6..2dade0f 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -13,9 +13,14 @@
     <%= f.error_messages %>
     
     <% fields_for @draft do |d| %>
+    
+    <p>
+      <%= d.label :published_at %><br />
+      <%= d.datetime_select :published_at %>
+    </p>
     <p>
       <%= d.label :template_name %>
-      <%= d.select :template_name, custom_page_templates %>
+      <%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %>
     </p>
     <p>
       <%= d.label :title %><br />
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 833ffed..a2a42b1 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -11,6 +11,7 @@
       <th class="path">Path</th>
       <th class="actions">Actions</th>
       <th class="editor">Locked by</th>
+      <th class="revision">Rev.</th>
     </tr>
     <% @nodes.each do |node| %>
     <tr class="<%= cycle("even", "odd") %>">
@@ -29,6 +30,9 @@
       <td>
         <%= "#{node.draft.user.login}" if node.draft && node.draft.user %>
       </td>
+      <td>
+        <%= node.head.revision if node.head %>
+      </td>
     </tr>
     <% end %>
   </table>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index dd37c28..67dd7fc 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -1,5 +1,5 @@
 <h1>Node</h1>
 
-<%= @node.unique_name %>
-
-<%= link_to 'Edit', edit_node_path %>
\ No newline at end of file
+There is no draft to preview. Click <%= link_to 'edit', edit_node_path %> to 
+create one or view the currently 
+<%= link_to_path 'published version', @node.unique_path %>. 
\ No newline at end of file
diff --git a/config/environment.rb b/config/environment.rb
index a3fcfa3..20b38b6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -20,12 +20,12 @@ Rails::Initializer.run do |config|
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
   
-  config.gem "rake",           :version => ">= 0.8.3"
-  config.gem "rack",           :version => ">= 0.9.1"
-  config.gem "mongrel",        :version => ">= 1.1.5"
-  config.gem "libxml-ruby",    :lib => 'xml'
-  config.gem "vpim"
-  config.gem "spicycode-rcov", :lib => 'rcov', :souce => "http://gems.github.com"
+  # config.gem "rake",           :version => ">= 0.8.3"
+  # config.gem "rack",           :version => ">= 0.9.1"
+  # config.gem "mongrel",        :version => ">= 1.1.5"
+  # config.gem "libxml-ruby",    :lib => 'xml'
+  # config.gem "vpim"
+  # config.gem "spicycode-rcov", :lib => 'rcov', :souce => "http://gems.github.com"
 
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3ddfada..f6bb1b7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,2 +1,119 @@
+# German translations for Ruby on Rails 
+# by Clemens Kofler (clemens@railway.at)
+
 de:
-  hello: "Hello World"
\ No newline at end of file
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      short: "%e. %b"
+      long: "%e. %B %Y"
+      only_day: "%e"
+
+    day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
+    abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
+    month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
+    abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
+    order: [ :day, :month, :year ]
+  
+  time:
+    formats:
+      default: "%A, %e. %B %Y, %H:%M Uhr"
+      short: "%e. %B, %H:%M Uhr"
+      long: "%A, %e. %B %Y, %H:%M Uhr"
+      time: "%H:%M"
+
+    am: "vormittags"
+    pm: "nachmittags"
+      
+  datetime:
+    distance_in_words:
+      half_a_minute: 'eine halbe Minute'
+      less_than_x_seconds:
+        zero: 'weniger als 1 Sekunde'
+        one: 'weniger als 1 Sekunde'
+        other: 'weniger als {{count}} Sekunden'
+      x_seconds:
+        one: '1 Sekunde'
+        other: '{{count}} Sekunden'
+      less_than_x_minutes:
+        zero: 'weniger als 1 Minute'
+        one: 'weniger als eine Minute'
+        other: 'weniger als {{count}} Minuten'
+      x_minutes:
+        one: '1 Minute'
+        other: '{{count}} Minuten'
+      about_x_hours:
+        one: 'etwa 1 Stunde'
+        other: 'etwa {{count}} Stunden'
+      x_days:
+        one: '1 Tag'
+        other: '{{count}} Tage'
+      about_x_months:
+        one: 'etwa 1 Monat'
+        other: 'etwa {{count}} Monate'
+      x_months:
+        one: '1 Monat'
+        other: '{{count}} Monate'
+      about_x_years:
+        one: 'etwa 1 Jahr'
+        other: 'etwa {{count}} Jahre'
+      over_x_years:
+        one: 'mehr als 1 Jahr'
+        other: 'mehr als {{count}} Jahre'
+      
+  number:
+    format:
+      precision: 2
+      separator: ','
+      delimiter: '.'
+    currency:
+      format:
+        unit: '€'
+        format: '%n%u'
+        separator: 
+        delimiter: 
+        precision: 
+    percentage:
+      format:
+        delimiter: ""
+    precision:
+      format:
+        delimiter: ""
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+
+  support:
+    array:
+      sentence_connector: "und"
+      skip_last_comma: true
+        
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "Konnte dieses {{model}} Objekt nicht speichern: 1 Fehler."
+          other:  "Konnte dieses {{model}} Objekt nicht speichern: {{count}} Fehler."
+        body: "Bitte überprüfen Sie die folgenden Felder:"
+
+      messages:
+        inclusion: "ist kein gültiger Wert"
+        exclusion: "ist nicht verfügbar"
+        invalid: "ist nicht gültig"
+        confirmation: "stimmt nicht mit der Bestätigung überein"
+        accepted: "muss akzeptiert werden"
+        empty: "muss ausgefüllt werden"
+        blank: "muss ausgefüllt werden"
+        too_long: "ist zu lang (nicht mehr als {{count}} Zeichen)"
+        too_short: "ist zu kurz (nicht weniger als {{count}} Zeichen)"
+        wrong_length: "hat die falsche Länge (muss genau {{count}} Zeichen haben)"
+        taken: "ist bereits vergeben"
+        not_a_number: "ist keine Zahl"
+        greater_than: "muss größer als {{count}} sein"
+        greater_than_or_equal_to: "muss größer oder gleich {{count}} sein"
+        equal_to: "muss genau {{count}} sein"
+        less_than: "muss kleiner als {{count}} sein"
+        less_than_or_equal_to: "muss kleiner oder gleich {{count}} sein"
+        odd: "muss ungerade sein"
+        even: "muss gerade sein"
\ No newline at end of file
diff --git a/lib/tasks/development_init.rake b/lib/tasks/development_init.rake
index 22553fc..789cdf6 100644
--- a/lib/tasks/development_init.rake
+++ b/lib/tasks/development_init.rake
@@ -58,4 +58,32 @@ namespace :cccms do
     
     n.publish_draft!
   end
+  
+  desc "Convert Entities to real charactes"
+  task :convert_entities  => :environment do |t|
+    Page.all.each do |page|
+      if page.body && page.body != ""
+        puts ">> #{page.id} -- #{page.node.unique_name if page.node}"
+        tmp_body = page.body.dup
+        tmp_body.gsub!(/&auml;/, "ä")
+        tmp_body.gsub!(/&ouml;/, "ö")
+        tmp_body.gsub!(/&uuml;/, "ü")
+        tmp_body.gsub!(/&Auml;/, "ä")
+        tmp_body.gsub!(/&Ouml;/, "ö")
+        tmp_body.gsub!(/&Uuml;/, "ü")
+        tmp_body.gsub!(/&szlig;/, "ß")
+        tmp_body.gsub!(/&nbsp;/, " ")
+        tmp_body.gsub!(/&ndash;/, "–")
+        tmp_body.gsub!(/&micro;/, "µ")
+        tmp_body.gsub!(/&sup3;/, "³")
+        tmp_body.gsub!(/&eacute;/, "é")
+        tmp_body.gsub!(/&sect;/, "§")
+        tmp_body.gsub!(/&ldquo;/, "“")
+        tmp_body.gsub!(/&rdquo;/, "”")
+        tmp_body.gsub!(/&bdquo;/, "„")
+        page.body = tmp_body
+        page.save
+      end
+    end
+  end
 end
\ No newline at end of file
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 5fe88f1..3e67231 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -22,7 +22,7 @@ th {
 }
 
 th.title {
-  width: 400px;
+  width: 370px;
 }
 
 th.path {
@@ -37,6 +37,10 @@ th.editor {
   width: 120px;
 }
 
+th.revision {
+  width: 30px;
+}
+
 td {
   padding: 3px;
 }
diff --git a/public/stylesheets/styled.css b/public/stylesheets/styled.css
index 707905e..d0312a7 100755
--- a/public/stylesheets/styled.css
+++ b/public/stylesheets/styled.css
@@ -13,6 +13,19 @@
  * #eab407 = Content Headers
  * #fbb03b = Orange, Teaserbar Subheaders
  */
+ 
+body div#preview_disclaimer {
+  font-size: 16px;
+  background-color: #ff0000;
+  color: #ffffff;
+  padding-left: 20px;
+  padding-bottom: 5px;
+}
+
+body div#preview_disclaimer a {
+  color: #ffffff;
+  text-decoration: underline;
+}
 
 #wrapper {
         margin:0;
diff --git a/test/functional/nodes_controller_test.rb b/test/functional/nodes_controller_test.rb
index fdeb6cb..edc49b6 100644
--- a/test/functional/nodes_controller_test.rb
+++ b/test/functional/nodes_controller_test.rb
@@ -19,7 +19,7 @@ class NodesControllerTest < ActionController::TestCase
   def test_create
     login_as :quentin
     post :create, :node => {:slug => 'foobar'}, :parent_id => Node.root.id
-    assert_redirected_to node_path(Node.last)
+    assert_redirected_to edit_node_path(Node.last)
   end
   
   def test_editing_a_node
diff --git a/vendor/rails b/vendor/rails
-Subproject c7b50558a42811f1fa60bb1adb7122f0322bc65
+Subproject bc5c984c3e2dd3ae63cb89216e581a24cd76bd0