refinerycms 0.9.7.5 → 0.9.7.6

data/vendor/plugins/pages/app/controllers/admin/{page_dialogs_controller.rb → pages_dialogs_controller.rb}

@@ -1,4 +1,4 @@
-class Admin::PageDialogsController < Admin::DialogsController
+class Admin::PagesDialogsController < Admin::DialogsController
 
   require 'net/http'
 
@@ -10,7 +10,9 @@ class Admin::PageDialogsController < Admin::DialogsController
                              :order => 'position ASC',
                              :per_page => Page.per_page(dialog=true)
 
-    @resources = Resource.paginate :page => params[:resource_page], :order => 'created_at DESC', :per_page => Resource.per_page(dialog=true)
+    @resources = Resource.paginate :page => params[:resource_page],
+                                   :order => 'created_at DESC',
+                                   :per_page => Resource.per_page(dialog=true)
 
     # web address link
     @web_address_text = "http://"
@@ -51,12 +53,12 @@ class Admin::PageDialogsController < Admin::DialogsController
 
       response = http.request request
 
-      render :json => case response
+      render :json => {:result => case response
       when Net::HTTPSuccess, Net::HTTPRedirection
-        {:result => 'success'}
+        'success'
       else
-        {:result => 'failure'}
-      end
+        'failure'
+      end }
     end
 
     rescue

data/vendor/plugins/pages/app/models/page.rb

@@ -5,7 +5,7 @@ class Page < ActiveRecord::Base
 
   # Docs for friendly_id http://github.com/norman/friendly_id
   has_friendly_id :title, :use_slug => true,
-    :reserved_words => %w(index new session login logout users refinery admin images wymiframe)
+                  :reserved_words => %w(index new session login logout users refinery admin images wymiframe)
 
   has_many :parts, :class_name => "PagePart", :order => "position ASC", :inverse_of => :page
   accepts_nested_attributes_for :parts, :allow_destroy => true

data/vendor/plugins/pages/app/views/admin/{page_dialogs → pages_dialogs}/link_to.html.erb

@@ -27,14 +27,14 @@
           <ul class="link_list">
             <%= render :partial => "page_link", :collection => @pages, :locals => {:child => false} %>
           </ul>
+          <%= will_paginate @pages,
+                            :param_name => :page,
+                            :previous_label => '&laquo;',
+                            :next_label => '&raquo;',
+                            :renderer => Refinery::LinkRenderer,
+                            :id => 'pages_paginate' %>
         </div>
       </div>
-      <%= will_paginate @pages,
-                        :param_name => :page,
-                        :previous_label => '&laquo; Previous',
-                        :next_label => 'Next &raquo;',
-                        :renderer => Refinery::LinkRenderer,
-                        :url => {:paginating => "your_page"} %>
     </div>
     <div id='web_address_area' <%= "style='display: none'" unless @web_address_area_selected %> class='dialog_area'>
       <div id='web_address_content'>
@@ -90,7 +90,7 @@
         </ol>
       </div>
     </div>
-    <div id="resource_file_area" <%= "style='display:none'" unless @resource_area_selected %> class="dialog_area">
+    <div id="resource_file_area"<%= " style='display:none'" unless @resource_area_selected %> class="dialog_area">
       <div id='pages_list'>
         <ul class="link_list">
           <% @resources.each do |resource| -%>
@@ -98,7 +98,8 @@
             <li<%= " class='linked'" if @resource_linked %>>
               <%= link_to "#{resource.title}.#{resource.filename.split('.')[1]}", resource.public_filename,
                           :title => t('.your_resource.link_to_this_resource'),
-                          :rel => resource.title, :class => "page_link #{resource.filename.split('.')[1]}" %>
+                          :rel => resource.title,
+                          :class => "page_link #{resource.filename.split('.')[1]}" %>
             </li>
           <% end %>
         </ul>
@@ -107,7 +108,8 @@
                           :previous_label => '&laquo;',
                           :next_label => '&raquo;',
                           :renderer => Refinery::LinkRenderer,
-                          :url => {:paginating => "resource_file"} %>
+                          :url => {:paginating => "resource_file"},
+                          :id => 'resouces_paginate' %>
       </div>
     </div>
   </div>

data/vendor/plugins/pages/config/locales/en.yml

@@ -3,7 +3,7 @@ en:
     refinery_pages:
       title: Pages
   admin:
-    page_dialogs:
+    pages_dialogs:
       not_allowed: You do not have permission to access this feature.
       page_link:
         link_to_this_page: Link to this page

data/vendor/plugins/pages/config/locales/pt-BR.yml

@@ -21,6 +21,32 @@ pt-BR:
         meta_description_help: Meta descrição
         show_in_menu: Mostrar no menu
   admin:
+    pages_dialogs:
+      not_allowed: Você não ter permissão para acessar esta funcionalidade.
+      page_link:
+        link_to_this_page: Redirecionar para esta página
+      link_to:
+        your_page:
+          tab_name: Sua página
+        web_address:
+          tab_name: Website
+          location: Localização
+          new_window: Nova janela
+          new_window_label: Marque essa opção que o link abra uma nova janela no navegador.
+          not_sure: Não sabe ao certo o que colocar na caixa acima?
+          step1: Procure o site na web para onde você quer redirecionar.
+          step2: "Copie o endereço do site da barra de navegação do seu navegador e cole na caixa acima."
+        email_address:
+          tab_name: Endereço de email
+          subject_line_optional: Título opcional
+          body_optional: Corpo opcional
+          not_sure: Não sabe ao certo o que colocar na caixa acima?
+          step1: "Escreva ou copie e cole (ex. do seu catálogo de email) o endereço de email e coloque dentro do '<strong>Email address</strong>' na caixa acima."
+          step2: "Use o '<strong>Subject Line</strong>' na caixa acima se você quer que a mensagem seja composta por <strong>pre-written subject line</strong>."
+          step3: "Use o <strong>Email Body</strong> na caixa acima se você quer que a mensagem seja composta por <strong>pre-written message</strong>."
+        your_resource:
+          tab_name: Seu arquivo
+          link_to_this_resource: Link para este arquivo
     pages:
       page:
         view_live: Vizualizar essa página agora <br/><em>(irá abrir uma nova janela)</em>
@@ -30,6 +56,7 @@ pt-BR:
         hidden: oculta
         draft: rascunho
       form_advanced_options:
+        toggle_advanced_options: Clique aqui para acessar as configurações de meta tag e opções do menu
         create_content_section: Criar seção de conteúdo
         delete_content_section: Remover seção de conteúdo
         advanced_options: Opções Avançadas

data/vendor/plugins/pages/config/locales/sl.yml

@@ -3,7 +3,7 @@ sl:
     refinery_pages:
       title: Strani
   admin:
-    page_dialogs:
+    pages_dialogs:
       not_allowed: Nimate pravic za dostop do te funkcionalnosti.
       page_link:
         link_to_this_page: Naredi povezavo do te strani

data/vendor/plugins/pages/config/routes.rb

@@ -4,8 +4,10 @@ ActionController::Routing::Routes.draw do |map|
   map.namespace(:admin, :path_prefix => 'refinery') do |admin|
     admin.resources :pages, :collection => {:update_positions => :post}
     admin.resources :page_parts
-
-    admin.resources :pages_dialogs, :as => "pages/dialogs", :controller => :page_dialogs,
-                    :collection => {:link_to => :get, :test_url => :get, :test_email => :get}
+    admin.resources :pages_dialogs, :as => 'pages/dialogs', :collection => {
+      :link_to => :get,
+      :test_url => :get,
+      :test_email => :get
+    }
   end
 end

data/vendor/plugins/pages/rails/init.rb

@@ -4,7 +4,7 @@ Refinery::Plugin.register do |plugin|
   plugin.directory = "pages"
   plugin.description = "Manage content pages"
   plugin.version = 1.0
-  plugin.menu_match = /(refinery|admin)\/page(_dialog|_part)?s$/
+  plugin.menu_match = /(refinery|admin)\/page(_part)?s(_dialogs)?$/
   plugin.activity = {
     :class => Page,
     :url_prefix => "edit",

data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb

@@ -1,15 +1,21 @@
 <%
-  submit_button_text ||= t('.save')
-  submit_button_id   ||= "submit_button"
-  submit_button_title ||= nil
+  unless (hide_submit ||= false)
+    submit_button_text  ||= t('.save')
+    submit_button_id    ||= "submit_button"
+    submit_button_title ||= nil
+  end
+
+  unless defined?(hide_cancel).presence
+    hide_cancel = from_dialog?
+  end
 
-  cancel_button_text ||= t('.cancel')
-  cancel_title       ||= t('.cancel_lose_changes', :object_name => f.object.class.name.underscore.gsub("_", " "))
-  cancel_button_id   ||= "cancel_button"
-  hide_cancel        ||= from_dialog?
-  cancel_url         ||= (( back = url_for(:back)).include?('javascript') ? send("admin_#{f.object.class.name.pluralize.underscore}_url") : back) unless hide_cancel
+  unless hide_cancel
+    cancel_button_text  ||= t('.cancel')
+    cancel_title        ||= t('.cancel_lose_changes', :object_name => f.object.class.name.underscore.gsub("_", " "))
+    cancel_button_id    ||= "cancel_button"
 
-  delete_button_text ||= t('.delete')
+    cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? send("admin_#{f.object.class.name.pluralize.underscore}_url") : back)
+  end
 
   continue_editing = defined?(continue_editing) ? continue_editing : (f.object.present? and !f.object.new_record?)
 
@@ -20,6 +26,7 @@
   end
 
   unless hide_delete
+    delete_button_text ||= t('.delete')
     delete_title       ||= nil
     delete_button_id   ||= "delete_button"
     delete_url         ||= eval("admin_#{f.object.class.name.underscore}_url(#{f.object.id})")
@@ -30,7 +37,7 @@
     <%= submit_tag submit_button_text,
                    :id => submit_button_id,
                    :class => "wymupdate button",
-                   :tooltip => submit_button_title %>
+                   :tooltip => submit_button_title unless hide_submit %>
 
     <%= render :partial => "/shared/admin/continue_editing", :locals => {:f => f} if continue_editing -%>
     <%= hidden_field_tag :continue_editing, false %>
@@ -49,8 +56,8 @@
                 :class => "button confirm-delete") unless hide_delete %>
 
     <%= will_paginate paginate[:collection],
-                      :previous_label => '&laquo; ' + t('.previous'),
-                      :next_label => t('.next') + ' &raquo;',
+                      :previous_label => paginate[:previous_label] ||= "&laquo; #{t('.previous')}",
+                      :next_label => paginate[:next_label] ||= "#{t('.next')} &raquo;",
                       :renderer => Refinery::LinkRenderer,
                       :url => paginate[:url] if ((paginate ||= {}).length > 0 &&
                                                   paginate.keys.include?(:collection) &&

data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb

@@ -3,15 +3,21 @@
   thumbnail ||= "medium"
   toggle_image_display ||= false
   randomiser = rand(Time.now.yesterday.to_i * Time.now.to_i)
+  current_image_link_href = insert_admin_images_url(:dialog => true,
+                                                    :callback => "image_picker_#{randomiser}_changed",
+                                                    :width => 866,
+                                                    :height => 510)
+  current_image_title = t('.change', :what =>  description.titleize)
 -%>
 <%= link_to t('.show'), "", :id => "current_image_toggler_#{randomiser}" if toggle_image_display %>
 <%= f.hidden_field field, :id => "current_image_id_#{randomiser}" -%>
 
 <div id='current_image_container_<%= randomiser %>'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
-<%# TODO translate update :what of .change %>
-  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url(:dialog => true, :callback => "image_picker_#{randomiser}_changed", :width => 958, :height => 510) %>" style='border: 0px' title='<%= t('.change', :what =>  description.titleize) %>' name='<%= t('.change', :what => description.titleize) %>' class='dialog'>
+  <a id='current_image_link_<%= randomiser %>' href="<%= current_image_link_href %>" style='border: 0px' title='<%= current_image_title  %>' name='<%= current_image_title %>' class='dialog'>
     <% unless image.nil? -%>
-      <%= image_fu image, :medium, {:class => "brown_border", :id => "current_picked_image_#{randomiser}"} %>
+      <%= image_fu image, :medium,
+                   :class => "brown_border",
+                   :id => "current_picked_image_#{randomiser}" %>
     <% else -%>
       <img id="current_picked_image_<%= randomiser %>" class="" src="" alt="" style='display: none' />
     <% end -%>
@@ -20,12 +26,16 @@
     </span>
   </a>
   <br/>
-  <%= link_to t('.remove_current', :what => t('.' + description )), "#", :id => "remove_picked_image_#{randomiser}", :style => "#{"display:none;" if image.nil?}" %>
+  <%= link_to t('.remove_current', :what => t('.' + description )), "#",
+              :id => "remove_picked_image_#{randomiser}",
+              :style => "#{"display:none;" if image.nil?}" %>
 </div>
 
+<%#
+  We're so un-object-oriented here. We need to rewrite the jQuery admin.js file to use OO.
+%>
 <% content_for :head do -%>
   <script type='text/javascript'>
-    // We're so un-object-oriented here. We need to rewrite the jQuery admin.js file to use OO.
     var image_picker_<%= randomiser %>_options = {
       thumbnail: '<%= thumbnail %>'
       , image_toggler: '<%= toggle_image_display ? "#current_image_toggler_#{randomiser}" : "null" %>'

data/vendor/plugins/refinery/config/locales/pt-BR.yml

@@ -49,6 +49,7 @@ pt-BR:
         remove_current: "Remover {{what}} atual"
         change: Clique aqui para selecionar a imagem
         image: imagem
+        show: Mostrar
       resource_picker:
         none_selected: "Atualmente não existe nenhum {{what}} selecionado, por favor clique aqui para adicionar um."
         current: "{{what}} atual"
@@ -58,6 +59,7 @@ pt-BR:
         resource: recurso
     message:
       close: Fechar
+      close_this_message: Fechar esta mensagem
   activerecord:
     models:
       page: página

data/vendor/plugins/refinery/lib/refinery.rb

@@ -25,7 +25,7 @@ module Refinery
 
   class Version
     def self.to_s
-      %q{0.9.7.5}
+      %q{0.9.7.6}
     end
   end
 

data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb

@@ -54,7 +54,6 @@ protected
     Refinery::Plugins.set_active( current_user.authorized_plugins ) if current_user.respond_to? :plugins
   end
 
-  #TODO Translate
   def restrict_controller
     if Refinery::Plugins.active.reject { |plugin|
       params[:controller] !~ Regexp.new(plugin.menu_match) and

data/vendor/plugins/refinery/lib/refinery/initializer.rb

@@ -26,7 +26,7 @@ module Refinery
 
       # just use lib paths from Refinery engines
       paths = paths.reject{|path| path.scan(/lib$/).empty? or path.include?('/rails-') }
-      
+
       # reject Refinery lib paths if they're already included in this app.
       paths = paths.reject{ |path| path.include?(Refinery.root.to_s) } unless Refinery.is_a_gem
       paths.uniq!
@@ -34,7 +34,7 @@ module Refinery
       # Save the paths to a global variable so that the application can access them too
       # and unshift them onto the load path.
       ($refinery_gem_plugin_lib_paths = paths).each { |path| $LOAD_PATH.unshift(path) }
-      
+
       # Ensure we haven't caused any duplication
       $LOAD_PATH.uniq!
     end

data/vendor/plugins/refinery/lib/refinery/link_renderer.rb

@@ -1,6 +1,11 @@
 class Refinery::LinkRenderer < WillPaginate::LinkRenderer
 
+  attr_accessor :url
+
   def url_for(page)
+    # extract any url parameter and store it for subsequent requests but delete it
+    # this is so that we don't end up with it being an attribute of the resulting HTML.
+    @url ||= @options.delete(:url) || {}
     page_one = page == 1
     @url_params = {}
     # page links should preserve GET parameters
@@ -15,8 +20,7 @@ class Refinery::LinkRenderer < WillPaginate::LinkRenderer
       @url_params[param_name] = page_one ? 1 : 2
     end
 
-    url = @template.url_for(@url_params.merge!(@options[:url]||{}).to_options)
-    #@options.delete(:url) # no, don't! We want it to use the url every time.
+    url = @template.url_for(@url_params.merge!(@url).to_options)
     return url if page_one
 
     if complex

data/vendor/plugins/refinery/lib/tasks/refinery.rake

@@ -106,7 +106,7 @@ namespace :refinery do
     FileUtils::makedirs dirs.map {|dir| File.join(Rails.root, dir) }
 
     # copy in the new assets.
-    assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor), %w(public images wymeditor skins refinery), %w(public images refinery), %w(public stylesheets wymeditor skins refinery), %w(public javascripts jquery)]
+    assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor), %w(public images wymeditor skins refinery), %w(public images refinery), %w(public stylesheets wymeditor skins refinery), %w(public javascripts jquery), %w(lib refinery), %w(.gitignore)]
     assets.each do |asset|
       FileUtils::rm_rf File.join(Rails.root, asset), :secure => true, :verbose => verbose # ensure the destination is clear.
       FileUtils::cp_r File.join(Refinery.root, asset), File.join(Rails.root, asset), :verbose => verbose # copy the new assets into the project.

data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb

@@ -3,9 +3,7 @@ class Admin::DialogsController < Admin::BaseController
   layout 'admin_dialog'
 
   def show
-    @dialog_type = params[:id].try(:downcase)
-
-    if @dialog_type
+    if (@dialog_type = params[:id].try(:downcase))
       @submit_button_text = "Insert"
       @cancel_button_text = "Cancel"
 
@@ -14,7 +12,7 @@ class Admin::DialogsController < Admin::BaseController
       @iframe_src = if @dialog_type == 'image'
         insert_admin_images_url(:modal => true)
       elsif @dialog_type == 'link'
-        link_to_admin_pages_dialogs_url(url_params)
+        link_to_admin_pages_dialogs_url(url_params.merge(:id => nil))
       end
 
       render :layout => false

data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb

@@ -14,13 +14,13 @@ class Admin::RefinerySettingsController < Admin::BaseController
   def find_all_refinery_settings
     @refinery_settings = RefinerySetting.find :all,
                                               :order => "name ASC",
-                                              :conditions => current_user.has_role?(:superuser) ? nil : {:restricted => false}
+                                              :conditions => current_user.has_role?(:superuser) ? nil : ["restricted IS NOT ?", true]
   end
 
   def paginate_all_refinery_settings
     @refinery_settings = RefinerySetting.paginate :page => params[:page],
                                                   :order => "name ASC",
-                                                  :conditions => current_user.has_role?(:superuser) ? nil : {:restricted => false}
+                                                  :conditions => current_user.has_role?(:superuser) ? nil : ["restricted IS NOT ?", true]
   end
 
 private

data/vendor/plugins/refinery_settings/config/locales/pt-BR.yml

@@ -23,23 +23,23 @@ pt-BR:
         help:
           restricted: Isso faz com que essa opção só seja vista ou editada por super-usuários (como você).
       help:
-        activity_show_limit: This limits the number of items that can display in the Dashboard listing.
-        analytics_page_code: This code activates Google Analytics tracking within your website. If the setting is left blank or set to UA-xxxxxx-x then this is disabled and no remote calls to Google Analytics are made.
-        image_dialogue_sizes: This setting applies to the Insert Image dialogue. You must implement the different thumbnail sizes as well as changing this.
-        image_thumbnails: If you modify this setting you will have to regenerate your images by running rake images:regenerate (or rake images:update if you only added more thumbnails) otherwise the setting will not apply to existing images.
-        menu_hide_children: Hide any subpages from the menu even if they are present.
-        new_page_parts: Enable adding new page parts (content sections) in the page editors.
-        page_title: Very complex options for setting the page title. Here you can set custom CSS class or a different tag or tell it to breadcrumb with pages in its ancestry.
-        page_advanced_options_include_seo: This controls whether the SEO options are displayed in the advanced options for a page.
-        preferred_image_view: This controls which view the images plugin displays existing images in - grid for 'Grid View' and list for 'List View'. There is a button to automate this process on the images plugin itself.
-        refinery_enable_backend_reordering: You can remove the ability to reorder the plugins' display order with this.
-        refinery_menu_cache_action_suffix: This controls the key that is used to cache the site menu. If you are using a theme then it is better to leave this as the default as the theme will handle it.
-        show_contact_privacy_link: You can hide or show the link to the privacy policy page on the contact form by the submit button.
-        site_name: This is the name for your website and will display in the header and in the Refinery backend and in the footer copyright statement for some themes.
-        theme: Enter the name for the theme that you want to be enabled. This will take effect immediately and must correctly identify an existing theme for this to work.
-        use_google_ajax_libraries: If you want to use Google's AJAX CDN then set this to true.
-        use_marketable_urls: Changes urls from /pages/about to /about and automatically manages conflicts with other plugins.
-        use_resource_caching: Recommended to enable this in production mode as it bundles javascript assets and stylesheet assets into single file packages to reduce the number of web requests on your site and speed it up.
+        activity_show_limit: Número de itens mostrados na lista de atividades do Dashboard.
+        analytics_page_code: Habilita o código do Google Analytics em seu website. Se deixar em branco ou digitar UA-xxxxxx-x será considerado desabilitado e a chamada remota para o Google Analytics não será feita.
+        image_dialogue_sizes: Estas configurações se aplicam ao diálogo de Inserção de Imagens. Você deve alterar os tamanhos de thumbnail conforme suas modifcações.
+        image_thumbnails: "Se você modificar estas configurações, terá que gerar novamente as imagens usando o comando rake images:regenerate (ou rake images:update se você somente adicionou novos thumbnails) caso contrário, as modificações não terão efeito sobre imagens existentes."
+        menu_hide_children: Esconde qualquer sub-página do menu mesmo se estiver presente.
+        new_page_parts: Habilita a criação de novos pedaços de página (seção de conteúdo) no editor de páginas.
+        page_title: Opções avançadas de configuração do título da página. Você pode colocar um CSS customizado ou uma tag diferente ou pedir para navegar entre as páginas pais.
+        page_advanced_options_include_seo: Habilita as configurações avançadas de SEO nas opções avançadas da edição de páginas.
+        preferred_image_view: Habilita o tipo de visualição da seção imagens - grid para 'Visualizar em Grid' e list para 'Visualizar em Lista'. Há um botão para automatizar este processo no plugin de imagens.
+        refinery_enable_backend_reordering: Habilita a ordenação do menu administrativo.
+        refinery_menu_cache_action_suffix: Configura o sufixo do nome usado para fazer cache do menu do site. Se você está usando um tema é melhor deixar o nome padrão e deixar o tema gerenciar essa configuração.
+        show_contact_privacy_link: Você pode esconder ou mostrar o link para a política de privacidade no formulário de contato.
+        site_name: "Nome do site, que será mostrado no topo e rodapé do seu website e também na área administrativa."
+        theme: Tema utilizado pelo site. Será trocado o tema imediatamente e deverá ser um tema válido e existente no sitema para que funcione.
+        use_google_ajax_libraries: Se você quer usar as bibliotecas AJAX externas oferecidas pelo Google configure como true.
+        use_marketable_urls: Muda as urls de /pages/about para /about e automaticamente gerencia conflitos com outros plugins.
+        use_resource_caching: "Recomendado habilitar está opção em produção pois os javascript e stylesheet serão colocados em um único arquivo, o que diminui o número de requisições e aumenta a velocidade do site."
   plugins:
     refinery_settings:
       title: Configuração