Update deployed state to what's currently running

12 files changed, 161 insertions, 136 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index b8cd644..95aed48 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -55,6 +55,7 @@ class NodesController < ApplicationController
   
   def show
     node = Node.find(params[:id])
+    node.wipe_draft!
     @page = node.draft || node.head
   end
 
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 232862b..389f6dc 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -3,9 +3,9 @@ module AdminHelper
   def language_selector
     case I18n.locale
     when :de
-      link_to 'English (Aktiv: Deutsch)', url_for(:overwrite_params => {:locale => :en})
+      link_to raw('<span class="inactive">English</span>'), url_for(:overwrite_params => {:locale => :en})
     when :en
-      link_to 'Deutsch (Active: English)', url_for(:overwrite_params => {:locale => :de})
+      link_to raw('<span class="inactive">Deutsch</span>'), url_for(:overwrite_params => {:locale => :de})
     end
   end
 end
diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 7286976..17364f8 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -43,7 +43,7 @@ module ContentHelper
   # Returns the published_at attribute of a page if it is not nil, otherwise
   # it returns the auto-filled value of the created_at attribute
   def date_for_page page
-    page.published_at.to_s(:db) rescue page.created_at.to_s(:db)
+    I18n.l(page.published_at, :format => :ccc) rescue I18n.l(page.created_at, :format => :ccc)
   end
 
   def author_for_page page
@@ -80,10 +80,10 @@ module ContentHelper
     begin
       if content =~ /<aggregate([^<>]*)>/
         tag = $~.to_s
-        matched_data = $1.scan(/\w+\=\"[a-zA-Z\s\/_\d,]*\"/)
+        matched_data = $1.scan(/\w+\=\"[a-zA-Z\s\/_\d,.=]*\"/)
 
         matched_data.each do |data|
-          splitted_data = data.split("=")
+          splitted_data = data.split("=", 2)
           options[splitted_data[0].to_sym] = splitted_data[1].gsub(/\"/, "")
         end
 
diff --git a/app/models/node.rb b/app/models/node.rb
index 6c11fed..75122d1 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -3,11 +3,11 @@ class Node < ActiveRecord::Base
   acts_as_nested_set
 
   # Associations
-  has_many    :pages, :order => "revision ASC"
-  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id
-  belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id
-  has_many    :permissions
-  has_one     :event
+  has_many    :pages, :order => "revision ASC", :dependent => :destroy
+  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id, :dependent => :destroy
+  belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id, :dependent => :destroy
+  has_many    :permissions, :dependent => :destroy
+  has_one     :event, :dependent => :destroy
   belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id
 
   # Callbacks
@@ -60,6 +60,7 @@ class Node < ActiveRecord::Base
   # Instance Methods
 
   def find_or_create_draft current_user
+    self.wipe_draft!
     if draft && self.lock_owner == current_user
       draft
     elsif draft && self.lock_owner.nil?
@@ -115,6 +116,24 @@ class Node < ActiveRecord::Base
     end
   end
 
+  # removes a draft and the lock if it is older than a day and still
+  # identical to head
+  def wipe_draft!
+    unless self.draft
+      self.unlock!
+      return
+    end
+    return unless self.head
+    return unless self.draft.updated_at < 1.day.ago
+    return if Page.find(self.head).has_changes_to? self.draft
+
+    self.draft.destroy
+    self.draft_id = nil
+    self.unlock!
+    self.save!
+    self.reload
+  end
+
   def restore_revision! revision
     if page = self.pages.find_by_revision(revision)
       self.head = page
diff --git a/app/models/page.rb b/app/models/page.rb
index 0cfad53..f804353 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -64,7 +64,7 @@ class Page < ActiveRecord::Base
 
     Page.heads.paginate(
       find_options_for_find_tagged_with(
-        options[:tags].gsub(/\s/, ","), :match_all => true
+        options[:tags].gsub(/\s/, ","), :match_all => true, :conditions => options[:conditions]
       ).merge(
         :page     => page,
         :per_page => options[:limit],
@@ -94,6 +94,19 @@ class Page < ActiveRecord::Base
     end
   end
 
+  # Is used to compare a node's head with the node's draft
+
+  def has_changes_to? draft
+    return true unless node == draft.node
+    return true unless assets == draft.assets
+    return true unless tag_list == draft.tag_list
+    return true unless template_name == draft.template_name
+    return true unless translated_locales.sort_by(&:to_s) == draft.translated_locales.sort_by(&:to_s)
+    changed = false
+    translated_locales.each { |locale| I18n.with_locale(locale) { changed = true unless title == draft.title && abstract == draft.abstract && body == draft.body } }
+    return changed
+  end
+
   # Instance Methods
 
   def public_template_path
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index edad1d6..2741db3 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -1,14 +1,14 @@
 <div id="admin_wizard">
-  <%= link_to 'Create Update or Pressemitteilung', new_node_path, :only_path => false %>
-  <a href="#" id="admin_wizard_my_work" class="admin_wizard_button button">Continue my work</a>
-  <a href="#" id="admin_wizard_create_page" class="admin_wizard_button button">Add a page in the page tree</a>
-  <%= link_to("Upload a new asset", new_asset_path, :only_path => false) %>
+  <div class="admin_wizard_button"><%= link_to 'Create Update or Pressemitteilung', new_node_path, :only_path => false %></div>
+  <div class="admin_wizard_button"><a href="#" id="admin_wizard_my_work" class="button">Continue my work</a></div>
+  <div class="admin_wizard_button"><a href="#" id="admin_wizard_create_page" class="button">Add a page in the page tree</a></div>
+  <div class="admin_wizard_button"><%= link_to("Upload a new asset", new_asset_path, :only_path => false) %></div>
 </div>
 
 <p id="overview_toggle">
   <a href="#" id="recent_changes_toggle" class="button">recent changes</a>
   <a href="#" id="my_work_toggle" class="button">my work</a>
-  <a href="#" id="current_drafts_toggle" class="button">current drafts</a>
+  <a href="#" id="current_drafts_toggle" class="button">current drafts (<%= @drafts_count %>)</a>
   <a href="#" id="admin_sitemap_toggle" class="button">site map</a>
 </p>
 
@@ -39,7 +39,7 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
       </td>
     </tr>
     <% end %>
@@ -73,7 +73,7 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : node.head.revision %>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
       </td>
     </tr>
     <% end %>
@@ -107,7 +107,7 @@
         <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
-        <%= node.draft ? node.draft.revision : ( node.head ? node.head.revision : "EMPTY" ) %>
+        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
       </td>
     </tr>
     <% end %>
@@ -135,7 +135,7 @@
       </td>
       <td class="actions">
         <%= link_to 'create subpage', new_node_path(:parent_id => node.id) %>
-        <%= link_to ':: Revisions',    node_revisions_path(node) %>
+        <%= link_to 'Revisions',      node_revisions_path(node) %>
       </td>
       <td>
         <%= node.lock_owner.login if node.lock_owner %>
diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
index 0220abb..c69911f 100644
--- a/app/views/content/_featured_articles.html.erb
+++ b/app/views/content/_featured_articles.html.erb
@@ -11,7 +11,7 @@
 
   <%= link_to(
         image_tag( 'chaosradio.png' ),
-        "http://chaosradio.ccc.de/",
+        "https://chaosradio.ccc.de/",
         :id => "chaosradio_icon",
         :title => "Chaosradio"
   )%>
@@ -25,14 +25,14 @@
 
   <%= link_to(
         image_tag( 'ds.png' ),
-        "http://ds.ccc.de/",
+        "https://ds.ccc.de/",
         :id => "ds_icon",
         :title => "Datenschleuder"
   )%>
 
   <%= link_to(
         image_tag( 'events.png' ),
-        "http://events.ccc.de/",
+        "https://events.ccc.de/",
         :id => "events_icon",
         :title => "Events Blog"
   )%>
diff --git a/app/views/content/_main_navigation.html.erb b/app/views/content/_main_navigation.html.erb
index a984512..2fe8b77 100644
--- a/app/views/content/_main_navigation.html.erb
+++ b/app/views/content/_main_navigation.html.erb
@@ -3,11 +3,5 @@
     <% menu_items.each do |item| %>
     <li><%= link_to_path item.title, item.path %></li>
     <% end %>
-    <li>
-      <%= language_selector %>
-    </li>
-    <li id="light-mode-li">
-      <input id="light-mode" type="checkbox" /><label for="light-mode">lights on</label>
-    </li>
   </ul>
 </div>
diff --git a/app/views/content/_search.html.erb b/app/views/content/_search.html.erb
index 9f61042..e654462 100644
--- a/app/views/content/_search.html.erb
+++ b/app/views/content/_search.html.erb
@@ -1,8 +1,3 @@
 <% form_tag search_path, :method => 'get' do %>
-<table>
-  <tr>
-    <td><%= text_field_tag :search_term, params[:search_term] %></td>
-    <td style="padding-top: 2px"><%= image_submit_tag("search_button.png") %></td>
-  </tr>
-</table>
-<% end %>
\ No newline at end of file
+  <div><%= text_field_tag :search_term, params[:search_term], :placeholder => 'suchen', :type => 'search' %></div>
+<% end %>
diff --git a/app/views/content/_tags.html.erb b/app/views/content/_tags.html.erb
index d33bc10..fd808b6 100644
--- a/app/views/content/_tags.html.erb
+++ b/app/views/content/_tags.html.erb
@@ -1,3 +1,4 @@
+<% unless @page.tags.empty? %>
 <div id="tags">
   <h2>Tags</h2>
   <ul class="teasertext">
@@ -5,4 +6,5 @@
       <li><%= link_to tag.name, tag_path(:id => tag.name) %></li>
     <% end %>
   </ul>
-</div>
\ No newline at end of file
+</div>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 915091d..d2a624f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,11 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="viewport" content="width=device-width,initial-scale=1"/>
-    <meta name="description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung.">
+    <meta name="description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung."/>
 
     <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" />
     <meta property="og:description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung." />
@@ -19,21 +18,45 @@
 
     <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %>
     <%= auto_discovery_link_tag(:rss,  {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %>
+
+    <script>
+      (function() { document.addEventListener("DOMContentLoaded", function() {
+        if (localStorage.getItem('override-prefers-color-scheme', false))
+          document.getElementById("light-mode").checked = true;
+      }); })();
+    </script>
+
   </head>
 
   <body lang="<%= @page.effective_lang %>">
     <div id="wrapper">
       <div id="header">
-        <%= link_to_path(image_tag("header.png"), "/home") %>
+        <%= image_tag("header.png") %>
+        <!-- <%= link_to_path(image_tag("header.png"), "/home") %> -->
       </div>
-      <div id="search">
-        <%= render :partial => "content/search" %>
+      <div id="toolbox">
+        <div id="search">
+          <%= render :partial => "content/search" %>
+        </div>
+        <div id="light-mode-div">
+          <input id="light-mode" type="checkbox" aria-label="Switch between dark and light mode" /><label for="light-mode"><span class="hide-me">lights</span></label>
+        </div>
+        <div id="burger-div">
+          <input type="checkbox" id="menu-toggle" class="menu-checkbox">
+          <label for="menu-toggle" class="burger-menu"><span></span><span></span><span></span></label>
+        </div>
       </div>
       <div id="left_column">
         <%= main_menu %>
 
         <% if current_user && @page.node %>
-          <%= link_to "Edit", node_path(:id => @page.node) %>
+          <div class="main_navigation">
+            <h2>Admin</h2>
+            <ul>
+              <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'),:controller => :admin, :action => 'index' %></li>
+              <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), node_path(:id => @page.node) %></li>
+            </ul>
+          </div>
         <% end %>
 
         <%= calendar %>
@@ -42,9 +65,11 @@
         <%= yield :layout %>
         <div id="footer">
           <br />
-          <br />
           <p style="text-align: center">
-            <%= link_to t(:sponsors), content_path("sponsors") %>
+            <%= link_to "Impressum", content_path("imprint") %>
+            <%= link_to "Datenschutz", content_path("datenschutz") %>
+            <%= language_selector %>
+            <!-- %= link_to t(:sponsors), content_path("sponsors") % -->
           </p>
         </div>
       </div>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index ee11047..612a3d3 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -11,100 +11,76 @@
   <%= f.error_messages %>
   
   <div id="metadata">
-    <table>
-      <tr>
-        <td class="description">Event</td>
-        <td><%= event_information %></td>
-      </tr>
-      <tr>
-        <td class="description">Slug</td>
-        <td>
-          <%= 
-            f.text_field(
-              :staged_slug, :value => @node.staged_slug || @node.slug
-            ) 
-          %>
-        </td>
-      </tr>
-      <tr>
-        <td class="description">parent</td>
-        <td>
-          <%= text_field_tag :move_to_search_term, @node.parent.title rescue "" %>
-          <div id="search_results">
+    <div class="node_description">Event</div>
+    <div class="node_content"><%= event_information %></div>
 
-          </div>
-          <%= f.hidden_field(
-                :staged_parent_id, 
-                :value => @node.staged_parent_id || @node.parent_id
-              )
-           %>
-        </td>
-      </tr>
+    <div class="node_description">Slug</div>
+    <div class="node_content">
+      <%= f.text_field(
+            :staged_slug, :value => @node.staged_slug || @node.slug
+          ) 
+        %>
+    </div>
+
+    <div class="node_description">parent</div>
+    <div class="node_content">
+      <%= text_field_tag :move_to_search_term, @node.parent.title rescue "" %>
+        <div id="search_results">
+
+        </div>
+        <%= f.hidden_field(
+              :staged_parent_id, 
+              :value => @node.staged_parent_id || @node.parent_id
+            )
+         %>
+    </div>
       
-      <% fields_for @draft do |d| %>
-      <tr>
-        <td class="description">Tags - comma seperated</td>
-        <td><%= text_field_tag :tag_list, @draft.tag_list %></td>
-      </tr>
-      <tr>
-        <td class="description">Publish at</td>
-        <td><%= d.datetime_select :published_at, :value => @draft.published_at %></td>
-      </tr>
-      <tr>
-        <td class="description">Template</td>
-        <td><%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %></td>
-      </tr>
-      <tr>
-        <td class="description">Author</td>
-        <td><%= d.select :user_id, user_list %></td>
-      </tr>
-      <tr>
-        <td class="description">Images</td>
-        <td> 
-          <ul id="image_box" rel="<%= @draft.id %>">
-            <% @draft.assets.images.each do |image| %>
-              <li rel="images_<%= image.id %>">
-                <%= image_tag(image.upload.url(:thumb)) %>
-              </li>
-            <% end %>
-          </ul>
-          <div class="clear_left right">
-            <a id="image_browser_toggle" class="unselected" href="#">image browser</a>
-          </div>
-          <div id="image_browser">
-            <ul>
-              <% Asset.images.each do |image| %>
-              <li rel="images_<%= image.id %>"><%= image_tag(image.upload.url(:thumb)) %></li>
-              <% end %>
-            </ul>
-          </div>
-        </td>
-      </tr>
-    </table>
+    <% fields_for @draft do |d| %>
+    <div class="node_description">Tags - comma seperated</div>
+    <div class="node_content"><%= text_field_tag :tag_list, @draft.tag_list %></div>
+
+    <div class="node_description">Publish at</div>
+    <div class="node_content"><%= d.datetime_select :published_at, :value => @draft.published_at %></div>
+
+    <div class="node_description">Template</div>
+    <div class="node_content"><%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %></div>
+
+    <div class="node_description">Author</div>
+    <div class="node_content"><%= d.select :user_id, user_list %></div>
+
+    <div class="node_description">Images</div>
+    <div class="node_content"> 
+      <ul id="image_box" rel="<%= @draft.id %>">
+        <% @draft.assets.images.each do |image| %>
+          <li rel="images_<%= image.id %>">
+            <%= image_tag(image.upload.url(:thumb)) %>
+          </li>
+        <% end %>
+      </ul>
+      <div class="clear_left right">
+        <a id="image_browser_toggle" class="unselected" href="#">image browser</a>
+      </div>
+      <div id="image_browser">
+        <ul>
+          <% Asset.images.each do |image| %>
+          <li rel="images_<%= image.id %>"><%= image_tag(image.upload.url(:thumb)) %></li>
+          <% end %>
+        </ul>
+      </div>
+    </div>
   </div>
   
-  <table id="content">
-    <tr>
-      <th class="description"></th>
-      <th class="content"></th>
-    </tr>
-    <tr>
-      <td class="description">Title</td>
-      <td><%= d.text_field :title, :pattern => "(?:[^<>&amp;]|&amp;amp;|&amp;lt;|&amp;gt;)*", :title => "Warning: Unescaped HTML entities detected! Use &amp;lt;, &amp;gt;, &amp;amp; instead of <, >, &." %></td>
-    </tr>
-    <tr>
-      <td class="description">Abstract</td>
-      <td><%= d.text_area :abstract %></td>
-    </tr>
-    <tr>
-      <td class="description">Body</td>
-      <td><%= d.text_area :body, :class => 'with_editor' %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td class="right"><%= d.submit 'save' %></td>
-    </tr>
-  </table>
+  <div id="content">
+    <div class="node_description">Title</div>
+    <div class="node_content"><%= d.text_field :title, :pattern => "(?:[^<>&amp;]|&amp;amp;|&amp;lt;|&amp;gt;)*", :title => "Warning: Unescaped HTML entities detected! Use &amp;lt;, &amp;gt;, &amp;amp; instead of <, >, &." %></div>
+
+    <div class="node_description">Abstract</div>
+    <div class="node_content"><%= d.text_area :abstract %></div>
+
+    <div class="node_description">Body</div>
+    <div class="node_content"><%= d.text_area :body, :class => 'with_editor' %></div>
+
+    <div><%= d.submit 'save' %></div>
   <% end %>
 <% end %>
 </div>