refinerycms-dashboard 1.0.11 → 2.0.0

data/app/controllers/refinery/admin/dashboard_controller.rb

@@ -0,0 +1,40 @@
+module Refinery
+  module Admin
+    class DashboardController < Refinery::AdminController
+
+      def index
+        @recent_activity = []
+
+        ::Refinery::Plugins.active.each do |plugin|
+          begin
+            plugin.activity.each do |activity|
+              @recent_activity << activity.klass.where(activity.conditions).
+                                                 order(activity.order).
+                                                 limit(activity.limit)
+            end
+          rescue
+            logger.warn "#{$!.class.name} raised while getting recent activity for dashboard."
+            logger.warn $!.message
+            logger.warn $!.backtrace.collect { |b| " > #{b}" }.join("\n")
+          end
+        end
+
+        @recent_activity = @recent_activity.flatten.compact.sort { |x,y|
+          y.updated_at <=> x.updated_at
+        }.first(Refinery::Dashboard.activity_show_limit)
+
+        @recent_inquiries = if Refinery::Plugins.active.find_by_name("refinery_inquiries")
+          Inquiry.latest(Refinery::Dashboard.activity_show_limit)
+        else
+          []
+        end
+      end
+
+      def disable_upgrade_message
+        Refinery::Core.show_internet_explorer_upgrade_message = false
+        render :nothing => true
+      end
+
+    end
+  end
+end

data/app/helpers/refinery/admin/dashboard_helper.rb

@@ -0,0 +1,25 @@
+module Refinery
+  module Admin
+    module DashboardHelper
+
+      def activity_message_for(record)
+        if (plugin = Refinery::Plugins.active.find_by_model(record.class)) &&
+           (activity = plugin.activity_by_class_name(record.class.name).first)
+          # work out which action occured
+          action = record.updated_at.eql?(record.created_at) ? 'created' : 'updated'
+
+          # get article to define gender of model name, some languages require this for proper grammar
+          article = t('article', :scope => "refinery.plugins.#{plugin.name}.", :default => 'the')
+
+          # now create a link to the notification's corresponding record.
+          link_to t('.latest_activity_message',
+                    :what => record.send(activity.title),
+                    :kind => record.class.model_name.human,
+                    :action => t("with_article \"#{article}\"", :scope => "refinery.#{action}")
+                   ).downcase.capitalize, eval("#{activity.url}(#{activity.nesting("record")}record)")
+        end
+      end
+
+    end
+  end
+end

data/app/views/{admin → refinery/admin}/dashboard/_actions.html.erb

@@ -1,47 +1,47 @@
 <ul>
-  <% if Refinery::Plugins.active.names.include?("refinery_pages") %>
+  <% if ::Refinery::Plugins.active.names.include?("refinery_pages") %>
     <li>
       <%= link_to t('.add_a_new_page'),
-                  new_admin_page_path,
+                  refinery.new_admin_page_path,
                   :class => "add_icon" %>
     </li>
     <li>
       <%= link_to t('.update_a_page'),
-                  admin_pages_path,
+                  refinery.admin_pages_path,
                   :class => "edit_icon" %>
     </li>
   <% end %>
-  <% if Refinery::Plugins.active.names.include?("refinery_files") %>
+  <% if ::Refinery::Plugins.active.names.include?("refinery_files") %>
     <li>
       <%= link_to t('.upload_a_file'),
-                  new_admin_resource_path(:dialog => true,
+                  refinery.new_admin_resource_path(:dialog => true,
                                          :width => 600,
                                          :height => 300),
                   :class => "add_icon" %>
     </li>
   <% end %>
-  <% if Refinery::Plugins.active.names.include?("refinery_images") %>
+  <% if ::Refinery::Plugins.active.names.include?("refinery_images") %>
     <li>
       <%= link_to t('.upload_a_image'),
-                  new_admin_image_path(:dialog => true,
+                  refinery.new_admin_image_path(:dialog => true,
                                       :width => 600,
                                       :height => 300),
                   :class => "add_icon" %>
     </li>
   <% end %>
-  <%= render :partial => 'additional_dashboard_menu_items' %>
+  <%= render 'additional_dashboard_menu_items' %>
 </ul>
 
 <% if ::Refinery.i18n_enabled? %>
-  <% locales = ::Refinery::I18n.locales.clone %>
+  <% locales = Refinery::I18n.locales.clone %>
   <% current_locale = ::I18n.locale %>
   <% current_locale_title = locales.delete(current_locale) %>
   <ul id='current_locale'>
     <li>
-      <%= link_to "#", :style => "background-image: url('/images/refinery/icons/flags/#{current_locale}.png');" do %>
+      <%= link_to "#", :style => "background-image: url('#{asset_path "refinery/icons/flags/#{current_locale}.png"}');" do %>
         <%= current_locale_title.respond_to?(:force_encoding) ? current_locale_title.force_encoding('utf-8') : current_locale_title %>
         <span><%= t('.change_language') %></span>
-        <span style='display:none;'><%= t('cancel', :scope => 'shared.admin.form_actions') %></span>
+        <span style='display:none;'><%= t('cancel', :scope => 'refinery.admin.form_actions') %></span>
       <% end %>
     </li>
   </ul>
@@ -49,8 +49,8 @@
     <% locales.sort_by{|key, value| value}.each do |locale, locale_title| %>
       <li>
         <%= link_to locale_title.respond_to?(:force_encoding) ? locale_title.force_encoding('utf-8') : locale_title,
-                    params.dup.tap { |p| p[:set_locale] = locale },
-                    :style => "background-image: url('/images/refinery/icons/flags/#{locale}.png');" %>
+                    refinery.admin_dashboard_path(:set_locale => locale),
+                    :style => "background-image: url('#{asset_path "refinery/icons/flags/#{locale}.png"}');" %>
       </li>
     <% end %>
   </ul>

data/app/views/{admin → refinery/admin}/dashboard/_recent_activity.html.erb

@@ -1,6 +1,8 @@
 <div id='recent_activity'>
   <h2><%= t('.latest_activity') %></h2>
-  <% if (activity = @recent_activity.collect{|a| activity_message_for(a) rescue ''}.reject(&:blank?)).present? %>
+  <% if (activity = @recent_activity.collect { |a|
+          activity_message_for(a)
+        }.reject(&:blank?)).present? %>
     <ul class='clickable'>
     <% activity.each do |message| %>
        <li class='<%= cycle("on", "on-hover", :name => 'recent_activity_cycle') %>'>

data/app/views/{admin → refinery/admin}/dashboard/_recent_inquiries.html.erb

@@ -4,7 +4,7 @@
     <% @recent_inquiries.each do |inquiry| %>
       <li class='<%= cycle("on", "on-hover", :name => 'recent_inquiries_cycle') %>'>
         <%= link_to truncate("#{inquiry.name} - #{inquiry.message}", :length => 100),
-                    admin_inquiry_url(inquiry) %>
+                    refinery.admin_inquiry_path(inquiry) %>
       </li>
     <% end %>
   </ul>

data/app/views/refinery/admin/dashboard/_records.html.erb

@@ -0,0 +1,2 @@
+<%= render 'recent_activity' if @recent_activity.present? %>
+<%= render 'recent_inquiries' if @recent_inquiries.present? %>

data/app/views/{admin → refinery/admin}/dashboard/index.html.erb

@@ -1,13 +1,13 @@
 <div class='clearfix'>
   <section id='records' class='clearfix<%= ' one_list' if @recent_activity.empty? or @recent_inquiries.empty? %>'>
-    <%= render :partial => 'records' %>
+    <%= render 'records' %>
   </section>
   <aside id='actions'>
     <h2><%= t('.quick_tasks') %></h2>
-    <%= render :partial => 'actions' %>
+    <%= render 'actions' %>
   </aside>
 </div>
 <% if request.env["HTTP_USER_AGENT"] =~ /MSIE/ and
-        RefinerySetting.find_or_set(:show_internet_explorer_upgrade_message, true, :scoping => 'refinery') %>
-  <% flash.now[:message] = render(:partial => "/shared/ie6check")  %>
+        Refinery::Core.show_internet_explorer_upgrade_message %>
+  <% flash.now[:message] = render(:partial => "/refinery/ie6check")  %>
 <% end %>

data/app/views/{admin → refinery/admin}/dashboard/index.rss.builder

@@ -3,14 +3,14 @@ xml.rss :version => "2.0", "xmlns:atom" => "http://www.w3.org/2005/Atom" do
   xml.channel do
     # Required to pass W3C validation.
     xml.atom :link, nil, {
-      :href => admin_dashboard_index_path(:format => 'rss'),
+      :href => refinery.admin_dashboard_index_path(:format => 'rss'),
       :rel => 'self', :type => 'application/rss+xml'
     }
 
     # Feed basics.
     xml.title             "Refinery Updates"
     xml.description       "See the recent activity on your Refinery site."
-    xml.link              admin_dashboard_index_path(:format => 'rss')
+    xml.link              refinery.admin_dashboard_index_path(:format => 'rss')
 
     # Recent activity.
     @recent_activity.each do |change|

data/config/locales/bg.yml

@@ -1,26 +1,27 @@
 bg:
-  plugins:
-    refinery_dashboard:
-      title: Табло
-      description: Преглед на дейността в Refinery
-  admin:
-    dashboard:
-      index:
-        quick_tasks: Бърз достъп до задачи
-      actions:
-        add_a_new_page: Добавяне на нова страница
-        update_a_page: Редактиране на страница
-        upload_a_image: Качване на изображение
-        upload_a_file: Качване на файл
-        change_language: Смяна на език
-        see_home_page: Преглед на началната страница
-      recent_activity:
-        empty: Скоро не е извършвана дейност.
-        latest_activity: Последни действия
-        latest_activity_message: 'Елемента "%{what}(%{kind})" бе %{action}'
-      recent_inquiries:
-        latest_inquiries: Последни запитвания
-  updated:
-    'with_article "the"': актуализиран
-  created:
-    'with_article "the"': добавен
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Табло
+        description: Преглед на дейността в Refinery
+    admin:
+      dashboard:
+        index:
+          quick_tasks: Бърз достъп до задачи
+        actions:
+          add_a_new_page: Добавяне на нова страница
+          update_a_page: Редактиране на страница
+          upload_a_image: Качване на изображение
+          upload_a_file: Качване на файл
+          change_language: Смяна на език
+          see_home_page: Преглед на началната страница
+        recent_activity:
+          empty: Скоро не е извършвана дейност.
+          latest_activity: Последни действия
+          latest_activity_message: 'Елемента "%{what}(%{kind})" бе %{action}'
+        recent_inquiries:
+          latest_inquiries: Последни запитвания
+    updated:
+      'with_article "the"': актуализиран
+    created:
+      'with_article "the"': добавен

data/config/locales/cs.yml

@@ -1,26 +1,27 @@
 cs:
-  plugins:
-    refinery_dashboard:
-      title: Nástěnka
-      description: Přehled akcí provedených v administraci
-  admin:
-    dashboard:
-      index:
-        quick_tasks: Rychlé příkazy
-      actions:
-        add_a_new_page: Přidat novou stránku
-        update_a_page: Upravit stránku
-        upload_a_image: Nahrát obrázek
-        upload_a_file: Nahrát soubor
-        change_language: Změnit jazyk
-        see_home_page: Zobrazit titulní stránku
-      recent_activity:
-        empty: V poslední době nebyla provedena žádná akce.
-        latest_activity: Nejnovější akce
-        latest_activity_message: '%{what} %{kind} byla %{action}'
-      recent_inquiries:
-        latest_inquiries: Nejnovější dotazy z webu
-  updated:
-    'with_article "the"': upraven
-  created:
-    'with_article "the"': přidán
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Nástěnka
+        description: Přehled akcí provedených v administraci
+    admin:
+      dashboard:
+        index:
+          quick_tasks: Rychlé příkazy
+        actions:
+          add_a_new_page: Přidat novou stránku
+          update_a_page: Upravit stránku
+          upload_a_image: Nahrát obrázek
+          upload_a_file: Nahrát soubor
+          change_language: Změnit jazyk
+          see_home_page: Zobrazit titulní stránku
+        recent_activity:
+          empty: V poslední době nebyla provedena žádná akce.
+          latest_activity: Nejnovější akce
+          latest_activity_message: '%{what} %{kind} byla %{action}'
+        recent_inquiries:
+          latest_inquiries: Nejnovější dotazy z webu
+    updated:
+      'with_article "the"': upraven
+    created:
+      'with_article "the"': přidán

data/config/locales/da.yml

@@ -1,26 +1,27 @@
 da:
-  plugins:
-    refinery_dashboard:
-      title: Overblik
-      description: Giver et overblik over aktiviteterne i Refinery
-  admin:
-    dashboard:
-      index:
-        quick_tasks: Handlinger
-      actions:
-        add_a_new_page: Tilføj en ny side
-        update_a_page: Redigér en side
-        upload_a_image: Upload et billede
-        upload_a_file: Upload en fil
-        change_language: Skift sprog
-        see_home_page: Vis forside
-      recent_activity:
-        empty: Der her ingen aktititeter været for nylig.
-        latest_activity: Seneste Aktiviteter
-        latest_activity_message: '%{what} %{kind} blev %{action}'
-      recent_inquiries:
-        latest_inquiries: Seneste Henvendelser
-  updated:
-    'with_article "the"':  opdateret
-  created:
-    'with_article "the"':  oprettet
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Overblik
+        description: Giver et overblik over aktiviteterne i Refinery
+    admin:
+      dashboard:
+        index:
+          quick_tasks: Handlinger
+        actions:
+          add_a_new_page: Tilføj en ny side
+          update_a_page: Redigér en side
+          upload_a_image: Upload et billede
+          upload_a_file: Upload en fil
+          change_language: Skift sprog
+          see_home_page: Vis forside
+        recent_activity:
+          empty: Der her ingen aktititeter været for nylig.
+          latest_activity: Seneste Aktiviteter
+          latest_activity_message: '%{what} %{kind} blev %{action}'
+        recent_inquiries:
+          latest_inquiries: Seneste Henvendelser
+    updated:
+      'with_article "the"':  opdateret
+    created:
+      'with_article "the"':  oprettet

data/config/locales/de.yml

@@ -1,26 +1,27 @@
 de:
-  plugins:
-    refinery_dashboard:
-      title: Übersicht
-      description: Gibt eine Übersicht über Aktivitäten in Refinery
-  admin:
-    dashboard:
-      index:
-        quick_tasks: Allgemeine Aufgaben
-      actions:
-        add_a_new_page: Neue Seite erstellen
-        update_a_page: Eine Seite aktualisieren
-        upload_a_image: Ein Bild hochladen
-        upload_a_file: Eine Datei hochladen
-        change_language: Sprache wechseln
-        see_home_page: Homepage ansehen
-      recent_activity:
-        empty: Zuletzt gab es keine Aktivitäten.
-        latest_activity: Letzte Aktivität
-        latest_activity_message: '%{what} %{kind} wurde %{action}'
-      recent_inquiries:
-        latest_inquiries: Letzte Anfragen
-  updated:
-    'with_article "the"': aktualisiert
-  created:
-    'with_article "the"': erstellt
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Übersicht
+        description: Gibt eine Übersicht über Aktivitäten in Refinery
+    admin:
+      dashboard:
+        index:
+          quick_tasks: Allgemeine Aufgaben
+        actions:
+          add_a_new_page: Neue Seite erstellen
+          update_a_page: Eine Seite aktualisieren
+          upload_a_image: Ein Bild hochladen
+          upload_a_file: Eine Datei hochladen
+          change_language: Sprache wechseln
+          see_home_page: Homepage ansehen
+        recent_activity:
+          empty: Zuletzt gab es keine Aktivitäten.
+          latest_activity: Letzte Aktivität
+          latest_activity_message: '%{what} %{kind} wurde %{action}'
+        recent_inquiries:
+          latest_inquiries: Letzte Anfragen
+    updated:
+      'with_article "the"': aktualisiert
+    created:
+      'with_article "the"': erstellt

data/config/locales/el.yml

@@ -1,26 +1,27 @@
 el:
-  plugins:
-    refinery_dashboard:
-      title: Πανόπτης
-      description: Περίληψη δραστηριοτήτων στο Refinery
-  admin:
-    dashboard:
-      index:
-        quick_tasks: Γρήγορες ενέργειες
-      actions:
-        add_a_new_page: Προσθήκη σελίδας
-        update_a_page: Ενημέρωση σελίδας
-        upload_a_image: Μεταφόρτωση εικόνας
-        upload_a_file: Μεταφόρτωση αρχείου
-        change_language: Επιλογή γλώσσας
-        see_home_page: Προβολή αρχικής
-      recent_activity:
-        empty: Δεν υπάρχει πρόσφατη δραστηριότητα.
-        latest_activity: Τελευταίες δραστηριότητες
-        latest_activity_message: '%{what} %{kind} ήταν %{action}'
-      recent_inquiries:
-        latest_inquiries: Τελευταία μηνύματα
-  updated:
-    'with_article "the"': ενημερώθηκε
-  created:
-    'with_article "the"': προστέθηκε
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Πανόπτης
+        description: Περίληψη δραστηριοτήτων στο Refinery
+    admin:
+      dashboard:
+        index:
+          quick_tasks: Γρήγορες ενέργειες
+        actions:
+          add_a_new_page: Προσθήκη σελίδας
+          update_a_page: Ενημέρωση σελίδας
+          upload_a_image: Μεταφόρτωση εικόνας
+          upload_a_file: Μεταφόρτωση αρχείου
+          change_language: Επιλογή γλώσσας
+          see_home_page: Προβολή αρχικής
+        recent_activity:
+          empty: Δεν υπάρχει πρόσφατη δραστηριότητα.
+          latest_activity: Τελευταίες δραστηριότητες
+          latest_activity_message: '%{what} %{kind} ήταν %{action}'
+        recent_inquiries:
+          latest_inquiries: Τελευταία μηνύματα
+    updated:
+      'with_article "the"': ενημερώθηκε
+    created:
+      'with_article "the"': προστέθηκε