From bbd8f83b7fda6da867510a71a50314c4555dcb92 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Thu, 5 Mar 2009 21:57:29 +0100
Subject: added begin rescue as too much can go wrong

---
 app/models/page.rb | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'app')

diff --git a/app/models/page.rb b/app/models/page.rb
index a4817a3..709fa4f 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -123,24 +123,28 @@ class Page < ActiveRecord::Base
   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
   
-- 
cgit v1.3


From 0b25143176eaf35b6760a64f673aca38883a350f Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Thu, 5 Mar 2009 22:33:22 +0100
Subject: another option for tinymce

---
 app/views/layouts/admin.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

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>
-- 
cgit v1.3


From 3c65fcee68683f32d44ca9c3cab14d248fadea0c Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Thu, 5 Mar 2009 23:32:14 +0100
Subject: more entities translated, refined xpath selector

---
 app/models/page.rb              | 2 +-
 lib/tasks/development_init.rake | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/page.rb b/app/models/page.rb
index 709fa4f..c2e8176 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -128,7 +128,7 @@ class Page < ActiveRecord::Base
           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://'))]")
+          links = xml_doc.find("//a[not(starts-with(@href, 'http://'))]")
           
           locales = I18n.available_locales.reject {|l| l == :root}
           
diff --git a/lib/tasks/development_init.rake b/lib/tasks/development_init.rake
index d3c8aff..789cdf6 100644
--- a/lib/tasks/development_init.rake
+++ b/lib/tasks/development_init.rake
@@ -62,7 +62,7 @@ namespace :cccms do
   desc "Convert Entities to real charactes"
   task :convert_entities  => :environment do |t|
     Page.all.each do |page|
-      if page.body
+      if page.body && page.body != ""
         puts ">> #{page.id} -- #{page.node.unique_name if page.node}"
         tmp_body = page.body.dup
         tmp_body.gsub!(/&auml;/, "ä")
@@ -74,6 +74,13 @@ namespace :cccms do
         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
-- 
cgit v1.3


From 3d62eef0723e39c8454035dc1e5ed6a214b20e8b Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Fri, 6 Mar 2009 01:02:11 +0100
Subject: now we need that again

---
 app/models/page.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/models/page.rb b/app/models/page.rb
index c2e8176..a27ccfc 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))
-- 
cgit v1.3


From 00fe407be045a5b6cf8269965c0fd35a44094741 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sun, 8 Mar 2009 22:31:00 +0100
Subject: added date selector for published_at. Also removed the part that
 reset the published_at attribute to Time.now. Some cleanups

---
 app/models/node.rb            |  5 +----
 app/models/page.rb            | 25 ++++++-------------------
 app/views/nodes/edit.html.erb |  5 +++++
 3 files changed, 12 insertions(+), 23 deletions(-)

(limited to 'app')

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 a27ccfc..ae2f998 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -19,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
   
@@ -59,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)
@@ -106,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
     
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 929bbf6..d230f5c 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -13,6 +13,11 @@
     <%= 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 %>
-- 
cgit v1.3


From 1236567886d4f81cb6d3d4d8017a543c27a66e12 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sun, 8 Mar 2009 22:47:45 +0100
Subject: enhanced the link_to_path helper and fixed the menu links

---
 app/helpers/link_helper.rb             | 13 ++++++++-----
 app/views/layouts/application.html.erb |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'app')

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/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index be7e044..1446e14 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,19 +25,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>
-- 
cgit v1.3


From 2aab7eaa19dcd2d86012f71954b8543572f8eaa5 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sun, 8 Mar 2009 22:57:29 +0100
Subject: added revision column to nodes overview

---
 app/views/nodes/index.html.erb | 4 ++++
 public/stylesheets/admin.css   | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'app')

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/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;
 }
-- 
cgit v1.3


From e055502fe81469d1f96f41e3dbf70d2ed9ac33fe Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sun, 8 Mar 2009 23:45:52 +0100
Subject: added basic preview feature. If a draft exists, the show action
 renders a proper preview. If not the default show template is rendered.

---
 app/controllers/nodes_controller.rb    | 10 +++++++++-
 app/views/layouts/application.html.erb |  3 ++-
 app/views/nodes/_preview.html.erb      |  5 +++++
 app/views/nodes/show.html.erb          |  6 +++---
 public/stylesheets/styled.css          | 13 +++++++++++++
 5 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 app/views/nodes/_preview.html.erb

(limited to 'app')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 81ead62..f82ab82 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -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/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1446e14..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>
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/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/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;
-- 
cgit v1.3


From af0b1e4b39b9c160747143a830c3884b064edd86 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Sun, 8 Mar 2009 23:58:29 +0100
Subject: added a prompt for the template select

---
 app/views/nodes/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index d230f5c..2dade0f 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -20,7 +20,7 @@
     </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 />
-- 
cgit v1.3


From 55bc7e53f260bda99fd007d3422b264e1f4f6124 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Mon, 9 Mar 2009 00:01:33 +0100
Subject: after creating a node, edit it rather than showing it

---
 app/controllers/nodes_controller.rb      | 2 +-
 test/functional/nodes_controller_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index f82ab82..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
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
-- 
cgit v1.3


From 1ff4ece064039fce78953807583c5b5a1f1022f5 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Mon, 9 Mar 2009 21:56:53 +0100
Subject: only render pages if their published_at date is either nil or set to
 a time < Time.now. The render_page method will render a 404 otherwise.

---
 app/controllers/content_controller.rb | 3 ++-
 app/models/page.rb                    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'app')

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/models/page.rb b/app/models/page.rb
index ae2f998..af820e3 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -109,6 +109,10 @@ 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
-- 
cgit v1.3