RubyGems - refinerycms - Versions diffs - 0.9.8 → 0.9.8.1 - Mend

refinerycms 0.9.8 → 0.9.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (134) hide show

data/vendor/refinerycms/core/app/views/admin/_menu_tab.html.erb CHANGED

@@ -1,4 +1,4 @@
 <li class='tab' id='plugin_<%= menu_tab.name %>' name='plugin[<%= menu_tab.name %>]'>
-  <%= link_to t('plugins.' + menu_tab.name + '.title', :default => menu_tab.title), menu_tab.url,
-              :class => (menu_tab.highlighted?(params) ? "active" : nil) -%>
+  <%= link_to t("plugins.#{menu_tab.name}.title", :default => menu_tab.title), menu_tab.url,
+              :class => ("active" if menu_tab.highlighted?(params)) -%>
 </li>

data/vendor/refinerycms/core/app/views/layouts/admin.html.erb CHANGED

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <%= render :partial => "/admin/head" %>
+  <%= render :partial => "/admin/head", :locals => {:login => false} %>
   <body class='<%= action_name %>'>
     <%= render :partial => '/shared/site_bar' %>
     <div id='tooltip_container'></div>

data/vendor/refinerycms/core/app/views/layouts/admin_dialog.html.erb CHANGED

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <%= render :partial => "/admin/head" %>
+  <%= render :partial => "/admin/head", :locals => {:login => false} %>
   <body id='dialog_container' class='dialog'>
     <div id='tooltip_container'></div>
     <div id="flash_container">

data/vendor/refinerycms/core/app/views/shared/_footer.html.erb CHANGED

@@ -1,5 +1,5 @@
 <div id='footer_content'>
   <p>
-    <%= t('.copyright').html_safe -%> <%= Time.now.year -%> <%= RefinerySetting[:site_name] %>
+    <%= t('.copyright').html_safe -%> <%= Time.now.year -%> <%= RefinerySetting.get(:site_name) %>
   </p>
 </div>

data/vendor/refinerycms/core/app/views/shared/_google_analytics.html.erb CHANGED

@@ -1,5 +1,5 @@
 <% unless refinery_user? or
-          (page_code = RefinerySetting[:analytics_page_code].to_s.strip) =~ /^(UA-xxxxxx-x)?$/ -%>
+          (page_code = RefinerySetting.get(:analytics_page_code).to_s.strip) =~ /^(UA-xxxxxx-x)?$/ -%>
   <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '<%= page_code %>']);

data/vendor/refinerycms/core/app/views/shared/_header.html.erb CHANGED

@@ -1,5 +1,5 @@
 <div id='header_content'>
-  <h1><%= link_to RefinerySetting[:site_name], root_url(:only_path => true) %></h1>
+  <h1><%= link_to RefinerySetting.get(:site_name), root_url(:only_path => true) %></h1>
   <%= render :partial => "/shared/menu",
              :locals => {
                :dom_id => 'menu',

data/vendor/refinerycms/core/app/views/shared/_menu.html.erb CHANGED

@@ -1,19 +1,22 @@
 <%
   dom_id ||= 'menu'
   css ||= 'menu'
+  hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) unless defined?(hide_children)
   cache_key = [Refinery.base_cache_key]
   cache_key << RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")
   cache_key << request.path
   cache(cache_key.join('_')) do
     if (collection ||= @menu_pages).any?
+      sibling_count = collection.size - 1
 -%>
       <nav id='<%= dom_id %>' class='<%= %W(#{css} clearfix).join(' ') %>'>
         <ul>
           <%= render :partial => "/shared/menu_branch",
                      :collection => collection,
                      :locals => {
-                       :hide_children => hide_children ||= RefinerySetting.find_or_set(:menu_hide_children, false),
-                       :sibling_count => collection.size - 1
+                       :hide_children => hide_children,
+                       :sibling_count => sibling_count,
+                       :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
                      }
           -%>
         </ul>

data/vendor/refinerycms/core/app/views/shared/_menu_branch.html.erb CHANGED

@@ -1,6 +1,9 @@
 <%
-  css = (css = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil)).any? ? " class='#{css.join(' ')}'" : nil
-  dom_id = (menu_branch.parent_id.nil? and menu_branch.title.present?) ? " id='item_#{menu_branch_counter}'" : nil
+  css = if ((defined?(apply_css) && apply_css) || !defined?(apply_css)) and
+           (classes = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil)).any?
+    " class='#{classes.join(' ')}'"
+  end
+  dom_id = (" id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
 -%>
 <li<%= css -%><%= dom_id -%>>
   <%= link_to menu_branch.title, menu_branch.url %>
@@ -12,7 +15,7 @@
         render :partial => "/shared/menu_branch",
                :collection => children,
                :locals => {
-                 :hide_children => hide_children,
+                 :hide_children => false, # hide children can't be true or we wouldn't get here.
                  :sibling_count => children.size - 1
                } -%>
     </ul>

data/vendor/refinerycms/core/app/views/shared/_site_bar.html.erb CHANGED

@@ -1,4 +1,4 @@
-<% if refinery_user? and !login? %>
+<% if refinery_user? %>
   <% unless admin? # jquery scripts should already be cached when using the site bar as login has happened. %>
     <% content_for :site_bar_assets do %>
       <%= stylesheet_link_tag('refinery/site_bar') unless exclude_css ||= false %>
@@ -11,27 +11,23 @@
   <% end -%>
   <div id='site_bar'>
     <div id='site_bar_content' class='clearfix'>
-      <% unless login? %>
-        <div id='editor_switch'>
-          <%= site_bar_switch_link -%>
-        </div>
-      <% end %>
+      <div id='editor_switch'>
+        <%= site_bar_switch_link -%>
+      </div>
       <%= link_to image_tag("#{"http://refinerycms.com/images/" unless local_request?}refinery/logo-site-bar.png",
                             :alt => "Refinery (tm) Content Manager"),
                   'http://refinerycms.com',
                   :target => '_blank',
                   :id => 'site_bar_refinery_cms_logo' %>
-      <% unless login? %>
-        <div id='site_bar_branding'>
-          <span id='site_bar_company_name'>
-            <%= RefinerySetting.find_or_set(:site_name, 'Company Name') %>
-          </span>
+      <div id='site_bar_branding'>
+        <span id='site_bar_company_name'>
+          <%= RefinerySetting.find_or_set(:site_name, 'Company Name') %>
+        </span>
-          <%= link_to t('.log_out'), logout_url(:only_path => true),
-                      :id => 'logout' %>
-        </div>
-      <% end %>
+        <%= link_to t('.log_out'), logout_url(:only_path => true),
+                    :id => 'logout' %>
+      </div>
     </div>
   </div>
 <% end %>

data/vendor/refinerycms/core/app/views/shared/admin/_form_actions.html.erb CHANGED

@@ -59,6 +59,7 @@
                 delete_url,
                 :title => delete_title,
                 :id => delete_button_id,
+                :'data-method' => :delete,
                 :'data-confirm' => delete_confirmation,
                 :class => "button confirm-delete") unless hide_delete %>

data/vendor/refinerycms/core/app/views/shared/admin/_image_picker.html.erb CHANGED

@@ -1,6 +1,6 @@
 <%
   description ||= "image"
-  thumbnail ||= "medium"
+  thumbnail ||= "225x255>"
   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,
@@ -15,7 +15,7 @@
 <div id='current_image_container_<%= randomiser %>'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
   <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,
+      <%= image_fu image, thumbnail,
                    :class => "brown_border",
                    :id => "current_picked_image_#{randomiser}" %>
     <% else -%>
@@ -37,7 +37,7 @@
 <% content_for :head do -%>
   <script type='text/javascript'>
     var image_picker_<%= randomiser %>_options = {
-      thumbnail: '<%= thumbnail %>'
+      thumbnail: '<%= thumbnail.html_safe %>'
       , image_toggler: '<%= toggle_image_display ? "#current_image_toggler_#{randomiser}" : "null" %>'
       , description: '<%= description %>'
       , field: '#current_image_id_<%= randomiser %>'

data/vendor/refinerycms/core/app/views/shared/admin/_make_sortable.html.erb CHANGED

@@ -1,4 +1,5 @@
-<% content_for :head_after_javascript_libraries, javascript_include_tag('jquery/jquery.nestedsortables.js') if (tree ||= false) %>
+<% content_for :head_after_javascript_libraries, javascript_include_tag('refinery/nestedsortables.js') if (tree ||= false) %>
+<% content_for :head_after_javascript_libraries, javascript_include_tag('refinery/serializelist.js') %>
 <% content_for :head do %>
   <script type='text/javascript'>
     $(document).ready(function(){

data/vendor/refinerycms/core/app/views/shared/admin/_resource_picker.html.erb CHANGED

@@ -1,31 +1,38 @@
-<%# TODO: Move description ||= "resource" to top of file %>
-<%= f.hidden_field field %>
-<div>
-  <%# TODO translate %>
-  <%= link_to "<span id='no_resource_selected' class='nothing_selected' #{"style='display: none;'" if resource.present?}>
-        There is currently no #{description ||= 'resource'} selected, click here to add one.
-      </span>", insert_admin_resources_url(:dialog => true,
+<%
+  insert_text = "<span id='no_resource_selected' class='nothing_selected' #{"style='display: none;'" if resource.present?}>
+                   #{t('.no_resource_selected')}
+                 </span>".html_safe
+  insert_link = insert_admin_resources_url({
+                  :dialog => true,
                   :update_resource => 'current_resource',
                   :update_text => 'current_resource_text',
                   :callback => 'resource_changed',
-                  :field => "#{f.object.class.name.underscore.downcase}_#{field}",
+                  :field => [f.object.class.name.underscore.downcase, field].join('_'),
                   :current_link => "#{resource.url if resource.present?}",
-                  :height => 480),
-                :name => "Add #{(description ||= 'resource').titleize}",
-                :id => "current_resource_link"
+                  :height => 480
+                })
+              %>
+<%= f.hidden_field field %>
+<div>
+  <%= link_to insert_text, insert_link,
+              :name => t('.name'),
+              :id => "current_resource_link"
   %>
   <div id='current_resource_container' <%= "style='display:none'" unless resource.present? %>>
-    <span id='current_resource_tag'>Current <%= description ||= "resource" %>:</span>
+    <span id='current_resource_tag'><%= t('.current') %>:</span>
     <span id='current_resource_text'>
-      <%= "#{resource.title} (#{resource.url})" if resource.present? %>
+      <%= "#{resource.title} (#{resource.file_name})" if resource.present? %>
     </span>
     <br/>
-    <%= link_to "#{refinery_icon_tag("page_white_put.png")} #{t('.download_current', :what => t('.' + (description ||= "resource")))} (<em>#{t('.opens_in_new_window')}</em>)", "#{resource.url if resource.present?}",
-            :id => "current_resource",
-            :target => "_blank" %>
+    <%= link_to "#{refinery_icon_tag("page_white_put.png")}
+                 #{t('.download_current')}
+                 (<em>#{t('.opens_in_new_window')}</em>)".html_safe,
+                 "#{resource.url if resource.present?}",
+                 :id => "current_resource",
+                 :target => "_blank" %>
   </div>
   <br/>
-  <%= link_to t('.remove_current', :what => t('.'+ (description ||= "resource"))), "",
+  <%= link_to t('.remove_current'), "",
                 :id => "remove_resource",
                 :style => "#{"display:none;" unless resource.present?}" %>
 </div>

data/vendor/refinerycms/core/app/views/wymiframe.html.erb CHANGED

@@ -9,7 +9,7 @@
     <% end %>
     <title>WYMeditor</title>
     <%= stylesheet_link_tag "wymeditor/skins/refinery/wymiframe", :media => "all" %>
-    <%= stylesheet_link_tag "formatting", :theme => RefinerySetting[:theme].present?, :media => "all" %>
+    <%= stylesheet_link_tag "formatting", :theme => RefinerySetting.get(:theme).present?, :media => "all" %>
     <%= stylesheet_link_tag "theme", :media => "all" %>
   </head>
   <body class="wym_iframe<%= " #{params[:id]}" if params[:id].present? %>">

data/vendor/refinerycms/core/config/locales/de.yml CHANGED

@@ -1,68 +1,67 @@
 de:
+  plugins:
+    refinery_core:
+      title: Refinery
+      description: Core Refinery Erweiterung
+    refinery_dialogs:
+      title: Dialoge
+      description: Refinery Dialog Erweiterung
   welcome:
-    there_are_no_users: "Es gibt noch keine Benutzer, also richten wir erstmal einen ein."
-    remember_admin_location: "Den Refinery Admin Bereich finden Sie unter:"
-    lets_start: "Alles klar, lassen Sie uns Ihre Daten erfassen, damit Sie sich einloggen können..."
-    continue: "Weiter..."
+    there_are_no_users: Es sind noch keine Benutzer vorhanden, darum lassen wir uns Ihren zuerst anlegen.
+    remember_admin_location: "Merken Sie sich Ihren Refinery Administrationsbereich:"
+    lets_start: Alles klar, lassen wir uns Ihren Benutzer anlegen, damit Sie sich anmelden können...
+    continue: Weiter...
   admin:
     menu:
-      reorder_menu: Menü neu anordnen
-      reorder_menu_done: "Menü Anordnung speichern"
-    search: Suche
-    search_submit: Los
-    search_results_for: "Suchergebnisse für '%{query}'"
-    search_no_results: "Leider gibt es keine Ergebnisse."
+      reorder_menu: Menü umsortieren
+      reorder_menu_done: Ich bin mit dem Umsortieren fertig
+    dialogs:
+      show:
+        save: Speichern
+        cancel: Abbrechen
   refinery:
-    other: "Weitere %{what}"
-    reorder: "Umordnen %{what}"
-    reorder_done: "Geschehen umordnen %{what}"
     crudify:
-      created: "%{what} wurde erfolgreich erstellt."
-      updated: "%{what} wurde erfolgreich aktualisiert."
-      destroyed: "%{what} wurde erfolgreich gelöscht."
-  layouts:
-    admin:
-      view_public_site: Profil öffentlichen Website
-      welcome_to_refinery: Willkommen bei Refinery
+      created: %{what} wurde erfolgreich angelegt.
+      updated: %{what} wurde erfolgreich aktualisiert.
+      destroyed: %{what} wurde erfolgreich gelöscht.
   shared:
     site_bar:
-      log_out: Ausloggen
+      log_out: Abmelden
+      switch_to_your_website: Zu Ihrer Webseite wechseln
+      switch_to_your_website_editor: Zum Editor Ihrer Webseite wechseln
     admin:
-      message:
-        close: Schließen
       continue_editing:
-        save_and_continue_editing: "Speichern & Bearbeitung fortsetzen"
+        save_and_continue_editing: Speichern & Bearbeiten fortsetzen
       form_actions:
-        or: oder
         save: Speichern
-        or_cancel: oder
         cancel: Abbrechen
-        or_continue: oder
-        cancel_lose_changes: "Abbrechen verlieren alle Änderungen, die Sie auf diese %{object_name} gemacht haben"
-        delete: 'Löschen'
+        cancel_lose_changes: Durch Abbrechen gehen all ihre gemachten Änderungen verloren
+        delete: Löschen
+        previous: Vorherige
+        next: Nächste
+        close: Schließen
       image_picker:
-        none_selected: "Es ist derzeit kein %{what} ausgewählt ist, klicken Sie bitte hier eine Annonce aufgeben"
-        remove_current: "Entfernen aktuel %{what}"
-        change: "Klicken Sie hier, um ein Bild auszuwählen"
-        image: bild
+        none_selected: Es ist momentan kein %{what} ausgewählt, bitte klicken Sie hier, um eins hinzuzufügen.
+        remove_current: Entferne aktuelles %{what}
+        change: Klicken Sie hier, um ein Bild auszuwählen
+        show: anzeigen
       resource_picker:
-        none_selected: "Derzeit gibt es keine %{what} ausgewählt, klicken Sie bitte hier eine Annonce aufgeben"
-        current: "Aktuelle %{what}"
-        download_current: "Download der aktuellen %{what}"
-        opens_in_new_window: Öffnet in einem neuen Browserfenster
-        remove_current: "Entfernen Sie aktuelle %{what}"
-        resource: Datei
+        download_current: Aktuelles %{what} herunterladen
+        opens_in_new_window: Öffnet in einem neuen Fenster
+        remove_current: "Entferne aktuelles %{what}"
+      search:
+        button_text: Suchen
+        results_for: Suchergebnisse für '%{query}'
+        no_results: Tut mir leid, Suche brachte keine Ergebnisse
+      delete:
+        message: Sind Sie sicher, dass Sie '%{title}' löschen möchten?
+      error_messages:
+        problems_in_following_fields: Es gab Probleme mit den folgenden Feldern
+      help: Hilfe
     message:
       close: Schließen
-    site_bar:
-      switch_to_your_website: Wechseln Sie zu Ihrer Website
-      switch_to_your_website_editor: Wechseln Sie zu Ihrem Website-Editor
-  activerecord:
-    models:
-      page: seite
-      user: benutzer
-      image: bild
-      inquiry: anfrage
-      resource: datei
-      refinery_setting: refinery einstellung
-      inquiry_setting: anfrage einstellung
+      close_this_message: Diese Meldung schließen
+    draft_page_message:
+      not_live: Diese Seite ist NICHT öffentlich sichtbar.
+    footer:
+      copyright: Copyright &copy;

data/vendor/refinerycms/core/config/locales/en.yml CHANGED

@@ -46,9 +46,12 @@ en:
         change: Click here to pick a image
         show: Show
       resource_picker:
-        download_current: Download current %{what}
+        download_current: Download current file
         opens_in_new_window: Opens in a new window
-        remove_current: "Remove current %{what}"
+        remove_current: "Remove current file"
+        no_resource_selected: There is currently no file selected, click here to add one.
+        name: Add File
+        current: Current File
       search:
         button_text: Search
         results_for: Search results for '%{query}'

data/vendor/refinerycms/core/config/locales/lv.yml CHANGED

@@ -1,6 +1,6 @@
 lv:
   welcome:
-    there_are_no_users: Vēl nav neviena lietotāja, līdz ar to mēs Jums izveidosim pirmo.
+    there_are_no_users: Vēl nav neviena lietotāja, līdz ar to mēs Jums palīdzēsim izveidot pirmo.
     remember_admin_location: "Atcerieties, Jūsu Refinery administrācijas panelis atrodas šeit:"
     lets_start: Tātad turpināsim, lai Jūs varētu pieslēgties...
     continue: Turpināt...
@@ -39,9 +39,12 @@ lv:
         change: Spied šeit, lai izvēlētos bildi
         show: Rādīt
       resource_picker:
-        download_current: Lejuplādēt pašreizējo %{what}
+        download_current: Lejuplādēt pašreizējo failu
         opens_in_new_window: Atvērsies jaunā logā
-        remove_current: Dzēst pašreizējo %{what}
+        remove_current: Dzēst pašreizējo failu
+        no_resource_selected: Pašlaik nav izvēlēts neviens fails. Spied šeit, lai pievienotu kādu failu.
+        name: Pievienot Failu
+        current: Pašreizējais Fails
       search:
         button_text: Meklēt
         results_for: Meklēšanas rezultāti pēc '%{query}'

data/vendor/refinerycms/core/config/locales/pt-BR.yml CHANGED

@@ -1,71 +1,67 @@
 pt-BR:
+  plugins:
+    refinery_core:
+      title: Refinery
+      description: Core refinery plugin
+    refinery_dialogs:
+      title: Dialogs
+      description: Refinery dialogs plugin
   welcome:
     there_are_no_users: "Ainda não existem usuários, então primeiro vamos te deixar pronto."
-    remember_admin_location: "Lembre-se que sua área de admin do Refinery fica em:"
-    lets_start: "Beleza, vamos te arrumar pra que você possa fazer login..."
+    remember_admin_location: "Lembre-se que sua área de admin fica em:"
+    lets_start: "Beleza, vamos te cadastrar pra que você possa fazer login..."
     continue: "Continuar..."
   admin:
     menu:
-      reorder_menu: Reordenar menu
+      reorder_menu: Reordenar o menu
       reorder_menu_done: "Terminei de reordenar o menu"
-    search: Procurar
-    search_submit: Ir
-    search_results_for: "Resultados da busca por '%{query}'"
-    search_no_results: "Desculpe, nenhum resultado foi encontrado"
+    dialogs:
+      show:
+        save: Salvar
+        cancel: Cancelar
   refinery:
-    other: "Outras %{what}"
-    reorder: "%{what} Reordenar"
-    reorder_done: "Reordenação %{what} feito"
     crudify:
       created: "%{what} foi criado com sucesso"
       updated: "%{what} foi atualizado com sucesso"
-      destroyed: "%{what} foi destruído com sucesso"
-  layouts:
-    admin:
-      view_public_site: Ver site público
-      welcome_to_refinery: Bem-vindo ao Refinery
+      destroyed: "%{what} foi apagado com sucesso"
   shared:
     site_bar:
-      log_out: Deslogar
+      log_out: Sair
       switch_to_your_website: Mudar para o seu website
       switch_to_your_website_editor: Mudar para o editor do seu website
     admin:
-      message:
-        close: Fechar
       continue_editing:
-        save_and_continue_editing: "Salvar & continuar editando"
+        save_and_continue_editing: Salvar E continuar editando
       form_actions:
-        or: ou
         save: Salvar
-        or_cancel: ou
         cancel: Cancelar
-        or_continue: ou
-        delete: Remover
-        cancel_lose_changes: "Cancelar irá fazer com que você perca as alterações que tenha feito a este %{object_name}"
+        cancel_lose_changes: "Cancelar irá fazer com que você perca as alterações que tenha feito aqui."
+        delete: Apagar
         previous: Anterior
         next: Próximo
+        close: Fechar
       image_picker:
-        none_selected: "Atualmente não existe nenhum %{what} selecionado, por favor clique aqui para adicionar um."
+        none_selected: "Atualmente não existe nenhuma %{what} selecionado, por favor clique aqui para adicionar um."
         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"
         download_current: "Fazer download do %{what} atual"
         opens_in_new_window: Abre em uma nova janela
         remove_current: "Remover %{what} atual"
-        resource: recurso
+      search:
+        button_text: Buscar
+        results_for: "Resultados da busca por '%{query}'"
+        no_results: "Desculpe, nenhum resultado foi encontrado."
+      delete:
+        message: Você tem certeza que deseja apagar '%{title}'?
+      error_messages:
+        problems_in_following_fields: Há problemas com os seguintes campos
+      help: ajuda
     message:
       close: Fechar
       close_this_message: Fechar esta mensagem
-  activerecord:
-    models:
-      page: página
-      user: usuário
-      image: imagem
-      inquiry: consulta
-      resource: recurso
-      refinery_setting: configuração do refinery
-      inquiry_setting: configuração da consulta
+    draft_page_message:
+      not_live: Esta página NÃO esta ativa para o público.
+    footer:
+      copyright: Copyright &copy;