refinerycms-dashboard 2.0.10 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dceff109499632b1464d65b28a5d9f58703e4db5
-  data.tar.gz: 12386e5e5986b0ef8bbe999aa482cfb7aa777084
+  metadata.gz: 405d4152889811e11625a5fadbb092e709785ae7
+  data.tar.gz: c1a6da62aec1fbc11f289a3b5aa5df14dd16ed12
 SHA512:
-  metadata.gz: 6018b649e24fba403eb13f26494771e6cca7f6edbbd9492c122496eb4d1baf7fc500413f70e2c00a7a88c06f73e236cff81f44090304e91c19501786d58cbaa6
-  data.tar.gz: b80405ed70f30cc62089088d7c6252e66456a081b11e81c70f1fb3d96eeb67933c5433c9641792d1c62b3d7d7d1083c68b1178fca8f20faf0c39c0ba6777c42d
+  metadata.gz: 0fe22ddc076ec10906a315a341967ae56ac70fea8481ec7ffc30d3616400e6c68047abc355503b361aa3b9accded4f00f312c09e17673ce3b561a662568f41ea
+  data.tar.gz: f74a046e207659724c97d1cd55ebd207bbe346ae2dabb276d29d73b89e33e29fcbab2c71e78f842fd611983f91613889a2fe53b7bfe499caeb9230895b0c350a

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

@@ -8,7 +8,7 @@ module Refinery
         ::Refinery::Plugins.active.each do |plugin|
           begin
             plugin.activity.each do |activity|
-              @recent_activity << activity.klass.where(activity.conditions).
+              @recent_activity += activity.klass.where(activity.conditions).
                                                  order(activity.order).
                                                  limit(activity.limit)
             end
@@ -19,9 +19,8 @@ module Refinery
           end
         end
 
-        @recent_activity = @recent_activity.flatten.compact.sort { |x,y|
-          y.updated_at <=> x.updated_at
-        }.first(Refinery::Dashboard.activity_show_limit)
+        @recent_activity = @recent_activity.sort_by(&:updated_at).reverse.
+                           first(Refinery::Dashboard.activity_show_limit)
 
         @recent_inquiries = if Refinery::Plugins.active.find_by_name("refinerycms_inquiries")
           Refinery::Inquiries::Inquiry.latest(Refinery::Dashboard.activity_show_limit)
@@ -30,11 +29,6 @@ module Refinery
         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

@@ -3,21 +3,34 @@ module Refinery
     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")})")
-        end
+        return if (plugin = find_plugin(record)).blank? || (activity = find_activity(record, plugin)).blank?
+
+        link_to t('.latest_activity_message',
+                  :what => record.send(activity.title),
+                  :kind => record.class.model_name.human,
+                  :action => t("with_article \"#{plugin_article(plugin)}\"",
+                               :scope => "refinery.#{record_action(record)}")
+                 ).downcase.capitalize, eval("#{activity.url}(#{activity.nesting('record')})")
+      end
+
+      private
+
+      def find_plugin(record)
+        Refinery::Plugins.active.find_by_model record.class
+      end
+
+      def find_activity(record, plugin = nil)
+        plugin ||= find_plugin(record) # avoid double lookup if we already have it
+        plugin.activity_by_class_name(record.class.name).first
+      end
+
+      def record_action(record)
+        record.updated_at.eql?(record.created_at) ? 'created' : 'updated'
+      end
+
+      # get article to define gender of model name, some languages require this for proper grammar
+      def plugin_article(plugin)
+        article = t('article', :scope => "refinery.plugins.#{plugin.name}.", :default => 'the')
       end
 
     end

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

@@ -32,26 +32,24 @@
   <%= render 'additional_dashboard_menu_items' %>
 </ul>
 
-<% if ::Refinery.i18n_enabled? %>
-  <% locales = Refinery::I18n.locales.clone %>
-  <% current_locale = ::I18n.locale %>
-  <% current_locale_title = locales.delete(current_locale) %>
-  <ul id='current_locale'>
+<% 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('#{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 => 'refinery.admin.form_actions') %></span>
+    <% end %>
+  </li>
+</ul>
+<ul id='other_locales' style='display: none'>
+  <% locales.sort_by{|key, value| value}.each do |locale, locale_title| %>
     <li>
-      <%= 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 => 'refinery.admin.form_actions') %></span>
-      <% end %>
+      <%= link_to locale_title.respond_to?(:force_encoding) ? locale_title.force_encoding('utf-8') : locale_title,
+                  refinery.admin_dashboard_path(:set_locale => locale),
+                  :style => "background-image: url('#{asset_path "refinery/icons/flags/#{locale}.png"}');" %>
     </li>
-  </ul>
-  <ul id='other_locales' style='display: none'>
-    <% 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,
-                    refinery.admin_dashboard_path(:set_locale => locale),
-                    :style => "background-image: url('#{asset_path "refinery/icons/flags/#{locale}.png"}');" %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
+  <% end %>
+</ul>

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

@@ -7,7 +7,3 @@
     <%= render 'actions' %>
   </aside>
 </div>
-<% if request.env["HTTP_USER_AGENT"] =~ /MSIE/ and
-        Refinery::Core.show_internet_explorer_upgrade_message %>
-  <% flash.now[:message] = render(:partial => "/refinery/ie6check")  %>
-<% end %>

data/config/locales/hu.yml

@@ -0,0 +1,27 @@
+hu:
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Műszerfal
+        description: Összefoglalót kapsz a Refinery-ben történt tevékenységekről
+    admin:
+      dashboard:
+        index:
+          quick_tasks: Gyors Feladatok
+        actions:
+          add_a_new_page: Új oldal hozzáadása
+          update_a_page: Oldal frissítése
+          upload_a_image: Kép feltöltése
+          upload_a_file: Fájl feltöltése
+          change_language: Nyelvváltás
+          see_home_page: Nyitóoldal megtekintése
+        recent_activity:
+          empty: Mostanában nem történt semmilyen tevékenység.
+          latest_activity: Legutóbbi Tevékenységek
+          latest_activity_message: '%{what} %{kind} lett %{action}'
+        recent_inquiries:
+          latest_inquiries: Legfrissebb megkeresések
+    updated:
+      'with_article "the"': frissítve
+    created:
+      'with_article "the"': hozzáadva

data/config/locales/nl.yml

@@ -3,25 +3,25 @@ nl:
     plugins:
       refinery_dashboard:
         title: Overzicht
-        description: Gives an overview of activity in Refinery
+        description: Een overzicht van activiteit binnen Refinery
     admin:
       dashboard:
         index:
-          quick_tasks: Algemene taken
+          quick_tasks: Algemene Taken
         actions:
-          add_a_new_page: Voeg een nieuwe pagina toe
-          update_a_page: Bewerk een pagina
-          upload_a_image: Upload een afbeelding
-          upload_a_file: Upload een bestand
-          change_language: Verander de taal
-          see_home_page: Bezoek de homepage
+          add_a_new_page: Een nieuwe pagina toevoegen
+          update_a_page: Een pagina bewerken
+          upload_a_image: Een afbeelding uploaden
+          upload_a_file: Een bestand uploaden
+          change_language: De taal veranderen
+          see_home_page: De homepage bezoeken
         recent_activity:
           empty: Er hebben zich recentelijk geen activiteiten voorgedaan.
-          latest_activity: Laatste Wijzigingen
+          latest_activity: Laatste activiteit
           latest_activity_message: '%{what} %{kind} is %{action}'
         recent_inquiries:
-          latest_inquiries: Latest Inquiries
+          latest_inquiries: Laatste contactaanvragen
     updated:
-      'with_article "the"':  bewerkt
+      'with_article "the"': bewerkt
     created:
-      'with_article "the"':  aangemaakt
+      'with_article "the"': toegevoegd

data/config/locales/pt.yml

@@ -0,0 +1,27 @@
+pt:
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Dashboard
+        description: "Apresenta uma visão geral da actividade no Refinery"
+    admin:
+      dashboard:
+        index:
+          quick_tasks: "Tarefas Rápidas"
+        actions:
+          add_a_new_page: "Adicionar nova página"
+          update_a_page: "Actualizar uma página"
+          upload_a_image: "Carregar uma imagem"
+          upload_a_file: "Carregar um ficheiro"
+          change_language: "Mudar de Língua"
+          see_home_page: "Ver página inicial"
+        recent_activity:
+          empty: "Não houve qualquer actividade recentemente."
+          latest_activity: "Últimas actividades"
+          latest_activity_message: '%{what} %{kind} foi %{action}'
+        recent_inquiries:
+          latest_inquiries: "Últimas consultas"
+    updated:
+      'with_article "the"': 'Actualizado'
+    created:
+      'with_article "the"': 'Adicionado'

data/config/locales/sk.yml

@@ -20,7 +20,7 @@ sk:
           latest_activity: Najnovšie Akcie
           latest_activity_message: '%{what} %{kind} bol/a %{action}'
         recent_inquiries:
-          latest_inquiries: Najnovšie Otázky Z Webu
+          latest_inquiries: Najnovšie otázky z webu
     updated:
       'with_article "the"': upravený/á
     created:

data/config/locales/tr.yml

@@ -0,0 +1,27 @@
+tr:
+  refinery:
+    plugins:
+      refinery_dashboard:
+        title: Kontrol Paneli
+        description: RefineryCMS aktivite ekrani
+    admin:
+      dashboard:
+        index:
+          quick_tasks: Hizli Gorev
+        actions:
+          add_a_new_page: Yeni bir sayfa ekle
+          update_a_page: Yeni bir sayfa guncelle
+          upload_a_image: Fotograf ekle
+          upload_a_file: Dosya ekle
+          change_language: Dil'i Degistir
+          see_home_page: Ana Sayfayi Gor
+        recent_activity:
+          empty: Son zamanlarda herhangi bir aktivite yok
+          latest_activity: Son Aktivite
+          latest_activity_message: '%{what} %{kind} was %{action}'
+        recent_inquiries:
+          latest_inquiries: En Son Talepler
+    updated:
+      'with_article "the"': guncellendi
+    created:
+      'with_article "the"': eklendi

data/config/locales/uk.yml

@@ -0,0 +1,32 @@
+uk:
+  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: "%{action} %{kind} «%{what}»"
+        recent_inquiries:
+          latest_inquiries: Останні запити
+    updated:
+      'with_article "masculine"': Оновлений
+      'with_article "feminine"':  Оновлена
+      'with_article "neuter"':    Оновлено
+    created:
+      'with_article "masculine"': Доданий
+      'with_article "feminine"':  Додана
+      'with_article "neuter"':    Додано
+

data/config/routes.rb

@@ -1,9 +1,5 @@
-Refinery::Core::Engine.routes.prepend do
-  namespace :admin, :path => 'refinery' do
+Refinery::Core::Engine.routes.draw do
+  namespace :admin, :path => Refinery::Core.backend_route do
     get 'dashboard', :to => 'dashboard#index', :as => :dashboard
-
-    match 'disable_upgrade_message',
-          :to => 'dashboard#disable_upgrade_message',
-          :as => :disable_upgrade_message
   end
 end

data/lib/refinery/dashboard/engine.rb

@@ -1,7 +1,7 @@
 module Refinery
   module Dashboard
     class Engine < ::Rails::Engine
-      include Refinery::Engine
+      extend Refinery::Engine
 
       isolate_namespace Refinery
       engine_name :refinery_dashboard
@@ -13,7 +13,6 @@ module Refinery
           plugin.pathname = root
           plugin.name = 'refinery_dashboard'
           plugin.menu_match = %r{refinery/(refinery_)?dashboard$}
-          plugin.version = %q{2.0.0}
           plugin.always_allow_access = true
           plugin.dashboard = true
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_dashboard_path }

data/refinerycms-dashboard.gemspec

@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 

data/spec/{requests → features}/refinery/admin/dashboard_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "dashboard" do
-  login_refinery_user
+  refinery_login_with :refinery_user
 
   describe "quick tasks" do
     specify "buttons" do
@@ -37,12 +37,10 @@ describe "dashboard" do
       3.times { |n| FactoryGirl.create :page, :title => "Refinery CMS #{n}" }
     end
 
-    it "shows 7 recent actions" do
+    it "shows created tracked objects" do
       visit refinery.admin_dashboard_path
 
       page.should have_content("Latest Activity")
-      # This comes from login_refinery_user
-      page.should have_content("Refinerycms user was")
       3.times { |n| page.should have_content("Ugisozols#{n} user was added") }
       3.times { |n| page.should have_content("Refinery cms #{n} page was added") }
     end
@@ -56,7 +54,7 @@ describe "dashboard" do
 
       visit refinery.admin_dashboard_path
 
-      page.should have_selector("a[href='#{refinery.edit_admin_page_path(nested.uncached_nested_url)}']")
+      page.should have_selector("a[href='#{refinery.edit_admin_page_path(nested.nested_url)}']")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-dashboard
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 description: The dashboard is usually the first extension the user sees in the backend
   of Refinery CMS. It displays useful information and contains links to common functionality.
 email: info@refinerycms.com
@@ -51,6 +51,7 @@ files:
 - config/locales/es.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/hu.yml
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ko.yml
@@ -60,11 +61,14 @@ files:
 - config/locales/nl.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
+- config/locales/pt.yml
 - config/locales/rs.yml
 - config/locales/ru.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/sv.yml
+- config/locales/tr.yml
+- config/locales/uk.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
@@ -75,7 +79,7 @@ files:
 - lib/refinerycms-dashboard.rb
 - license.md
 - refinerycms-dashboard.gemspec
-- spec/requests/refinery/admin/dashboard_spec.rb
+- spec/features/refinery/admin/dashboard_spec.rb
 homepage: http://refinerycms.com
 licenses:
 - MIT
@@ -101,4 +105,4 @@ signing_key:
 specification_version: 4
 summary: Dashboard extension for Refinery CMS
 test_files:
-- spec/requests/refinery/admin/dashboard_spec.rb
+- spec/features/refinery/admin/dashboard_spec.rb