Big overhaul patch and style changes

3 files changed, 14 insertions, 8 deletions

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index da8945e..232862b 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', url_for(:overwrite_params => {:locale => :en})
+      link_to 'English (Aktiv: Deutsch)', url_for(:overwrite_params => {:locale => :en})
     when :en
-      link_to 'Deutsch', url_for(:overwrite_params => {:locale => :de})
+      link_to 'Deutsch (Active: English)', url_for(:overwrite_params => {:locale => :de})
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index d6c96f1..7286976 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -9,13 +9,13 @@ module ContentHelper
   end
 
   def calendar
-    occurrences = Occurrence.find_in_range(Time.now, (Time.now+14.days))
+    occurrences = Occurrence.find_in_range(Time.now, (Time.now+6.weeks))
 
     if occurrences.empty?
       occurrences = Occurrence.find_next
     end
 
-    occurrences = occurrences.reject { |o| o.node.head.nil? }
+    occurrences = occurrences.reject { |o| o.node.nil? || o.node.head.nil? }
 
     render(
       :partial  => 'content/front_page_calendar',
@@ -75,6 +75,8 @@ module ContentHelper
   def aggregate? content
     options = {}
 
+    cccms_attributes = ActionView::Base.sanitized_allowed_attributes + [ 'lang' ]
+
     begin
       if content =~ /<aggregate([^<>]*)>/
         tag = $~.to_s
@@ -87,13 +89,13 @@ module ContentHelper
 
         options[:partial] = select_partial( options[:partial] )
 
-        sanitize( content.sub(tag, render_collection(options)) )
+        sanitize( content.sub(tag, render_collection(options)), :attributes => cccms_attributes )
       else
-        sanitize( content )
+        sanitize( content, :attributes => cccms_attributes )
       end
 
     rescue
-      sanitize( content )
+      sanitize( content, :atttributes => cccms_attributes )
     end
   end
 
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index d889719..204ad8a 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -4,6 +4,10 @@ module NodesHelper
     if node.head
       node.head.title
     else
+      if not node.draft or not node.draft.title
+        logger.error "Missing title in node #{node.id}"
+        return "NO TITLE"
+      end
       node.draft.title
     end
   end