refinerycms 0.9.8 → 0.9.8.1

data/vendor/refinerycms/core/public/javascripts/refinery/serializelist.js

@@ -0,0 +1,66 @@
+/**
+ * jQuery Serialize List
+ * Copyright (c) 2009 Mike Botsko, Botsko.net LLC
+ * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * Copyright notice and license must remain intact for legal use
+ * Version .2
+ *
+ * Serialize an unordered or ordered list item. Optional ability
+ * to determine which attributes are included. The serialization
+ * will be read by PHP as a multidimensional array which you may
+ * use for saving state.
+ *
+ * http://github.com/botskonet/jquery.serialize-list
+ */
+(function($){
+    $.fn.serializelist = function(options) {
+        // Extend the configuration options with user-provided
+        var defaults = {
+			attributes: ['id'], // which html attributes should be sent?
+			allow_nest: true, // allow nested elements to be included
+            prepend: 'ul', // which query string param name should be used?
+			att_regex: false, // replacement regex to run on attr values
+            is_child: false // determine if we're serializing a child list
+        };
+        var opts = $.extend(defaults, options);
+        var serialStr     = '';
+        if(!opts.is_child){ opts.prepend = '&'+opts.prepend; }
+        // Begin the core plugin
+        this.each(function() {
+            var li_count = 0;
+            $(this).children().each(function(){
+				if(opts.allow_nest || opts.attributes.length > 1){
+					for(att in opts.attributes){
+						val = att_rep(opts.attributes[att], $(this).attr(opts.attributes[att]));
+						serialStr += opts.prepend+'['+li_count+']['+opts.attributes[att]+']='+val;
+					}
+				} else {
+					val = att_rep(opts.attributes[0], $(this).attr(opts.attributes[0]));
+					serialStr += opts.prepend+'['+li_count+']='+val;
+				}
+                // append any children elements
+				if(opts.allow_nest){
+					var child_base = opts.prepend+'['+li_count+'][children]';
+					$(this).children().each(function(){
+						if(this.tagName == 'UL' || this.tagName == 'OL'){
+							serialStr += $(this).serializelist({'prepend': child_base, 'is_child': true});
+						}
+					});
+				}
+                li_count++;
+            });
+			function att_rep (att, val){
+				if(opts.att_regex){
+					for(x in opts.att_regex){
+						if(opts.att_regex[x].att == att){
+							return val.replace(opts.att_regex[x].regex, '');
+						}
+					}
+				} else {
+					return val;
+				}
+			}
+        });
+        return(serialStr);
+    };
+})(jQuery);

data/vendor/refinerycms/core/public/stylesheets/refinery/refinery.css

@@ -421,9 +421,14 @@ header p {
   line-height: 35px;
   position: relative;
 }
+#records > #recent_activity > ul li, #records > #recent_inquiries > ul li {
+  max-height: 35px;
+}
+/*
 #records > ul.ui-sortable li {
   position: static;
 }
+*/
 #content #records > ul li .actions a {
   line-height: 29px;
 }
@@ -501,87 +506,19 @@ header p {
 #records.tree ul li > div:hover, .tree ul li > div:hover {
   background-color: #EAEAEA;
 }
+/*
 #records.tree ul.ui-sortable li div:hover, .tree ul.ui-sortable li div:hover {
   background-color: inherit;
 }
+*/
 #records ul#sortable_list {
   margin-top: 6px;
 }
-.ui-sortable .nested{
-  padding:5px;
-  margin:5px 0;
-}
-#records ul#sortable_list.ui-sortable {
-  margin-top: 0px;
-}
-#content .ui-sortable li.hover {
-  height: 300%;
-  display: block;
-}
-#content .ui-sortable {
-  margin: 0;
-  padding: 12px 0px;
-}
-#content #records > .ui-sortable {
-  padding-top: 10px;
-}
-#content #records ul.ui-sortable li ul, #content .ui-sortable li ul {
-  padding: 6px 10px 12px 40px;
-}
-#content #records ul.ui-sortable li, #content ul.ui-sortable li {
-  background-image: none;
-  background-color: #EAEAEA;
+
+#sortable_list.reordering > li {
   cursor: move;
-  border: 1px solid #ccc;
-  margin-bottom: 6px;
-  padding: 3px 0px 0px 3px;
-}
-#content #records ul.ui-sortable li ul li, #content ul.ui-sortable li {
-  background-color: #F2F2F2;
-}
-#content ul.ui-sortable li ul.empty {
-  display: block;
-}
-#content ul.ui-sortable li ul li.empty {
-  border: 0px none;
-}
-#content .ui-sortable .actions {
-  display: none !important;
-}
-#content .ui-sortable ul.spacing li {
-  display: block;
-  border: 0px none;
-}
-#content .ui-sortable ul {
-  min-height: 12px;
-}
-#content .ui-sortable li.placeholder {
-  opacity: 0.7;
-  border-width: 2px;
-  border-style: dashed;
-  height: 38px;
-}
-#content .tree .ui-sortable li.placeholder {
-  height: 38px;
-  border-width: 2px;
-  position: relative;
-  background: #22A7F2 !important;
-  margin:5px 0;
-}
-#content #records .tree .ui-sortable li.helper, #content .tree .ui-sortable li.helper {
-  opacity: 0.5 !important;
-}
-#content .tree .ui-sortable li.below-placeholder {
-}
-#content ul.ui-sortable li.ui-sortable-helper {
-  height: 38px !important;
-}
-#content ul.ui-sortable li.ui-sortable-helper ul {
-  display: none;
-}
-.ui-sortable-helper {
-  opacity: 0.7;
 }
+
 #content h2 {
   font-size: 18px;
   color:#41403c;
@@ -589,6 +526,7 @@ header p {
   margin-top: 10px;
   font-weight: bold;
 }
+
 #records h2, #actions h2 {
   margin-top: 0px;
 }

data/vendor/refinerycms/dashboard/config/locales/de.yml

@@ -2,6 +2,7 @@ de:
   plugins:
     refinery_dashboard:
       title: Armaturenbrett
+      description: Gibt eine Übersicht über Aktivitäten in Refinery
   admin:
     dashboard:
       index:
@@ -9,16 +10,15 @@ de:
         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:
         latest_activity: Letzte Aktivität
-        see: "'%{what}' ansehen"
+        latest_activity_message: %{what} %{kind} wurde %{action}
       recent_inquiries:
-        latest_inquiries: Latest inquiries
+        latest_inquiries: Letzte Anfragen
   updated:
-    'with_article "the"':  aktualisiert
+    'with_article "the"': aktualisiert
   created:
-    'with_article "the"':  erstellt
-  ago: "vor %{time}"
-  see: Ansehen
+    'with_article "the"': erstellt

data/vendor/refinerycms/dashboard/config/locales/pt-BR.yml

@@ -2,6 +2,7 @@ pt-BR:
   plugins:
     refinery_dashboard:
       title: Painel
+      description: Mostra um sumário das atividades no sistema
   admin:
     dashboard:
       index:
@@ -10,12 +11,11 @@ pt-BR:
         update_a_page: Atualizar uma página
         upload_a_image: Enviar uma imagem
         upload_a_file: Enviar um arquivo
-        see_home_page: Ver página inicial
         change_language: Mudar Língua
+        see_home_page: Ver página inicial
       recent_activity:
         latest_activity: Atividade Recente
-        see: "Ver '%{what}'"
-        latest_activity_message: "%{kind} %{what} foi %{action}"
+        latest_activity_message: %{what} %{kind} foi %{action}
       recent_inquiries:
         latest_inquiries: Últimas mensagens
   updated:
@@ -26,5 +26,3 @@ pt-BR:
     'with_article "as"': criada
     'with_article "os"': criado
     'with_article "the"': criado
-  ago: "%{time} atrás"
-  see: Ver

data/vendor/refinerycms/dashboard/features/dashboard.feature

@@ -0,0 +1,54 @@
+@dashboard
+Feature: Dashboard
+  In order to see recent changes to my website
+  As an administrator
+  I want to use the dashboard
+
+  Background:
+    Given I am a logged in refinery user
+    And my locale is en
+    When I go to the Dashboard
+
+  Scenario: Add New Page Button
+    Given I have no pages
+    When I follow "Add a new page"
+    Then I should be on the new page form
+    When I fill in "Title" with "Page test from Dashboard"
+    And I press "Save"
+    Then I should be on the Dashboard
+    And I should see "'Page test from Dashboard' was successfully created."
+    And I should have 1 page
+
+  Scenario: Update a Page Button
+    When I follow "Update a page"
+    Then I should be on the list of pages
+
+    Scenario: Upload a File Button
+    When I follow "Upload a file"
+    Then I should be on the new file form
+
+  Scenario: Upload an Image Button
+    When I follow "Upload an image"
+    Then I should be on the new image form
+
+  Scenario: See Home Page Button
+    When I follow "See home page"
+    Then I should be on the home page
+
+  Scenario: Translation options available
+    When I go to the Dashboard
+    Then I should see "English Change Language"
+
+  Scenario: Change Language to Slovenian and back to English
+    When I go to the dashboard
+    And I follow "English Change Language"
+    And I follow "Slovenian"
+    Then I should be on the Dashboard
+    And I should see "Slovenian Spremeni Jezik"
+    And I should not see "Switch to your website"
+    # Back to English
+    When I follow "Slovenian Spremeni Jezik"
+    And I follow "English"
+    Then I should be on the Dashboard
+    And I should see "Switch to your website"
+    And I should not see "Spremeni Jezik"

data/vendor/refinerycms/dashboard/features/support/paths.rb

@@ -0,0 +1,14 @@
+module NavigationHelpers
+  module Refinery
+    module Dashboard
+      def path_to(page_name)
+      case page_name
+        when /the (d|D)ashboard/
+          admin_dashboard_path
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/vendor/refinerycms/images/app/controllers/admin/images_controller.rb

@@ -48,16 +48,16 @@ class Admin::ImagesController < Admin::BaseController
 
   #This returns a url. If params[:size] is provided, it will generate a url for this size.
   def url
-    @image = Image.find params[:id]
-    if params[:size].blank?
-      render :json => { :error => false, :url => @image.url, :width => @image.width, :height => @image.height }
-    else
+    @image = Image.find(params[:id])
+    if params[:size].present?
       begin
-        width, height = params[:size].split("x")
-        render :json => { :error => false, :url => @image.url(params[:size]), :width => width.to_i, :height => height.to_i }
+        thumbnail = @image.thumbnail(params[:size])
+        render :json => { :error => false, :url => thumbnail.url, :width => thumbnail.width, :height => thumbnail.height }
       rescue RuntimeError
         render :json => { :error => true }
       end
+    else
+      render :json => { :error => false, :url => @image.url, :width => @image.width, :height => @image.height }
     end
   end
 

data/vendor/refinerycms/images/app/helpers/admin/images_helper.rb

@@ -14,7 +14,7 @@ module Admin::ImagesHelper
 
   def change_list_mode_if_specified
     if action_name == 'index' and params[:view].present? and image_views.include?(params[:view].to_sym)
-      RefinerySetting[:preferred_image_view] = params[:view]
+      RefinerySetting.set(:preferred_image_view, params[:view])
     end
   end
 

data/vendor/refinerycms/images/app/views/admin/images/_existing_image.html.erb

@@ -4,7 +4,7 @@
     <ul>
       <% @images.each do |image| %>
         <li<%= " class='selected'" if @image_id == image.id %>>
-          <%= image_fu(image, :dialog_thumb, {
+          <%= image_fu(image, '106x106#c', {
                          :alt => image.title,
                          :title => image.title,
                          :id => "image_#{image.id}",
@@ -24,19 +24,21 @@
       </p>
       <ul>
         <%
-          thumbnail_sizes = RefinerySetting.find_or_set(:image_thumbnails, {})
-          (sizes = RefinerySetting.find_or_set(:image_dialogue_sizes, [:small, :medium, :large])).each_with_index do |size, index|
-            if thumbnail_sizes.keys.include?(size) and (pixels = thumbnail_sizes[size]).present?
-              pixels.to_s.gsub!(/[<>=]/, '')
+          (sizes = RefinerySetting.find_or_set(:user_image_sizes, {
+                     :small => '110x110>',
+                     :medium => '225x255>',
+                     :large => '450x450>'
+                   })
+          ).sort_by{|k,v| v}.each_with_index do |(size, pixels), index|
+            safe_pixels = pixels.to_s.gsub(/[<>=]/, '')
         -%>
-              <li id="image_dialog_size_<%= index %>" class="image_dialog_size <%= 'selected' if size == :medium %>">
-                <%= link_to size.to_s, "##{size}",
-                            :'data-size' => pixels,
-                            :title   => "#{size} image (#{pixels} px)",
-                            :tooltip => "#{size} image (#{pixels} px)" %>
-              </li>
-        <%  end
-          end -%>
+            <li id="image_dialog_size_<%= index %>" class="image_dialog_size <%= 'selected' if size.to_s == 'medium' %>">
+              <%= link_to size.to_s, "##{size}",
+                          :'data-size' => pixels,
+                          :title   => "#{size} image (#{safe_pixels})",
+                          :tooltip => "#{size} image (#{safe_pixels})" %>
+            </li>
+        <% end -%>
       </ul>
     </div>
   <% end %>

data/vendor/refinerycms/images/app/views/admin/images/_grid_view.html.erb

@@ -1,7 +1,7 @@
 <ul id="image_grid" class="clearfix">
   <% @images.each_with_index do |image, index| -%>
     <li id="image_<%= image.id %>" class='image_<%= index % 5 %>'>
-      <%= image_fu image, :grid, :title => image.title %>
+      <%= image_fu image, '135x135#c', :title => image.title %>
       <span class='actions'>
         <%= link_to refinery_icon_tag('eye.png'), image.url,
                     :target => "_blank",

data/vendor/refinerycms/images/app/views/admin/images/_list_view_image.html.erb

@@ -5,7 +5,7 @@
   <span class='actions'>
     <%= link_to refinery_icon_tag('eye.png'), list_view_image.url,
                 :target => "_blank",
-                :title => "#{image_fu list_view_image, :preview}" %>
+                :title => "#{image_fu list_view_image, '96x96#c'}" %>
     <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(list_view_image),
                 :title => t('admin.images.edit') %>
     <%= link_to refinery_icon_tag('delete.png'), admin_image_path(list_view_image),

data/vendor/refinerycms/images/config/locales/de.yml

@@ -2,41 +2,37 @@ de:
   plugins:
     refinery_images:
       title: Bilder
-  no_file_chosen: Sie müssen ein Bild zum Hochladen wählen.
-  image_should_be_smaller_than_max_image_size: Dateien sollten kleiner als %{max_image_size} sein
-  image_must_be_these_formats: Ihr Bild muss im Format JPG, PNG oder GIF vorliegen
+      description: Verwaltet Bilder
+  image_specify_for_upload: Sie müssen ein Bild zum Hochladen angeben
+  image_should_be_smaller_than_max_image_size: Bild sollte kleiner als %{max_image_size} sein
+  image_must_be_these_formats: 'Ihr Bild sollte ein JPG, PNG oder GIF sein'
   admin:
     images:
-      image:
-        delete:
-          message: Sind Sie sicher, dass Sie '%{title}' löschen möchten?
-          title: Dieses Bild für immer löschen
+      delete: Dieses Bild für immer löschen
+      edit: Dieses Bild bearbeiten
       form:
         image: Bild
         use_current_image: Aktuelles Bild verwenden
         or: oder
-        replace_image: Oder durch dieses ersetzen ...
+        replace_image: " mit diesem ersetzen..."
         current_image: Aktuelles Bild
-        maximum_image_size: "Die maximale Bildgröße beträgt %{megabytes} Megabyte."
+        maximum_image_size: Die maximale Größe eines Bildes beträgt %{megabytes} Megabytes.
       index:
-        create_new_image: Neues Bild erstellen
-        no_images_yet: Es wurden noch keine Bilder erstellt. Klicken Sie auf "Neues Bild erstellen" um Ihr erstes Bild zu erstellen.
+        create_new_image: Neues Bild anlegen
+        no_images_yet: Es sind noch keine Bilder vorhanden. Klicken Sie auf "Neues Bild anlegen", um Ihr estes Bild hinzuzufügen.
         view:
-          switch_to: Zur Ansicht "%{view_name}" wechseln
-          list: Liste
+          switch_to: Zur %{view_name}-Ansicht wechseln
+          list: Listen
           grid: Gitter
-        search:
-          results_for: Suchergebnisse für %{query}
       grid_view:
-        edit: Dieses Bild bearbeiten
-        view_live: Dieses Bild anzeigen <br/><em>Öffnet ein neues Fenster</em>
-      list_view_image:
-        edit_this_image: Dieses Bild bearbeiten
+        view_live: Dieses Bild betrachten <br/><em>Öffnet sich in einem neuen Fenster</em>
+      existing_image:
+        button_text: Einfügen
+        resize_image: Bild in der Größe ändern?
+        size: Größe
       insert:
-        existing_image: Existierendes Bild
+        existing_image: Vorhandenes Bild
         new_image: Neues Bild
-        previous: vorheriges
-        next: nächstes
-        submit_insert: Einfügen
-        or: oder
-        cancel: Abbrechen
+  activerecord:
+    models:
+      image: Bild