Merge branch 'erdgeist-revive-events'

8 files changed, 149 insertions, 32 deletions

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 08336ef..afed245 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -1,11 +1,7 @@
 module AdminHelper
-
-  def language_selector
-    case I18n.locale
-    when :de
-      link_to raw('<span class="inactive">English</span>'), url_for(params.permit(:locale, :page_path).to_h.merge('locale' => 'en'))
-    when :en
-      link_to raw('<span class="inactive">English</span>'), url_for(params.permit(:locale, :page_path).to_h.merge('locale' => 'de'))
-    end
+  def mtime_busted_path(path)
+    file = Rails.public_path.join(path.sub(%r{\A/}, ""))
+    raise "Static asset not found for cache-busting: #{path} (looked for #{file})" unless File.exist?(file)
+    "#{path}?v=#{File.mtime(file).to_i}"
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 72b76b8..87aa82c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -12,13 +12,7 @@ module ApplicationHelper
     end
   end
 
-  def safe_return_to(url)
-    return events_path if url.blank?
-    uri = URI.parse(url)
-    return events_path if uri.host.present?
-    return events_path unless url.start_with?('/')
-    url
-  rescue URI::InvalidURIError
-    events_path
+  def resolve_kind_text(value)
+    value.respond_to?(:call) ? value.call : value
   end
 end
diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 21cc579..5810966 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -23,6 +23,26 @@ module ContentHelper
     )
   end
 
+  def open_erfas_today
+    occurrences = Occurrence
+      .find_in_range(Time.now.beginning_of_day, Time.now.end_of_day)
+      .joins(event: :tags)
+      .where(tags: { name: 'open-day' })
+      .reject { |o| o.node.nil? || o.node.head.nil? }
+      .sample(3)
+
+    return if occurrences.empty?
+
+    render(
+      :partial => 'content/open_erfas_today',
+      :locals  => { :occurrences => occurrences }
+    )
+  end
+
+  def weekday_abbr(time)
+    RruleHumanizer.wday_abbr(time, I18n.locale)
+  end
+
   def tags
     render :partial => 'content/tags'
   end
@@ -67,11 +87,14 @@ module ContentHelper
   # Syntax of the [aggregate ] short code:
   #
   # [aggregate
-  #   flags="update, pressemitteilung"
+  #   children="all" | children="direct" # optional, at least one of children
+  #   tags="update, pressemitteilung"    # or tags is required
   #   limit="20"
   #   order_by="published_at"
   #   order_direction="DESC"
   # ]
+
+
   def aggregate? content
     options = {}
 
@@ -80,7 +103,7 @@ 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("=", 2)
@@ -88,6 +111,7 @@ module ContentHelper
         end
 
         options[:partial] = select_partial(options[:partial])
+        options[:node] = @page.node if options[:children].present?
 
         sanitize(content.sub(tag, render_collection(options)), :attributes => cccms_attributes)
       else
diff --git a/app/helpers/datetime_helper.rb b/app/helpers/datetime_helper.rb
new file mode 100644
index 0000000..8497b1c
--- /dev/null
+++ b/app/helpers/datetime_helper.rb
@@ -0,0 +1,53 @@
+module DatetimeHelper
+
+  def relative_distance(time, now = Time.current)
+    seconds = (now - time).abs
+
+    case seconds
+    when 0...90
+      [1, :minute]
+    when 90...45.minutes
+      [(seconds / 60).round, :minute]
+    when 45.minutes...24.hours
+      [(seconds / 1.hour).round, :hour]
+    when 24.hours...30.days
+      [(seconds / 1.day).round, :day]
+    when 30.days...365.days
+      [(seconds / 30.days).round, :month]
+    else
+      [(seconds / 365.days).round, :year]
+    end
+  end
+
+  RELATIVE_TIME_UNIT_FORMS = {
+    en: {
+      minute: { one: "minute", other: "minutes" },
+      hour:   { one: "hour",   other: "hours" },
+      day:    { one: "day",    other: "days" },
+      month:  { one: "month",  other: "months" },
+      year:   { one: "year",   other: "years" },
+    },
+    de: {
+      # "other" here is the DATIVE plural needed after "vor" -- not the
+      # nominative plural you'd use standing alone ("3 Tage" vs "vor 3
+      # Tagen"). All five happen to be the nominative plural + "n", since
+      # none of them already end in -n or -s -- a property of these five
+      # specific words, not a rule to extend to new units without checking.
+      minute: { one: "Minute", other: "Minuten" },
+      hour:   { one: "Stunde", other: "Stunden" },
+      day:    { one: "Tag",    other: "Tagen" },
+      month:  { one: "Monat",  other: "Monaten" },
+      year:   { one: "Jahr",   other: "Jahren" },
+    },
+  }.freeze
+
+  def relative_time_phrase(time, now = Time.current)
+    count, unit = relative_distance(time, now)
+    locale = I18n.locale.to_sym
+    forms = RELATIVE_TIME_UNIT_FORMS.fetch(locale, RELATIVE_TIME_UNIT_FORMS[:en])
+    word = forms.fetch(unit).fetch(count == 1 ? :one : :other)
+
+    locale == :de ? "vor #{count} #{word}" : "#{count} #{word} ago"
+  end
+
+end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 8a9a878..5e84f53 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -1,2 +1,13 @@
+require 'cgi'
+
 module EventsHelper
+  # Insert a zero-width break opportunity after each semicolon, so a long
+  # RRULE can wrap at a clause boundary instead of overflowing its column.
+  # Deliberately <wbr>, not ellipsis -- unlike a URL, an RRULE's trailing
+  # characters (BYDAY, BYMONTH, etc.) are usually the most specific part,
+  # and truncating them would hide exactly the wrong end of the string.
+  def rrule_with_break_opportunities(rrule)
+    return "" if rrule.blank?
+    raw(rrule.split(';', -1).map { |part| CGI.escapeHTML(part) }.join(';<wbr>'))
+  end
 end
diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index 878e8e4..9b0b4e1 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -44,7 +44,7 @@ module LinkHelper
       "Last modified #{@page.updated_at.to_fs(:db)}"
     button_to 'Unlock', unlock_node_path(@node),
       method: :put,
-      form: { data: { confirm: message } }
+      form: { data: { confirm: message }, class: 'button_to state_changing' }
   end
 
   def content_path(page_path = nil, options = {})
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index a054a2e..5884c8c 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -12,7 +12,6 @@ module NodesHelper
     end
   end
   
-  
   def truncated_title_for_node node
     if (title = title_for_node node) && title.size > 20
       "<span title='#{title}'>#{truncate(title, 40)}</span>"
@@ -29,19 +28,54 @@ module NodesHelper
     User.all.map {|u| [u.login, u.id]}
   end
 
-  def event_information
-    if @node.event
-      safe_join([
-        "#{@node.event.start_time.to_fs(:db)} - #{@node.event.end_time.to_fs(:db)} > ",
-        link_to('show', event_path(@node.event)),
-        ' ',
-        link_to('edit', edit_event_path(@node.event))
-      ])
+  def node_last_editor(node)
+    editor = node.draft&.editor || node.head&.editor
+    return nil unless editor
+    editor == current_user ? t("editor_self") : editor.login
+  end
+
+  def node_head_editor(node)
+    editor = node.head&.editor
+    return nil unless editor
+    editor == current_user ? t("publisher_self") : editor.login
+  end
+
+  DEFAULT_EVENT_TAG_BY_PAGE_TAG = {
+    'erfa-detail'       => 'open-day',
+    'chaostreff-detail' => 'open-day'
+  }.freeze
+
+  def default_event_tag_mapping(page)
+    page_tags = page.tag_list
+    DEFAULT_EVENT_TAG_BY_PAGE_TAG.find { |page_tag, _| page_tags.include?(page_tag) }
+  end
+
+  def default_event_tag_list(page)
+    default_event_tag_mapping(page)&.last
+  end
+
+  def event_schedule_text(event)
+    if event.rrule.present?
+      recurrence = event.humanize_rrule(I18n.locale)
+      if recurrence
+        time = event.start_time&.strftime("%H:%M")
+        time ? "#{recurrence} #{t(:event_schedule_time, time: time)}" : recurrence
+      else
+        "#{event.rrule} (#{t(:event_schedule_unrecognized)})"
+      end
+    elsif event.start_time
+      I18n.l(event.start_time, format: :long)
     else
-      safe_join([
-        'no event attached > ',
-        link_to('add', new_event_path(:node_id => @node.id))
-      ])
+      t(:event_schedule_none)
     end
   end
+
+  def matching_node_kinds(node)
+    path = node.unique_path
+    CccConventions::NODE_KINDS.select { |_, config| config[:parent_match]&.call(path) }
+  end
+
+  def sitemap_node_open?(node)
+    !CccConventions::SITEMAP_COLLAPSED_PATHS.include?(node.unique_name)
+  end
 end
diff --git a/app/helpers/revisions_helper.rb b/app/helpers/revisions_helper.rb
index fdb51f8..a629013 100644
--- a/app/helpers/revisions_helper.rb
+++ b/app/helpers/revisions_helper.rb
@@ -1,2 +1,7 @@
 module RevisionsHelper
+  # Human-readable label for a diff endpoint -- "head"/"draft"/"autosave"
+  # get their name; anything else is a revision number.
+  def describe_page_reference(ref)
+    %w[head draft autosave].include?(ref.to_s) ? ref.to_s.capitalize : "revision #{ref}"
+  end
 end