refinerycms-core 2.0.8 → 2.0.9

data/app/assets/javascripts/refinery/admin.js.erb

@@ -194,6 +194,9 @@ submit_and_continue = function(e, redirect_to) {
         $('#continue_editing').val(false);
 
         init_flash_messages();
+
+        //updates the form action with new URL
+        $('form').attr('action', $('#new_action').attr('value'));
       }
     }, 'html'
   );

data/app/assets/javascripts/wymeditor/functions.js.erb

@@ -183,7 +183,7 @@ WYMeditor.editor.prototype.close_dialog = function(e, cancelled) {
     if ((span = $(this._doc.body).find('span#' + this._current_unique_stamp)).length > 0) {
       span.parent().html(span.parent().html().replace(new RegExp(["<span(.+?)", span.attr('id'), "(.+?)<\/span>"].join("")), span.html()));
     }
-    // https://github.com/resolve/refinerycms/issues/888
+    // https://github.com/refinery/refinerycms/issues/888
     if (node = $(this._doc.body).find('#' + this._current_unique_stamp)) {
       node.attr("id", (node.attr('_id_before_replaceable') || ""));
       node.removeAttr("_id_before_replaceable");

data/app/assets/javascripts/wymeditor/lang/{zh_cn.js → zh-CN.js}

@@ -1,4 +1,4 @@
-WYMeditor.STRINGS['zh_cn'] = {
+WYMeditor.STRINGS['zh-CN'] = {
 	Strong: '加粗',
 	Emphasis: '斜体',
 	Superscript: '上标',

data/app/assets/javascripts/wymeditor/prototypes.js.erb

@@ -691,7 +691,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
               end = selection.focusOffset;
             }
 
-            // for https://github.com/resolve/refinerycms/issues/581
+            // for https://github.com/refinery/refinerycms/issues/581
             if (typeof (start_node.insertData) === 'undefined') {
                 var j = start_node.childNodes.length - 1,
                     tmp_start_node = start_node;

data/app/assets/stylesheets/refinery/layout.css.scss

@@ -1536,6 +1536,32 @@ a.information:hover {
 .tooltip, .tooltip span {
   @include rounded(6px);
 }
+
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: #ffffff;
+  text-transform: uppercase;
+  white-space: nowrap;
+  background-color: #bfbfbf;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.label.important {
+  background-color: #c43c35;
+}
+.label.warning {
+  background-color: #f89406;
+}
+.label.success {
+  background-color: #46a546;
+}
+.label.notice {
+  background-color: #62cffc;
+}
+
 /* Internet Explorer to follow: */
 /* IE 7 */
 .ie7 #content .form-actions .form-actions-left a.button {

data/app/views/refinery/admin/_image_picker.html.erb

@@ -21,7 +21,7 @@
       <% else -%>
         <img class="current_picked_image" src="" alt="" style='display: none' />
       <% end -%>
-      <span class='no_picked_image_selected nothing_selected' <%= "style='display: none;'" if image.present? %>>
+      <span class='no_picked_image_selected nothing_selected'<%= " style='display: none;'".html_safe if image.present? %>>
         <%= t('.none_selected') %>
       </span>
     </a>

data/app/views/refinery/admin/_resource_picker.html.erb

@@ -1,17 +1,16 @@
 <%
-  conditions ||= nil
-  insert_text = "<span id='no_resource_selected_#{field}' class='nothing_selected' #{"style='display: none;'" if resource.present?}>
+  insert_text = %Q{<span id="no_resource_selected_#{field}" class="nothing_selected" #{'style="display: none;"'.html_safe if resource}>
                    #{t('.no_resource_selected')}
-                 </span>".html_safe
+                 </span>}.html_safe
   insert_link = refinery.insert_admin_resources_path({
                   :dialog => true,
                   :update_resource => "current_resource_#{field}",
                   :update_text => "current_resource_text_#{field}",
                   :callback => "resource_changed_#{field}",
-                  :field => [f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, ""), field].join('_'),
-                  :current_link => "#{resource.url if resource.present?}",
+                  :field => [f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, '_').sub(/_$/, ''), field].join('_'),
+                  :current_link => "#{resource.url if resource}",
                   :height => 480,
-                  :conditions => conditions
+                  :conditions => local_assigns[:conditions]
                 })
               %>
 <%= f.hidden_field field %>
@@ -20,21 +19,21 @@
               :name => t('.name'),
               :id => "current_resource_link_#{field}"
   %>
-  <div id='current_resource_container_<%= field %>' style='margin-top: 10px<%= ";display: none" unless resource.present? %>'>
+  <div id="current_resource_container_<%= field %>" style="margin-top: 10px;<%= 'display: none' unless resource %>">
     <%= link_to "#{refinery_icon_tag('page_white_put.png')} ".html_safe +
                 content_tag(
                   :span,
-                  "#{resource.title} (#{resource.file_name})",
+                  (%Q{#{resource.title} (#{resource.file_name})} if resource).to_s,
                   :id => "current_resource_text_#{field}"
                 ),
-                resource.url,
+                "#{resource.url if resource}",
                 :id => "current_resource_#{field}",
-                :target => "_blank" if resource.present? %>
+                :target => '_blank' %>
   </div>
   <br/>
-  <%= link_to t('.remove_current'), "",
+  <%= link_to t('.remove_current'), '',
               :id => "remove_resource_#{field}",
-              :style => "#{"display:none;" unless resource.present?}" %>
+              :style => "#{'display:none;' unless resource}" %>
 </div>
 
 <% content_for :javascripts do %>
@@ -43,25 +42,24 @@
       $('#remove_resource_<%= field %>').show();
       $('#current_resource_container_<%= field %>').show();
       $('#no_resource_selected_<%= field %>').hide();
-      $('iframe#dialog_iframe').dialog("close");
-      $('iframe#dialog_iframe').remove().parents(".ui-dialog").remove();
-      $('#<%= f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "") %>_<%= field %>').val(callback_args.id);
-      $('#current_resource_link_<%= field %>').attr('href', $('#current_resource_link_<%= field %>').attr('href').replace(/current_link=([^&])*&/, "current_link=" + callback_args.href + "&"));
-      $("#current_resource_<%= field %>").attr('href', callback_args.href);
+      $('iframe#dialog_iframe').dialog('close');
+      $('iframe#dialog_iframe').remove().parents('.ui-dialog').remove();
+      $('#<%= f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, '_').sub(/_$/, '') %>_<%= field %>').val(callback_args.id);
+      $('#current_resource_link_<%= field %>').attr('href', $('#current_resource_link_<%= field %>').attr('href').replace(/current_link=([^&])*&/, 'current_link=' + callback_args.href + '&'));
+      $('#current_resource_<%= field %>').attr('href', callback_args.href);
       $('#current_resource_text_<%= field %>').html(callback_args.html);
-    }
+    };
 
     $(document).ready(function(e) {
       $('#remove_resource_<%= field %>').click(function(e) {
-        $('#<%= f.object_name %>_<%= field %>').val("");
+        $('#<%= f.object_name %>_<%= field %>').val('');
         $('#current_resource_container_<%= field %>').hide();
         $('#current_resource_text_<%= field %>').html('');
         $('#no_resource_selected_<%= field %>').show();
-        $('#current_resource_link_<%= field %>').attr('href', $('#current_resource_link_<%= field %>').attr('href').replace(/current_link=([^&])*&/, "current_link=&"));
+        $('#current_resource_link_<%= field %>').attr('href', $('#current_resource_link_<%= field %>').attr('href').replace(/current_link=([^&])*&/, 'current_link=&'));
         $(this).hide();
         e.preventDefault();
       });
     });
   </script>
 <% end %>
-

data/config/locales/es.yml

@@ -27,8 +27,8 @@ es:
         delete: Borrar
         close: Cerrar
       image_picker:
-        none_selected: No hay ninguna %{what} seleccionada, haz click aquí para añadir una.
-        remove_current: Eliminar %{what} actual
+        none_selected: No hay ninguna imagen seleccionada, haz click aquí para añadir una.
+        remove_current: Eliminar imagen actual
         change: Haz click aquí para escoger una imagen
         show: Mostrar
       resource_picker:

data/config/locales/fr.yml

@@ -1,5 +1,8 @@
 fr:
   refinery:
+    js:
+      admin:
+        confirm_changes: Toute modification sera perdue. Êtes-vous sûr de vouloir de vouloir continuer ?
     plugins:
       refinery_core:
         title: Refinery
@@ -49,8 +52,10 @@ fr:
         button_text: Chercher
         results_for: "Résultats de la recherche : '%{query}'"
         no_results: Aucun résultat ne correspond à votre recherche
+        cancel_search: 'Annuler la recherche'
+        search_input_notice: "Entrez ici le texte recherché. La longueur minimale est de 3 caractères."
       delete:
-        message: Etes-vous sûr de vouloir supprimer '%{title}'?
+        message: "Êtes-vous sûr de vouloir supprimer '%{title}'?"
       error_messages:
         problems_in_following_fields: Les champs suivants comportent des problèmes
       help: aide
@@ -65,6 +70,9 @@ fr:
       enable_javascript_html: Pour obtenir l'ensemble des fonctionnalités de cette page il est nécessaire d'activer JavaScript.
       here_are: Ici sont les
       instructions_enable_javascript_html: instructions pour activer JavaScript dans votre navigateur
+  time:
+    formats:
+      short: "%A, %d %B %Y"
   will_paginate:
     previous_label: "«"
     next_label: "»"

data/lib/generators/refinery/cms/cms_generator.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Refinery
   class CmsGenerator < Rails::Generators::Base
     source_root Pathname.new(File.expand_path('../templates', __FILE__))
@@ -201,10 +203,10 @@ gem 'pg'
       generator_args = []
       generator_args << '--quiet' if self.options[:quiet]
       Refinery::CoreGenerator.start generator_args
-      Refinery::AuthenticationGenerator.start generator_args
-      Refinery::ResourcesGenerator.start generator_args
-      Refinery::PagesGenerator.start generator_args
-      Refinery::ImagesGenerator.start generator_args
+      Refinery::AuthenticationGenerator.start generator_args if defined?(Refinery::AuthenticationGenerator)
+      Refinery::ResourcesGenerator.start generator_args if defined?(Refinery::ResourcesGenerator)
+      Refinery::PagesGenerator.start generator_args if defined?(Refinery::PagesGenerator)
+      Refinery::ImagesGenerator.start generator_args if defined?(Refinery::ImagesGenerator)
       Refinery::I18nGenerator.start generator_args if defined?(Refinery::I18nGenerator)
     end
 

data/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 Refinery::Core.configure do |config|
   # When true will rescue all not found errors and display a friendly error page
   config.rescue_not_found = Rails.env.production?

data/lib/generators/refinery/engine/engine_generator.rb

@@ -22,17 +22,23 @@ module Refinery
 
       evaluate_templates!
 
-      merge_locales!
+      unless options[:pretend]
+        merge_locales!
 
-      copy_or_merge_seeds!
+        copy_or_merge_seeds!
 
-      append_extension_to_gemfile!
+        append_extension_to_gemfile!
+      end
 
       finalize_extension!
     end
 
   protected
 
+    def generator_command
+      'rails generate refinery:engine'
+    end
+
     def reject_file_with_skip_frontend?(file)
       (skip_frontend? && (file.to_s.include?('app') && file.to_s.scan(/admin|models|mailers/).empty?)) ||
         reject_file_without_skip_frontend?(file)

data/lib/generators/refinery/engine/templates/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 gem 'refinerycms', '~> 2.0.3'
+gem 'refinerycms-i18n', '~> 2.0.2'
 
 # Database Configuration
 platforms :jruby do

data/lib/generators/refinery/engine/templates/config/locales/zh-CN.yml

@@ -0,0 +1,30 @@
+zh-CN:
+  refinery:
+    plugins:
+      <%= plural_name %>:
+        title: <%= plural_name.titleize %>
+    <%= namespacing.underscore %>:
+      admin:
+        <%= plural_name %>:
+          actions:
+            create_new: 建立新的 <%= singular_name.titleize %>
+            reorder: 对 <%= singular_name.titleize.pluralize %> 重新排序
+            reorder_done: 对 <%= singular_name.titleize.pluralize %> 的重新排序结束
+          records:
+            title: <%= plural_name.titleize %>
+            sorry_no_results: 对不起，未找到结果。 #Sorry! There are no results found.
+
+            # There are no <%= singular_name.titleize.pluralize %> yet. Click "Add New <%= singular_name.titleize %>" to add your first <%= singular_name.titleize.downcase %>.
+            no_items_yet: 目前没有 <%= singular_name.titleize.pluralize %> . 点击 "Add New <%= singular_name.titleize %>" 创建一个<%= singular_name.titleize.downcase %>.
+          <%= singular_name %>:
+            view_live_html: 查看 <%= singular_name.titleize.downcase %> 的最新内容.<br/><em>(新窗口中打开)</em>
+            edit: 编辑 <%= singular_name.titleize.downcase %>
+            delete: 永久删除 <%= singular_name.titleize.downcase %>
+      <%= plural_name %>:
+        show:
+          other: 其他 <%= singular_name.titleize.pluralize %>
+  activerecord:
+    attributes:
+      'refinery/<%= namespacing.underscore %>/<%= singular_name %>':<% attributes.each do |a| %>
+        <%= a.name %>: <%= a.name.titleize -%>
+<% end -%>

data/lib/generators/refinery/form/form_generator.rb

@@ -11,23 +11,27 @@ module Refinery
       "Generates an extension which is set up for frontend form submissions like a contact page."
     end
 
-    def generator_command
-      'rails generate refinery:form'
-    end
-
     def generate
       sanity_check!
 
       evaluate_templates!
 
-      merge_locales!
+      unless options[:pretend]
+        merge_locales!
 
-      copy_or_merge_seeds!
+        copy_or_merge_seeds!
 
-      append_extension_to_gemfile!
+        append_extension_to_gemfile!
+      end
 
       finalize_extension!
     end
 
+    protected
+
+    def generator_command
+      'rails generate refinery:form'
+    end
+
   end
 end

data/lib/generators/refinery/form/templates/config/locales/da.yml

@@ -1,69 +1,66 @@
 da:
-  plugins:
-    <%= plural_name %>:
-      title: <%= plural_name.titleize %>
+  refinery:
+    plugins:
+      <%= plural_name %>:
+        title: <%= plural_name.titleize %>
+    <%= namespacing.underscore %>:
+      <%= plural_name %>:
+        new:
+          header_message: "Der er et mindre problem"
+          message: "Følgende skal rettes:"
+          send: Send besked
+          privacy_policy: "Vi værner om dine personlige oplysninger"
+      admin:
+        <%= plural_name %>:
+          <%= singular_name %>:
+            move_<%= singular_name %>_to_closed: Flyt til lukkede henvendelser
+            move_<%= singular_name %>_to_open: Flyt til åbne henvendelser
+            read_<%= singular_name %>: Læs henvendelse
+            remove_<%= singular_name %>: "Er du sikker på du vil slette denne henvendelse fra '%{name}'?"
+            title: <%= plural_name.titleize %>
+          toggle_status:
+            closed: "Henvendelsen '%{<%= singular_name %>}' er lukket"
+            reopened: "Henvendelsen '%{<%= singular_name %>}' er genåbnet"
+          index:
+            no_<%= plural_name %>: Du har endnu ikke modtaget nogen henvendelser.
+          show:
+            details: Detaljer
+            click_to_email: Send en e-mail til adressen
+            status: Status
+            open: "Åben"
+            closed: Lukket
+            age: Tid siden modtagelse
+            actions: Handlinger
+            back_to_all_<%= plural_name %>: Tilbage til alle henvendelser
+            <%= singular_name %>: <%= class_name.underscore.titleize %>
+          submenu:
+            update_notified: Opdatér, hvem der får besked
+            edit_confirmation_email: Redigér e-mailbekræftelse
+        settings:
+          update:
+            updated: "'%{setting}' er opdateret."
+          notification_recipients_form:
+            settings_value_name: Send besked til
+            explanation: "Hver gang kontaktformularen benyttes, sender Refinery en e-mail med besked om, at der er modtaget en ny henvendelse"
+            hint: "Indtast en e-mail-adresse ovenfor. Skal beskeden sendes til mere end en person, så indtast flere adresser adskilt med kommaer."
+            example: "Fx mig@domæne.dk, ven@hotmail.com, kollega@arbejde.dk"
+          confirmation_email_form:
+            to: Til
+            from: Fra
+            subject: Emne
+            click_to_edit_subject: Klik her for at redigere emnet
+            explanation: "Hver gang kontaktformularen benyttes, sender Refinery en e-mail til den person, der udfyldte formularen, for at bekræfte henvendelsen."
+            below_edit_email_sent: Nedenfor kan du redigere e-mailen, der sendes ud.
+            the_customer_making_<%= singular_name %>: Kunden, der har henvendt sig
+            message: Besked
+            note: "Bemærk: Anbring teksten %name%, der hvor du vil have kundens navn skal være i e-mailen"
+          subject_form:
+            subject_value_name: Emne
   activerecord:
     models:
       <%= singular_name %>: <%= class_name.underscore.titleize %>
     attributes:
       <%= singular_name %>:
-        to: Til
-        from: Fra
-        click_to_email: Send en e-mail til adressen
-        phone: Telefon
-        date: Dato
-        message: Besked
-  <%= namespacing.underscore %>:
-    <%= plural_name %>:
-      new:
-        header_message: "Der er et mindre problem"
-        message: "Følgende skal rettes:"
-        send: Send besked
-        privacy_policy: "Vi værner om dine personlige oplysninger"
-    admin:
-      <%= plural_name %>:
-        <%= singular_name %>:
-          move_<%= singular_name %>_to_closed: Flyt til lukkede henvendelser
-          move_<%= singular_name %>_to_open: Flyt til åbne henvendelser
-          read_<%= singular_name %>: Læs henvendelse
-          remove_<%= singular_name %>: "Er du sikker på du vil slette denne henvendelse fra '%{name}'?"
-          title: <%= plural_name.titleize %>
-        toggle_status:
-          closed: "Henvendelsen '%{<%= singular_name %>}' er lukket"
-          reopened: "Henvendelsen '%{<%= singular_name %>}' er genåbnet"
-        index:
-          search_results_for: "Søgeresultat for '%{query}'"
-          no_<%= plural_name %>: Du har endnu ikke modtaget nogen henvendelser.
-        show:
-          details: Detaljer
-          click_to_email: Send en e-mail til adressen
-          status: Status
-          open: "Åben"
-          closed: Lukket
-          age: Tid siden modtagelse
-          actions: Handlinger
-          back_to_all_<%= plural_name %>: Tilbage til alle henvendelser
-          <%= singular_name %>: <%= class_name.underscore.titleize %>
-        submenu:
-          update_notified: Opdatér, hvem der får besked
-          edit_confirmation_email: Redigér e-mailbekræftelse
-      settings:
-        update:
-          updated: "'%{setting}' er opdateret."
-        notification_recipients_form:
-          settings_value_name: Send besked til
-          explanation: "Hver gang kontaktformularen benyttes, sender Refinery en e-mail med besked om, at der er modtaget en ny henvendelse"
-          hint: "Indtast en e-mail-adresse ovenfor. Skal beskeden sendes til mere end en person, så indtast flere adresser adskilt med kommaer."
-          example: "Fx mig@domæne.dk, ven@hotmail.com, kollega@arbejde.dk"
-        confirmation_email_form:
-          to: Til
-          from: Fra
-          subject: Emne
-          click_to_edit_subject: Klik her for at redigere emnet
-          explanation: "Hver gang kontaktformularen benyttes, sender Refinery en e-mail til den person, der udfyldte formularen, for at bekræfte henvendelsen."
-          below_edit_email_sent: Nedenfor kan du redigere e-mailen, der sendes ud.
-          the_customer_making_<%= singular_name %>: Kunden, der har henvendt sig
-          message: Besked
-          note: "Bemærk: Anbring teksten %name%, der hvor du vil have kundens navn skal være i e-mailen"
-        subject_form:
-          subject_value_name: Emne
+<% attributes.each do |a| -%>
+        <%= a.name %>: <%= a.name.humanize %>
+<% end -%>