refinerycms-core 2.1.5 → 3.0.0

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

@@ -5,6 +5,9 @@
   <title><%= Refinery::Core.site_name -%> - Refinery</title>
   <%= csrf_meta_tags %>
   <%= stylesheet_link_tag 'refinery/refinery' %>
+  <% visual_editor_stylesheets.each do |css| %>
+    <%= stylesheet_link_tag css.path, css.options %>
+  <% end %>
   <% custom_stylesheets.each do |css| %>
     <%= stylesheet_link_tag css.path, css.options %>
   <% end %>

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

@@ -14,12 +14,11 @@
 
   <div class='current_image_container' style="margin-top: 10px<%= ";display: none" if toggle_image_display %>">
     <a class='current_image_link dialog' href="<%= current_image_link_href %>" style='border: 0px' title='<%= current_image_title  %>' name='<%= current_image_title %>'>
-      <% unless image.nil? -%>
-        <%= image_fu image, Refinery::Images.user_image_sizes[thumbnail.to_sym],
-                     :class => "brown_border",
-                     :class => "current_picked_image" %>
-      <% else -%>
+      <% if image.nil? -%>
         <img class="current_picked_image" src="" alt="" style='display: none' />
+      <% else -%>
+        <%= image_fu image, Refinery::Images.user_image_sizes[thumbnail.to_sym],
+                     :class => "brown_border current_picked_image" %>
       <% end -%>
       <span class='no_picked_image_selected nothing_selected'<%= " style='display: none;'".html_safe if image.present? %>>
         <%= t('.none_selected') %>

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

@@ -4,17 +4,12 @@
 </script>
 <%= javascript_include_tag 'admin' -%>
 <%= javascript_include_tag 'refinery/refinery' -%>
-<%= javascript_include_tag 'refinery/wymeditor', "wymeditor/lang/#{current_admin_locale}", "wymeditor/skins/refinery/skin" %>
+<%= javascript_include_tag 'refinery/application' -%>
+<% visual_editor_javascripts.each do |js| %>
+  <%= javascript_include_tag js %>
+<% end %>
 <%= yield :after_javascript_libraries -%>
 <% custom_javascripts.each do |js| %>
   <%= javascript_include_tag js %>
 <% end %>
 <%= yield :javascripts %>
-
-<% if controller.class.respond_to?(:xhr_pageable?) && !controller.class.xhr_pageable? %>
-  <script>
-    $(document).ready(function() {
-      $('.pagination_container .pagination a').off('click');
-    });
-  </script>
-<% end %>

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

@@ -1,10 +1,17 @@
 <input type="hidden" name="switch_locale" id="switch_locale" value="<%= local_assigns[:current_locale] %>" />
 <% if Refinery::I18n.frontend_locales.many? %>
+  <label><%= t('.language') %></label>
   <ul id="switch_locale_picker" class="clearfix">
+    <% locales = Refinery::I18n.locales.clone %>
     <% Refinery::I18n.frontend_locales.each do |locale| %>
+      <% locale_name = locales.delete(locale) %>
       <li<%= %Q{ class=selected} if locale.to_s == local_assigns[:current_locale].to_s %>>
-        <%= link_to refinery_icon_tag(%Q{flags/#{locale}.png}, :size => '32x22'),
-                    refinery.url_for(:switch_locale => locale) %>
+        <%= link_to refinery.url_for(:switch_locale => locale, :parent_id => params[:parent_id]), id: locale do %>
+          <div class="<%=locale %> locale_marker">
+            <%= locale_text_icon(locale.upcase) %>
+          </div>
+          <%= locale_name %>
+        <% end %>
       </li>
     <% end %>
   </ul>

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

@@ -8,12 +8,14 @@
 <% content_for :javascripts do %>
   <script>
     $(document).ready(function(){
-      create_sortable_list({
-        update_url: '<%= update_url ||= refinery.url_for(:action => "update_positions", :only_path => true) %>',
-        sortable_list: $('#<%= list_id ||= "sortable_list" %>, .sortable_list'),
-        tree: <%= tree %>,
-        replaceContentsAfterUpdate: <%= local_assigns[:replace_contents_after_update] || false %>
-      });
+      create_sortable_list(
+        <%= raw({
+              update_url: refinery.url_for(action: "update_positions", only_path: true),
+              sortable_list: '#sortable_list, .sortable_list',
+              tree: false,
+              replaceContentsAfterUpdate: false
+            }.merge(options ||= {}).to_json) %>
+      );
     });
   </script>
 <% end %>

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

@@ -1,17 +1,4 @@
 <nav id="menu">
-  <% ::Refinery::Plugins.active.in_menu.each do |plugin| -%>
-    <%= link_to plugin.title, refinery.url_for(plugin.url),
-                :class => ("active" if plugin.highlighted?(params)),
-                :id => "plugin_#{plugin.name}" %>
-  <% end -%>
-  <% if ::Refinery::Plugins.active.in_menu.many? -%>
-    <%= link_to refinery_icon_tag('arrow_switch.png'), "",
-                :id => "menu_reorder",
-                :title => t('.reorder_menu') %>
-
-    <%= link_to refinery_icon_tag('tick.png'), "",
-                :id => "menu_reorder_done",
-                :title => t('.reorder_menu_done'),
-                :style => "display: none;" %>
-  <% end %>
+  <%= render partial: "refinery/admin/menu_item",
+             collection: current_refinery_user.active_plugins.in_menu -%>
 </nav>

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

@@ -0,0 +1,3 @@
+<%= link_to menu_item.title, refinery.url_for(menu_item.url),
+            :class => ("active" if menu_item.highlighted?(params)),
+            :id => "plugin_#{menu_item.name}" %>

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

@@ -1,7 +1,4 @@
 <%
-  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
   insert_link = refinery.insert_admin_resources_path({
                   :dialog => true,
                   :update_resource => "current_resource_#{field}",
@@ -12,28 +9,21 @@
                   :height => 480,
                   :conditions => local_assigns[:conditions]
                 })
-              %>
+ %>
 <%= f.hidden_field field %>
+
 <div>
-  <%= link_to insert_text, insert_link,
-              :name => t('.name'),
-              :id => "current_resource_link_#{field}"
-  %>
-  <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,
-                  (%Q{#{resource.title} (#{resource.file_name})} if resource).to_s,
-                  :id => "current_resource_text_#{field}"
-                ),
-                "#{resource.url if resource}",
-                :id => "current_resource_#{field}",
-                :target => '_blank' %>
+  <%= action_icon :add, insert_link, t('.name'), id: "current_resource_link_#{field}" unless resource %>
+
+  <div id="current_resource_container_<%= field %>" style="margin-top: 10px;<%= ' display: none;' unless resource %>">
+    <span class="current_resource" id="<%="current_resource_text_#{field}"%>">
+      <%= "#{resource.title} (#{resource.file_name})" if resource %>
+    </span>
+    <div id='resource_actions'>
+      <%= action_icon :download, "#{resource.url if resource}", t('.download_current'), id: "current_resource_#{field}" %>
+      <%= action_icon :remove, '#', t('.remove_current'), :id => "remove_resource_#{field}"%>
+    </div>
   </div>
-  <br/>
-  <%= link_to t('.remove_current'), '',
-              :id => "remove_resource_#{field}",
-              :style => "#{'display:none;' unless resource}" %>
 </div>
 
 <% content_for :javascripts do %>

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

@@ -1 +1 @@
-<%= render 'refinery/acts_as_indexed/admin/search', local_assigns if defined?(Refinery::ActsAsIndexed::Engine) %>
+<%= render 'refinery/acts_as_indexed/admin/search', local_assigns if defined?(Refinery::ActsAsIndexed::Engine) -%>

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

@@ -8,7 +8,7 @@
       <% end %>
       <% pages_tabs = ::Refinery::Pages.tabs
          tabs_to_show = (refinery_pages_tabs ||= []).map!(&:to_s)
-         pages_tabs.reject!{|t| refinery_pages_tabs.exclude?(t.name.to_s) } unless tabs_to_show.include?('all')
+         pages_tabs.reject!{ |t| refinery_pages_tabs.exclude?(t.name.to_s) } unless tabs_to_show.include?('all')
          pages_tabs.each_with_index do |tab, tab_index| %>
         <li class='ui-state-default' id="custom_<%= tab.name %>_tab">
           <%= link_to tab.name.titleize, "#custom_tab_#{tab_index}" %>
@@ -19,7 +19,7 @@
     <div id='page_part_editors'>
       <% tabbed_fields.each do |field| %>
         <div class='page_part' id="<%= field %>">
-          <%= f.text_area field, :rows => 20, :class => 'wymeditor widest' -%>
+          <%= f.text_area field, :rows => 20, :class => 'visual_editor widest' -%>
         </div>
       <% end %>
       <% pages_tabs.each_with_index do |tab, tab_index| %>

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

@@ -9,7 +9,7 @@
   <div id='page_part_editors'>
     <% fields.each do |part| %>
       <div class='page_part' id='<%= part %>'>
-        <%= f.text_area part, :rows => 20, :class => 'wymeditor widest' -%>
+        <%= f.text_area part, :rows => 20, :class => 'visual_editor widest' -%>
       </div>
     <% end %>
   </div>

data/app/views/refinery/admin/dialogs/show.html.erb

@@ -1,19 +1 @@
-<form id='wym_dialog_form' class='wym_dialog wym_dialog_<%= @dialog_type %>'>
-  <input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='<%= @dialog_type %>' />
-  <iframe src='<%= @iframe_src %>' id='dialog_frame' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>
-  <div class='wym_hideables'>
-  <% if @dialog_type == "image" %>
-    <input type='hidden' id='wym_src' class='wym_src' value='' />
-    <input type='hidden' id='wym_alt' class='wym_alt' value='' />
-    <input type='hidden' id='wym_title' class='wym_title' value='' />
-    <input type='hidden' id='wym_size' class='wym_size' value='' />
-  <% elsif @dialog_type == "link" %>
-    <input type='hidden' id='wym_href' class='wym_href' value='' />
-    <input type='hidden' id='wym_title' class='wym_title' value='' />
-    <input type='hidden' id='wym_target' class='wym_target' value='' />
-  <% end %>
-
-    <input id='wym_dialog_submit' class='wym_submit submit_dialog button' type='button' value='<%= t('.save') %>' />
-    <a id='wym_dialog_cancel' href='' class='wym_cancel close_dialog button'><%= t('.cancel') %></a>
-  </div>
-</form>
+Your visual editor should override this file.

data/config/initializers/assets.rb

@@ -0,0 +1,6 @@
+Rails.application.config.assets.precompile += %w(
+  font-awesome/fontawesome-webfont.eot
+  font-awesome/fontawesome-webfont.woff2
+  font-awesome/fontawesome-webfont.woff
+  font-awesome/fontawesome-webfont.ttf
+  font-awesome/fontawesome-webfont.svg)

data/config/locales/ca.yml

@@ -0,0 +1,84 @@
+ca:
+  refinery:
+    js:
+      admin:
+        confirm_changes: "Qualsevol canvi que s'hagi fet es perdrà. Segur que vols continuar sense desar?"
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Core plugin de Refinery
+      refinery_dialogs:
+        title: Diàlegs
+        description: Diàlegs del Core plugin de Refinery
+    welcome:
+      there_are_no_users: "No hi ha usuaris registrats, així que hem de registrar al primer."
+    crudify:
+      created: "%{what} s'ha creat correctament."
+      updated: "%{what} s'ha actualitzat correctament."
+      destroyed: "%{what} s'ha esborrat correctament."
+    site_bar:
+      log_out: Sortir
+      switch_to_your_website: Veure el teu web
+      switch_to_your_website_editor: Editar el teu web
+    admin:
+      menu:
+        reorder_menu: Reordenar menú
+        reorder_menu_done: He acabat de reordenar el menú
+      dialogs:
+        show:
+          save: Guardar
+          cancel: Cancel·lar
+      continue_editing:
+        save_and_continue_editing: Guardar i seguir editant
+      form_actions:
+        save: Guardar
+        cancel: Cancelar
+        cancel_lose_changes: En cancel·lar es perdran els canvis que has realitzat aquí
+        delete: Esborrar
+        close: Tancar
+      image_picker:
+        none_selected: "No hi ha cap imatge seleccionada, fes clic aquí per afegir una."
+        remove_current: Eliminar imatge actual
+        change: Fes clic aquí per escollir una imatge
+        show: Mostrar
+      resource_picker:
+        download_current: Descarregar arxiu actual
+        opens_in_new_window: Obre en una finestra nova
+        remove_current: "Eliminar arxiu actual"
+        no_resource_selected: "No hi ha cap arxiu seleccionat, fes clic aqui per agregar un."
+        name: Agregar arxiu
+        current: Arxiu actual
+      search:
+        button_text: Buscar
+        results_for_html: "Resultats de la recerca &#8216;<em>%{query}</em>&#8217;"
+        no_results: "No s'han trobat resultats"
+        cancel_search: 'Cancelar recerca'
+        input:
+          placeholder: "Buscar&#8230;"
+          help:  "Posa aquí una cadena d'almenys 3 caràcters que conté el que estas buscant."
+      delete:
+        message: "Segur que vols suprimir '%{title}'?"
+      error_messages:
+        problems_in_following_fields: Va haver-hi problemes amb els següents camps
+      help: ajuda
+      form_advanced_options_menu:
+        advanced_options: Opcions avançades
+        toggle_advanced_options: Prem per accedir a les opcions de meta tags i menú
+        save_as_draft: Guardar com a esborrador
+    message:
+      close: Tancar
+      close_this_message: Tancar aquest missatge
+    draft_page_message:
+      not_live: Aquesta pàgina NO està visible per al públic.
+    footer:
+      copyright: "Copyright © %{year} %{site_name}"
+    no_script:
+      enable_javascript_html: "Per obtenir una funcionalitat completa d'aquesta pàgina és necessari activar Javascript."
+      here_are: Aquí estan les
+      instructions_enable_javascript_html: instruccions de com habilitar Javascript al teu navegador web
+  time:
+    formats:
+      short: "%A, %d %B %Y"
+  will_paginate:
+    previous_label: "&laquo;"
+    next_label: "&raquo;"

data/config/locales/cs.yml

@@ -1,5 +1,8 @@
 cs:
   refinery:
+    js:
+      admin:
+        confirm_changes: Změny které jste udělal budou ztraceny. Jste si jist pokračováním bez uložení?
     plugins:
       refinery_core:
         title: Refinery
@@ -16,7 +19,7 @@ cs:
     site_bar:
       log_out: Odhlásit
       switch_to_your_website: Přepnout na web
-      switch_to_your_website_editor: Přepnout do editoru
+      switch_to_your_website_editor: Přepnout do administrace
     admin:
       menu:
         reorder_menu: Přeuspořádat menu
@@ -32,14 +35,14 @@ cs:
         cancel: Storno
         cancel_lose_changes: Pokud akci stornujete všechny provedené změny budou ztraceny
         delete: Smazat
-        previous: Předchozí
-        next: Další
         close: Zavřít
       image_picker:
         none_selected: Zatím není vybrán žádný obrázek, klikněte zde pro přidání.
         remove_current: Smazat vybraný obrázek
         change: Klikněte zde pro vybrání obrázku
         show: Zobrazit
+      locale_picker:
+        language: Jazyk
       resource_picker:
         download_current: Stáhnout vybraný soubor
         opens_in_new_window: Otevřít v novém okně
@@ -51,13 +54,17 @@ cs:
         button_text: Hledat
         results_for_html: "Výsledky hledání pro &#8216;<em>%{query}</em>&#8217;"
         no_results: Žádné záznamy nenalezeny
+        cancel_search: 'Zrušit vyhledávání'
+        input:
+          placeholder: "Hledat&8230;"
+          help: "Vložte nejméně 3 znaky ze slova, které vyhledáváte."
       delete:
-        message: Opravdu chcete smazat '%{title}'?
+        message: "Opravdu chcete smazat '%{title}'?"
       error_messages:
         problems_in_following_fields: Vyskytl se problém s těmito údaji
       help: nápověda
       form_advanced_options_menu:
-        advanced_options: Zpřístupní rozšířené nastavení ako například nastavení menu a meta tagů
+        advanced_options: Zpřístupní rozšířené nastavení jako například nastavení menu a meta tagů
         toggle_advanced_options: Rozšířené nastavení
         save_as_draft: Uložit jako pracovní verzi
     message:

data/config/locales/en.yml

@@ -23,7 +23,7 @@ en:
     admin:
       menu:
         reorder_menu: Reorder menu
-        reorder_menu_done: I'm done reordering the menu
+        reorder_menu_done: Finished reordering the menu
       dialogs:
         show:
           save: Save
@@ -41,6 +41,8 @@ en:
         remove_current: Remove current image
         change: Click here to pick an image
         show: Show
+      locale_picker:
+        language: Language
       resource_picker:
         download_current: Download current file
         opens_in_new_window: Opens in a new window
@@ -53,7 +55,9 @@ en:
         results_for_html: "Search results for &#8216;<em>%{query}</em>&#8217;"
         no_results: 'Sorry, no results found'
         cancel_search: 'Cancel search'
-        search_input_notice: "Put here a string of at least 3 characters containing what you are looking for."
+        input:
+          placeholder: "Search &#8230;"
+          help: 'Enter a word or phrase you want to search for'
       delete:
         message: "Are you sure you want to remove '%{title}'?"
       error_messages:

data/config/locales/fr.yml

@@ -2,7 +2,7 @@ fr:
   refinery:
     js:
       admin:
-        confirm_changes: Toute modification sera perdue. Êtes-vous sûr de vouloir de vouloir continuer ?
+        confirm_changes: Toute modification sera perdue. Êtes-vous sûr(e) de vouloir de vouloir continuer ?
     plugins:
       refinery_core:
         title: Refinery
@@ -33,35 +33,39 @@ fr:
       form_actions:
         save: Enregistrer
         cancel: Annuler
-        cancel_lose_changes: Si vous annulez, tout les changements non sauvegardés seront perdus
+        cancel_lose_changes: Si vous annulez, tous les changements non sauvegardés seront perdus
         delete: Supprimer
         close: Fermer
       image_picker:
-        none_selected: Il n'y a actuellement aucun %{what} sélectionné, veuillez cliquer ici pour en ajouter un.
-        remove_current: Supprimer le %{what} actuel
+        none_selected: Il n'y a actuellement aucune image sélectionnée, veuillez cliquer ici pour en ajouter une.
+        remove_current: Supprimer l'image actuelle
         change: Cliquer ici pour sélectionner une image
         show: Afficher
+      locale_picker:
+        language: Langue
       resource_picker:
-        download_current: Télécharger le %{what} actuel
+        download_current: Télécharger le fichier actuel
         opens_in_new_window: Ouvre une nouvelle fenêtre
-        remove_current: "Supprimer le %{what} actuel"
+        remove_current: "Supprimer le fichier actuel"
         no_resource_selected: Il n'y a actuellement aucun fichier de sélectionné. Veuillez cliquer ici pour en ajouter un.
         name: Ajouter un fichier
         current: Fichier courrant
       search:
-        button_text: Chercher
+        button_text: Rechercher
         results_for_html: "Résultats de la recherche &#8216;<em>%{query}</em>&#8217;"
         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."
+        input:
+          placeholder: "Rechercher&8230;"
+          help: "Entrez ici le texte recherché. La longueur minimale est de 3 caractères."
       delete:
-        message: "Êtes-vous sûr de vouloir supprimer '%{title}'?"
+        message: "Êtes-vous sûr(e) de vouloir supprimer '%{title}'?"
       error_messages:
         problems_in_following_fields: Les champs suivants comportent des problèmes
       help: aide
       form_advanced_options_menu:
         advanced_options: Options avancées
-        toggle_advanced_options: Cliquer ici pour paraméter les étiquettes et accéder au menu des options
+        toggle_advanced_options: Cliquez ici pour paramétrer les étiquettes et accéder au menu des options
         save_as_draft: Enregistrer comme brouillon
     message:
       close: Fermer
@@ -69,7 +73,7 @@ fr:
     draft_page_message:
       not_live: Cette page n'est pas visible par le public.
     footer:
-      copyright: Copyright © %{year} %{site_name}
+      copyright: Tous droits réservés © %{year} %{site_name}
     no_script:
       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