refinerycms-core 2.0.5 → 2.0.6

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

@@ -63,40 +63,35 @@ $.fn.applyMinimumHeightFromChildren = function() {
 }
 
 init_modal_dialogs = function(){
-  $(document).on('click', 'a[href*="dialog=true"]:not(#dialog_container a)', function(e) {
-    var $anchor = $(this),
-        href = $anchor.attr('href'),
-        width = parseInt($(href.match("width=([0-9]*)")).last().get(0), 10)||928,
-        height = parseInt($(href.match("height=([0-9]*)")).last().get(0), 10)||473,
-        title = $anchor.attr('title') || $anchor.attr('name') || $anchor.html() || null;
-
-    href = href.replace(/((\&(amp\;)?)|\?)dialog\=true/, '')
-               .replace(/((\&(amp\;)?)|\?)width\=\d+/, '')
-               .replace(/((\&(amp\;)?)|\?)height\=\d+/, '')
-               .replace(/(\?&(amp\;)?)/, '?')
-               .replace(/\?$/, '');
-
-    iframe_src = (iframe_src = href)
-                 + (iframe_src.indexOf('?') > -1 ? '&' : '?')
-                 + 'app_dialog=true&dialog=true';
-
-    iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
-    if(!$.browser.msie) { iframe.corner('8px'); }
-    iframe.dialog({
-      title: title
-      , modal: true
-      , resizable: false
-      , autoOpen: true
-      , width: width
-      , height: height
-      , open: onOpenDialog
-      , close: onCloseDialog
-			, open: function(event, ui) {
-				iframe.attr('src', iframe_src);
-			}
-    });
+  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor) {
+    $(anchor).data({
+      'dialog-width': parseInt($($(anchor).attr('href').match("width=([0-9]*)")).last().get(0), 10)||928
+      , 'dialog-height': parseInt($($(anchor).attr('href').match("height=([0-9]*)")).last().get(0), 10)||473
+      , 'dialog-title': ($(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null)
+    }).attr('href', $(anchor).attr('href').replace(/(&(amp;)?|\?)(dialog=true|(width|height)=\d+)/g, '')
+                                          .replace(/(\/[^&\?]*)&(amp;)?/, '$1?'))
+    .click(function(e){
+      $anchor = $(this);
+      iframe_src = (iframe_src = $anchor.attr('href'))
+                   + (iframe_src.indexOf('?') > -1 ? '&' : '?')
+                   + 'app_dialog=true&dialog=true';
+
+      iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
+      if(!$.browser.msie) { iframe.corner('8px'); }
+      iframe.dialog({
+        title: $anchor.data('dialog-title')
+        , modal: true
+        , resizable: false
+        , autoOpen: true
+        , width: $anchor.data('dialog-width')
+        , height: $anchor.data('dialog-height')
+        , open: onOpenDialog
+        , close: onCloseDialog
+      });
 
-    e.preventDefault();
+      iframe.attr('src', iframe_src);
+      e.preventDefault();
+    });
   });
 };
 

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

@@ -1,36 +1,34 @@
+<%# encoding: utf-8 %>
 init_modal_dialogs = function(){
-  $(document).on('click', 'a[href*="dialog=true"]:not(#dialog_container a)', function(e) {
-    var $anchor = $(this),
-        href = $anchor.attr('href'),
-        width = parseInt($(href.match("width=([0-9]*)")).last().get(0), 10)||928,
-        height = parseInt($(href.match("height=([0-9]*)")).last().get(0), 10)||473,
-        title = $anchor.attr('title') || $anchor.attr('name') || $anchor.html() || null;
-
-    href = href.replace(/(\&(amp\;)?)?dialog\=true/, '')
-               .replace(/(\&(amp\;)?)?width\=\d+/, '')
-               .replace(/(\&(amp\;)?)?height\=\d+/, '')
-               .replace(/(\?&(amp\;)?)/, '?')
-               .replace(/\?$/, '');
-
-    iframe_src = (iframe_src = href)
-                 + (iframe_src.indexOf('?') > -1 ? '&' : '?')
-                 + 'app_dialog=true&dialog=true';
-
-    iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
-    if(!$.browser.msie) { iframe.corner('8px'); }
-    iframe.dialog({
-      title: title
-      , modal: true
-      , resizable: false
-      , autoOpen: true
-      , width: width
-      , height: height
-      , open: onOpenDialog
-      , close: onCloseDialog
+  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor) {
+    $(anchor).data({
+      'dialog-width': parseInt($($(anchor).attr('href').match("width=([0-9]*)")).last().get(0), 10)||928
+      , 'dialog-height': parseInt($($(anchor).attr('href').match("height=([0-9]*)")).last().get(0), 10)||473
+      , 'dialog-title': ($(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null)
+    }).attr('href', $(anchor).attr('href').replace(/(&(amp;)?|\?)(dialog=true|(width|height)=\d+)/g, '')
+                                          .replace(/(\/[^&\?]*)&(amp;)?/, '$1?'))
+    .click(function(e){
+      $anchor = $(this);
+      iframe_src = (iframe_src = $anchor.attr('href'))
+                   + (iframe_src.indexOf('?') > -1 ? '&' : '?')
+                   + 'app_dialog=true&dialog=true';
+
+      iframe = $("<iframe id='dialog_iframe' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>");
+      if(!$.browser.msie) { iframe.corner('8px'); }
+      iframe.dialog({
+        title: $anchor.data('dialog-title')
+        , modal: true
+        , resizable: false
+        , autoOpen: true
+        , width: $anchor.data('dialog-width')
+        , height: $anchor.data('dialog-height')
+        , open: onOpenDialog
+        , close: onCloseDialog
+      });
+
+      iframe.attr('src', iframe_src);
+      e.preventDefault();
     });
-
-    iframe.attr('src', iframe_src);
-    e.preventDefault();
   });
 };
 

data/app/assets/javascripts/refinery/submit_continue.js.coffee.erb

@@ -1,3 +1,4 @@
+<%# encoding: utf-8 %>
 @init_submit_continue = ->
   $("#submit_continue_button").click submit_and_continue
   $("form").change (e) ->

data/app/assets/javascripts/wymeditor/lang/nl.js

@@ -1,47 +1,57 @@
 WYMeditor.STRINGS['nl'] = {
-	Strong:			 'Sterk benadrukken',
-	Bold:			 'Vet',
-	Emphasis:		 'Benadrukken',
-	Superscript:		'Bovenschrift',
-	Subscript:		'Onderschrift',
-	Ordered_List:	 'Geordende lijst',
-	Unordered_List:	 'Ongeordende lijst',
-	Indent:			 'Inspringen',
-	Outdent:			'Terugspringen',
-	Undo:			 'Ongedaan maken',
-	Redo:			 'Opnieuw uitvoeren',
-	Link:			 'Linken',
-	Unlink:			 'Ontlinken',
-	Image:			'Afbeelding',
-	Table:			'Tabel',
-	HTML:			 'HTML',
-	Paragraph:		'Paragraaf',
-	Heading_1:		'Kop 1',
-	Heading_2:		'Kop 2',
-	Heading_3:		'Kop 3',
-	Heading_4:		'Kop 4',
-	Heading_5:		'Kop 5',
-	Heading_6:		'Kop 6',
-	Preformatted:	 'Voorgeformatteerd',
-	Blockquote:		 'Citaat',
-	Table_Header:	 'Tabel-kop',
-	URL:				'URL',
-	Title:			'Titel',
-	Alternative_Text: 'Alternatieve tekst',
-	Caption:			'Bijschrift',
-	Summary:			'Summary',
-	Number_Of_Rows:	 'Aantal rijen',
-	Number_Of_Cols:	 'Aantal kolommen',
-	Insert:			 'Invoegen',
-	Submit:			 'Versturen',
-	Cancel:			 'Annuleren',
-	Choose:			 'Kiezen',
-	Preview:			'Voorbeeld bekijken',
-	Paste_From_Word:	'Plakken uit Word',
-	Tools:			'Hulpmiddelen',
-	Containers:		 'Teksttypes',
-	Classes:			'Klassen',
-	Status:			 'Status',
-	Source_Code:		'Broncode',
-	Css_Class: 			'Gebruik CSS klasse'
+  Strong:           'Sterk benadrukken',
+  Bold:             'Vet',
+  Emphasis:         'Benadrukken',
+  Superscript:      'Bovenschrift',
+  Subscript:        'Onderschrift',
+  Ordered_List:     'Geordende lijst',
+  Unordered_List:   'Ongeordende lijst',
+  Indent:           'Inspringen',
+  Outdent:          'Terugspringen',
+  Undo:             'Ongedaan maken',
+  Redo:             'Opnieuw uitvoeren',
+  Link:             'Linken',
+  Unlink:           'Ontlinken',
+  Image:            'Afbeelding',
+  Table:            'Tabel',
+  HTML:             'HTML',
+  Paragraph:        'Paragraaf',
+  Heading_1:        'Kop 1',
+  Heading_2:        'Kop 2',
+  Heading_3:        'Kop 3',
+  Heading_4:        'Kop 4',
+  Heading_5:        'Kop 5',
+  Heading_6:        'Kop 6',
+  Preformatted:     'Voorgeformatteerd',
+  Blockquote:       'Citaat',
+  Table_Header:     'Tabel-kop',
+  URL:              'URL',
+  Title:            'Titel',
+  Alternative_Text: 'Alternatieve tekst',
+  Caption:          'Bijschrift',
+  Summary:          'Overzicht',
+  Number_Of_Rows:   'Aantal rijen',
+  Number_Of_Cols:   'Aantal kolommen',
+  Insert:           'Invoegen',
+  Submit:           'Versturen',
+  Cancel:           'Annuleren',
+  Choose:           'Kiezen',
+  Preview:          'Voorbeeld bekijken',
+  Paste_From_Word:  'Plakken uit Word',
+  Tools:            'Hulpmiddelen',
+  Containers:       'Teksttypes',
+  Classes:          'Klassen',
+  Status:           'Status',
+  Source_Code:      'Broncode',
+  Text_Align:       'Tekst uitlijnen',
+  Image_Align:      'Afbeelding uitlijnen',
+  Font_Size:        'Lettertype grootte',
+  Left:             'Links',
+  Right:            'Rechts',
+  Center:           'Midden',
+  Justify:          'Uitgevuld',
+  Small:            'Klein',
+  Normal:           'Normaal',
+  Large:            'Groot',
+  Apply_Style:      'Stijl'
 };

data/app/assets/javascripts/wymeditor/lang/pl.js

@@ -40,6 +40,17 @@ WYMeditor.STRINGS['pl'] = {
 	Containers:		 'Format',
 	Classes:			'Styl',
 	Status:			 'Status',
-	Source_Code:		'Kod źródłowy'
+	Source_Code:		'Kod źródłowy',
+	Apply_Style: 'Określ styl',
+	Text_Align: "Wyrównanie tekstu",
+	Left: "Do lewej",
+	Right: "Do prawej",
+	Center: "Do środka",
+	Justify: "Wyjustuj",
+	Image_Align: "Wyrównanie obrazka",
+	Font_Size: "Rozmiar teksru",
+	Small: "Mały",
+	Normal: "Normalny",
+	Large: "Duży"
 };
 

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

@@ -4,7 +4,7 @@ module Refinery
       def update_plugin_positions
         params[:menu].each_with_index do |plugin_name, index|
           if (plugin = current_refinery_user.plugins.find_by_name(plugin_name))
-            plugin.update_attribute(:position, index)
+            plugin.update_attributes :position => index
           end
         end
         render :nothing => true

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

@@ -1,26 +1,42 @@
 module ::Refinery
   module Admin
     class DialogsController < ::Refinery::AdminController
+      TYPES = %w[image link]
+
+      before_filter :find_dialog_type, :find_iframe_src, :only => [:show]
+
       def index
         redirect_to refinery.admin_root_path
       end
 
       def show
-        @dialog_type = params[:id].downcase
+        render :layout => false
+      end
+
+      def from_dialog?
+        true
+      end
+
+      protected
+      def find_dialog_type
+        error_404 if TYPES.exclude? params[:id].downcase
 
-        url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
+        @dialog_type = params[:id].downcase
+      end
 
-        @iframe_src = if @dialog_type == 'image'
-          refinery.insert_admin_images_path(url_params.merge(:id => nil, :modal => true))
+      def find_iframe_src
+        if @dialog_type == 'image'
+          @iframe_src = refinery.insert_admin_images_path(
+            url_params.merge(:modal => true)
+          )
         elsif @dialog_type == 'link'
-          refinery.link_to_admin_pages_dialogs_path(url_params.merge(:id => nil))
+          @iframe_src = refinery.link_to_admin_pages_dialogs_path url_params
         end
-
-        render :layout => false
       end
 
-      def from_dialog?
-        true
+      def url_params
+        params.reject {|key, value| /(action)|(controller)/ === key}.
+               merge :id => nil
       end
 
     end

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

@@ -64,7 +64,9 @@
                 :title => delete_title,
                 :id => delete_button_id,
                 :method => :delete,
-                :confirm => delete_confirmation,
+                :data => {
+                  :confirm => delete_confirmation
+                },
                 :class => "button confirm-delete") unless hide_delete %>
     <%= local_assigns[:after_delete_button] -%>
   </div>

data/lib/generators/refinery/dummy/dummy_generator.rb

@@ -31,8 +31,8 @@ module Refinery
       @database = options[:database]
 
       template "rails/database.yml", "#{dummy_path}/config/database.yml", :force => true
-      template "rails/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
-      template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
+      template "rails/boot.rb.erb", "#{dummy_path}/config/boot.rb", :force => true
+      template "rails/application.rb.erb", "#{dummy_path}/config/application.rb", :force => true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
       template "rails/Rakefile", "#{dummy_path}/Rakefile", :force => true
     end

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

@@ -7,7 +7,11 @@ module Refinery
 
     include Refinery::ExtensionGeneration
 
-    class_option :skip_frontend, :type => :boolean, :default => false, :required => false, :desc => 'Generate extension without frontend'
+    class_option :skip_frontend,
+                 :desc => 'Generate extension without frontend',
+                 :type => :boolean,
+                 :default => false,
+                 :required => false
 
     def skip_frontend?
       options[:skip_frontend]

data/lib/generators/refinery/engine/templates/app/models/refinery/namespace/{singular_name.rb → singular_name.rb.erb}

@@ -3,7 +3,8 @@ module Refinery
     class <%= class_name %> < Refinery::Core::BaseModel
 <% if table_name == namespacing.underscore.pluralize -%>
       self.table_name = 'refinery_<%= plural_name %>'
-<% end -%>
+<% end %>
+      attr_accessible <%= names_for_attr_accessible.map { |n| ":#{n}" }.join(', ') %>, :position
 <% if localized? -%>
 
       translates <%= localized_attributes.map{|a| ":#{a.name}"}.join(', ') %>
@@ -12,9 +13,7 @@ module Refinery
         attr_accessible :locale
       end
 <% end -%>
-<% if (string_attributes = attributes.select{ |a| a.type.to_s =~ /string|text/ }.uniq).any? -%>
-
-      attr_accessible <%= attributes.map { |attr| ":#{attr.name}" }.join(', ') %>, :position
+<% if string_attributes.any? -%>
 
       acts_as_indexed :fields => <%= string_attributes.map{|s| s.name.to_sym}.inspect %>
 
@@ -26,14 +25,13 @@ module Refinery
         "Override def title in vendor/extensions/<%= namespacing.underscore %>/app/models/refinery/<%= namespacing.underscore %>/<%= singular_name %>.rb"
       end
 <% end -%>
-<% attributes.select{|a| a.type.to_s == 'image'}.uniq.each do |a| -%>
+<% image_attributes.each do |a| -%>
 
-      belongs_to :<%= a.name.gsub("_id", "") -%>, :class_name => '::Refinery::Image'
+      belongs_to :<%= a.name -%>, :class_name => '::Refinery::Image'
 <% end -%>
-<% attributes.select{|a| a.type.to_s == 'resource'}.uniq.each do |a| -%>
-
-      belongs_to :<%= a.name.gsub("_id", "") %>, :class_name => '::Refinery::Resource'
+<% resource_attributes.each do |a| -%>
 
+      belongs_to :<%= a.name %>, :class_name => '::Refinery::Resource'
 <% end -%>
     end
   end

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb

@@ -30,4 +30,4 @@
         :confirm => t('message', :scope => 'refinery.admin.delete', :title => <%= singular_name %>.<%= title_attribute %>),
         :method => :delete %>
   </span>
-</li>
+</li>

data/lib/generators/refinery/engine/templates/config/locales/sk.yml

@@ -0,0 +1,28 @@
+sk:
+  refinery:
+    plugins:
+      <%= plural_name %>:
+        title: <%= plural_name.titleize %>
+    <%= namespacing.underscore %>:
+      admin:
+        <%= plural_name %>:
+          actions:
+            create_new: Pridať <%= singular_name.titleize %>
+            reorder: Preusporiadať <%= singular_name.titleize.pluralize %>
+            reorder_done: Koniec radenia <%= singular_name.titleize.pluralize %>
+          records:
+            title: <%= plural_name.titleize %>
+            sorry_no_results: Ľutujeme, ale neboli nájdené žiadne výsledky.
+            no_items_yet: Nie sú vytvorené žiadne <%= singular_name.titleize.pluralize %>. Kliknite na "Pridať <%= singular_name.titleize %>" pre pridanie prvého <%= singular_name.titleize.downcase %>.
+          <%= singular_name %>:
+            view_live_html: Zobraziť náhľad <%= singular_name.titleize.downcase %><br/><em>(otvorí sa v novom okne)</em>
+            edit: Upraviť <%= singular_name.titleize.downcase %>
+            delete: Zmazať <%= singular_name.titleize.downcase %>
+      <%= plural_name %>:
+        show:
+          other: Daľšie <%= singular_name.titleize.pluralize %>
+  activerecord:
+    attributes:
+      'refinery/<%= namespacing.underscore %>/<%= singular_name %>':<% attributes.each do |a| %>
+        <%= a.name %>: <%= a.name.titleize -%>
+<% end -%>