refinerycms-core 1.0.11 → 2.0.0

data/app/views/{shared → refinery}/admin/_image_picker.html.erb

@@ -4,7 +4,7 @@
   toggle_image_display ||= false
   conditions ||= nil
   randomiser = rand(Time.now.yesterday.to_i * Time.now.to_i)
-  current_image_link_href = insert_admin_images_path(:dialog => true, :callback => "image_picker_#{randomiser}_changed",
+  current_image_link_href = refinery.insert_admin_images_path(:dialog => true, :callback => "image_picker_#{randomiser}_changed",
                                                     :width => 866, :height => 510, :conditions => conditions)
   current_image_title = t('.change', :what =>  description.titleize)
 -%>
@@ -15,18 +15,18 @@
   <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, ::Image.user_image_sizes[thumbnail.to_sym],
+        <%= image_fu image, Refinery::Images.user_image_sizes[thumbnail.to_sym],
                      :class => "brown_border",
                      :class => "current_picked_image" %>
       <% 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? %>>
-        <%= t('.none_selected', :what => t('.' + description )) %>
+        <%= t('.none_selected') %>
       </span>
     </a>
     <br/>
-    <%= link_to t('.remove_current', :what => t('.' + description )), "#",
+    <%= link_to t('.remove_current'), "#",
                 :class => "remove_picked_image",
                 :style => "#{"display:none;" if image.nil?}" %>
   </div>
@@ -34,9 +34,10 @@
 
 <% content_for :javascripts do -%>
   <script>
-  var image_picker_<%= randomiser %> = null;
+    var image_picker_<%= randomiser %> = {};
     $(document).ready(function(e) {
-      image_picker_<%= randomiser %> = image_picker.init({
+      $.extend(true, image_picker_<%= randomiser %>, image_picker)
+      image_picker_<%= randomiser %> = image_picker_<%= randomiser %>.init({
         thumbnail: '<%= thumbnail.html_safe %>'
         , image_toggler: '<%= toggle_image_display ? ".current_image_toggler" : "null" %>'
         , description: '<%= description %>'
@@ -44,7 +45,7 @@
         , image_display: '.current_picked_image'
         , no_image_message: '.no_picked_image_selected'
         , remove_image_button: '.remove_picked_image'
-        , picker_container: '#image_picker_container_<%= randomiser %>'
+        , picker_container: '#image_picker_container_<%= (lambda {randomiser}).call %>'
         , image_container: '.current_image_container'
         , image_link: '.current_image_link'
       });

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

@@ -0,0 +1,8 @@
+<%= javascript_include_tag 'admin' -%>
+<%= javascript_include_tag 'refinery/refinery' -%>
+<%= javascript_include_tag 'refinery/wymeditor', "wymeditor/lang/#{::I18n.locale}", "wymeditor/skins/refinery/skin" %>
+<%= yield :after_javascript_libraries -%>
+<% custom_javascripts.each do |js| %>
+  <%= javascript_include_tag js %>
+<% end %>
+<%= yield :javascripts %>

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

@@ -0,0 +1,16 @@
+<% content_for :after_javascript_libraries do %>
+  <%= javascript_include_tag 'refinery/nestedsortables' %>
+  <%= javascript_include_tag 'refinery/serializelist' %>
+  <%= javascript_include_tag 'refinery/tree.js' %>
+<% end %>
+
+<% content_for :javascripts do %>
+  <script>
+    $(document).ready(function(){
+      list_reorder.update_url     = '<%= update_url ||= refinery.url_for(:action => "update_positions") %>';
+      list_reorder.sortable_list  = $('#<%= list_id ||= "sortable_list" %>, .sortable_list');
+      list_reorder.tree           = <%= tree %>;
+      list_reorder.init();
+    });
+  </script>
+<% end %>

data/app/views/{admin → refinery/admin}/_menu.html.erb

@@ -1,10 +1,10 @@
 <nav id="menu">
-  <% Refinery::Plugins.active.in_menu.each do |plugin| -%>
-    <%= link_to plugin.title, plugin.url,
-                :class => (plugin.highlighted?(params) ? "active" : ""),
+  <% ::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? -%>
+  <% if ::Refinery::Plugins.active.in_menu.many? -%>
     <%= link_to refinery_icon_tag('arrow_switch.png'), "",
                 :id => "menu_reorder",
                 :title => t('.reorder_menu') %>

data/app/views/{shared → refinery}/admin/_resource_picker.html.erb

@@ -1,49 +1,40 @@
 <%
   conditions ||= nil
-  if resource.present?
-    display_when_present = ""
-    hide_when_present = "display:none;"
-    file_title = "#{resource.title} (#{resource.file_name})"
-    resource_url = resource.url
-  else
-    display_when_present = "display:none;"
-    hide_when_present = ""
-    file_title = ""
-    resource_url = ""
-  end
-
-  insert_text = "<span id='no_resource_selected_#{field}' class='nothing_selected' style='#{hide_when_present}'>
+  insert_text = "<span id='no_resource_selected_#{field}' class='nothing_selected' #{"style='display: none;'" if resource.present?}>
                    #{t('.no_resource_selected')}
                  </span>".html_safe
-  insert_link = insert_admin_resources_path({
+  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,
+                  :current_link => "#{resource.url if resource.present?}",
                   :height => 480,
                   :conditions => conditions
                 })
-
-  linked_html = "#{refinery_icon_tag('page_white_put.png')} " + content_tag(:span, file_title, :id => "current_resource_text_#{field}")
-%>
-
+              %>
 <%= 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_when_present %>'>
-    <%= link_to linked_html.html_safe, resource_url,
+  <div id='current_resource_container_<%= field %>' style='margin-top: 10px<%= ";display: none" unless resource.present? %>'>
+    <%= link_to "#{refinery_icon_tag('page_white_put.png')} ".html_safe +
+                content_tag(
+                  :span,
+                  "#{resource.title} (#{resource.file_name})",
+                  :id => "current_resource_text_#{field}"
+                ),
+                resource.url,
                 :id => "current_resource_#{field}",
-                :target => "_blank" %>
+                :target => "_blank" if resource.present? %>
   </div>
   <br/>
   <%= link_to t('.remove_current'), "",
               :id => "remove_resource_#{field}",
-              :style => display_when_present %>
+              :style => "#{"display:none;" unless resource.present?}" %>
 </div>
 
 <% content_for :javascripts do %>

data/app/views/{shared → refinery}/admin/_search.html.erb

@@ -3,5 +3,5 @@
   <% if params[:wymeditor].presence %><input name='wymeditor' value='true' type='hidden'><% end %>
   <% if from_dialog? %><input id='dialog' name='dialog' type='hidden' value='true' /><% end %>
   <% if @callback.presence %><input name='callback' value='<%= @callback %>' type='hidden'><% end %>
-  <%= submit_tag t('button_text', :scope => 'shared.admin.search'), :name => nil %>
+  <%= submit_tag t('button_text', :scope => 'refinery.admin.search'), :name => nil %>
 </form>

data/app/views/{shared → refinery}/admin/_tabbed_fields.html.erb

@@ -6,7 +6,7 @@
           <%= link_to "#{field.to_s.humanize}", "\##{field}" %>
         </li>
       <% end %>
-      <% pages_tabs = Refinery::Pages.tabs
+      <% 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.each_with_index do |tab, tab_index| %>
@@ -24,7 +24,7 @@
       <% end %>
       <% pages_tabs.each_with_index do |tab, tab_index| %>
         <div class='page_part' id='<%= "custom_tab_#{tab_index}" %>'>
-          <%= render :partial => tab.partial, :locals => {:f => f} %>
+          <%= render tab.partial, :f => f %>
         </div>
       <% end %>
     </div>

data/app/views/refinery/sitemap/index.xml.builder

@@ -0,0 +1,25 @@
+xml.instruct!
+
+xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
+
+  @locales.each do |locale|
+    ::I18n.locale = locale
+    ::Refinery::Page.live.in_menu.includes(:parts).each do |page|
+     # exclude sites that are external to our own domain.
+     page_url = if page.url.is_a?(Hash)
+       # This is how most pages work without being overriden by link_url
+       page.url.merge({:only_path => false})
+     elsif page.url.to_s !~ /^http/
+       # handle relative link_url addresses.
+       [request.protocol, request.host_with_port, page.url].join
+     end
+
+     # Add XML entry only if there is a valid page_url found above.
+     xml.url do
+       xml.loc refinery.url_for(page_url)
+       xml.lastmod page.updated_at.to_date
+     end if page_url.present? and page.show_in_menu?
+    end
+  end
+
+end

data/app/views/{wymiframe.html.erb → refinery/wymiframe.html.erb}

@@ -2,11 +2,10 @@
 <html>
   <head>
     <title>WYMeditor</title>
-    <meta charset='<%= ::Refinery::Application.config.encoding %>' />
+    <meta charset='<%= ::Rails.application.config.encoding %>' />
     <meta httpequiv="XUACompatible" content="IE=edge,chrome=1" />
     <%= stylesheet_link_tag "wymeditor/skins/refinery/wymiframe", :media => "all" %>
-    <%= stylesheet_link_tag "formatting", :theme => RefinerySetting.get(:theme).present?, :media => "all" %>
-    <%= stylesheet_link_tag "refinery/theme" if RefinerySetting.find_or_set(:frontend_refinery_stylesheets_enabled, true) %>
+    <%= stylesheet_link_tag "formatting", :media => "all" %>
     <%= stylesheet_link_tag "theme", :media => "all" %>
     <%= javascript_include_tag 'modernizr-min' %>
   </head>

data/config/initializers/will_paginate_monkeypatch.rb

@@ -0,0 +1,21 @@
+module WillPaginate
+  module ActionView
+    class LinkRenderer < ViewHelpers::LinkRenderer
+      def url(page)
+        @base_url_params ||= begin
+          url_params = merge_get_params(default_url_params)
+          merge_optional_params(url_params)
+        end
+
+        url_params = @base_url_params.dup
+        add_current_page_param(url_params, page)
+
+        if url_params[:controller] =~ /refinery/
+          @template.refinery.url_for(url_params)
+        else
+          @template.url_for(url_params)
+        end
+      end
+    end
+  end
+end

data/config/locales/bg.yml

@@ -1,41 +1,33 @@
 bg:
-  will_paginate:
-    previous_label: "«"
-    next_label: "»"
-  js:
-    admin:
-      confirm_changes: Всички промени, които сте направили ще бъдат загубени. Сигурни ли сте, че искате да продължите без запис?
-  plugins:
-    refinery_core:
-      title: Refinery
-      description: Основна добавка за Refinery
-    refinery_dialogs:
-      title: Dialogs
-      description: Добавка за диалози за Refinery
-  welcome:
-    there_are_no_users: "Все още няма потребители, затова ще създадем първо Вашия."
-    remember_admin_location: "Запомнете, че административната зона на Refinery се намира в:"
-    lets_start: Добре, нека да направим настройките Ви за вход...
-    continue: Продължение...
-  admin:
-    menu:
-      reorder_menu: Пренареждане на менюто
-      reorder_menu_done: Запис на текущото подреждане на менюто
-    dialogs:
-      show:
-        save: Запис
-        cancel: Отказ
   refinery:
+    js:
+      admin:
+        confirm_changes: Всички промени, които сте направили ще бъдат загубени. Сигурни ли сте, че искате да продължите без запис?
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Основна добавка за Refinery
+      refinery_dialogs:
+        title: Dialogs
+        description: Добавка за диалози за Refinery
+    welcome:
+      there_are_no_users: "Все още няма потребители, затова ще създадем първо Вашия."
     crudify:
       created: 'Елемента "%{what}" бе създаден успешно.'
       updated: 'Елемента "%{what}" бе актуализиран успешно.'
       destroyed: 'Елемента "%{what}" бе премахнат успешно.'
-  shared:
     site_bar:
       log_out: Изход
       switch_to_your_website: Превключване към Вашия сайт
       switch_to_your_website_editor: Превключване към редактора на Вашия сайт
     admin:
+      menu:
+        reorder_menu: Пренареждане на менюто
+        reorder_menu_done: Запис на текущото подреждане на менюто
+      dialogs:
+        show:
+          save: Запис
+          cancel: Отказ
       continue_editing:
         save_and_continue_editing: 'Запис и продължение'
       form_actions:
@@ -45,8 +37,8 @@ bg:
         delete: Изтриване
         close: Затваряне
       image_picker:
-        none_selected: 'Все още няма избран(а) %(what). Моля, цъкнете тук, за да добавите един(а).'
-        remove_current: 'Премахване на текущия(ата) %{what}'
+        none_selected: Все още няма избрано изображение. Моля, цъкнете тук, за да добавите едно.
+        remove_current: Премахване на текущото изображение
         change: Цъкнете тук, за да изберете изображение
         show: Показване
       resource_picker:
@@ -79,3 +71,6 @@ bg:
   time:
     formats:
       short: "%A, %d %B %Y"
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"

data/config/locales/cs.yml

@@ -1,38 +1,30 @@
 cs:
-  will_paginate:
-    previous_label: "«"
-    next_label: "»"
-  plugins:
-    refinery_core:
-      title: Refinery
-      description: Core refinery plugin
-    refinery_dialogs:
-      title: Dialogs
-      description: Refinery dialogs plugin
-  welcome:
-    there_are_no_users: Nemáme žádné uživatele, proto nyní jednoho vytvoříme.
-    remember_admin_location: "Zapamatujte si adresu k Refinery administraci:"
-    lets_start: Nejdříve vytvoříme uživatelský účet, ať se máme jak přihlásit...
-    continue: Pokračovat...
-  admin:
-    menu:
-      reorder_menu: Přeuspořádat menu
-      reorder_menu_done: Uložit toto pořadí
-    dialogs:
-      show:
-        save: Uložit
-        cancel: Storno
   refinery:
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Core refinery plugin
+      refinery_dialogs:
+        title: Dialogs
+        description: Refinery dialogs plugin
+    welcome:
+      there_are_no_users: Nemáme žádné uživatele, proto nyní jednoho vytvoříme.
     crudify:
       created: '%{what} byl úspěšně vytvořen.'
       updated: '%{what} byl úspěšně aktualizován.'
       destroyed: '%{what} byl úspěšně smazán.'
-  shared:
     site_bar:
       log_out: Odhlásit
       switch_to_your_website: Přepnout na web
       switch_to_your_website_editor: Přepnout do editoru
     admin:
+      menu:
+        reorder_menu: Přeuspořádat menu
+        reorder_menu_done: Uložit toto pořadí
+      dialogs:
+        show:
+          save: Uložit
+          cancel: Storno
       continue_editing:
         save_and_continue_editing: Uložit a pokračovat v editaci
       form_actions:
@@ -45,7 +37,7 @@ cs:
         close: Zavřít
       image_picker:
         none_selected: Zatím není vybrán žádný %{what}, klikněte zde pro přidání.
-        remove_current: Zmazat vybraný %{what}
+        remove_current: Smazat vybraný %{what}
         change: Klikněte zde pro vybrání obrázku
         show: Zobrazit
       resource_picker:
@@ -78,3 +70,6 @@ cs:
   time:
     formats:
       short: "%A, %d %B %Y"
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"

data/config/locales/da.yml

@@ -1,38 +1,30 @@
 da:
-  will_paginate:
-    previous_label: "«"
-    next_label: "»"
-  plugins:
-    refinery_core:
-      title: Refinery
-      description: Core refinery plugin
-    refinery_dialogs:
-      title: Dialogs
-      description: Refinery dialogs plugin
-  welcome:
-    there_are_no_users: Der er ingen brugere endnu, så vi begynder med at oprette en bruger til dig.
-    remember_admin_location: "Husk, du logger på Refinerys administration her:"
-    lets_start: Lad os få dig oprettet, så du kan logge på...
-    continue: Fortsæt...
-  admin:
-    menu:
-      reorder_menu: Omorganisér menuen
-      reorder_menu_done: Jeg er færdig med omorganiseringen
-    dialogs:
-      show:
-        save: Gem
-        cancel: Annullér
   refinery:
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Core refinery plugin
+      refinery_dialogs:
+        title: Dialogs
+        description: Refinery dialogs plugin
+    welcome:
+      there_are_no_users: Der er ingen brugere endnu, så vi begynder med at oprette en bruger til dig.
     crudify:
       created: '%{what} er oprettet.'
       updated: '%{what} er opdateret.'
       destroyed: '%{what} er slettet.'
-  shared:
     site_bar:
       log_out: Log af
       switch_to_your_website: Vis website
       switch_to_your_website_editor: Redigér website
     admin:
+      menu:
+        reorder_menu: Omorganisér menuen
+        reorder_menu_done: Jeg er færdig med omorganiseringen
+      dialogs:
+        show:
+          save: Gem
+          cancel: Annullér
       continue_editing:
         save_and_continue_editing: Gem og fortsæt med redigering
       form_actions:
@@ -76,3 +68,6 @@ da:
   time:
     formats:
       short: "%A, %e. %B %Y"
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"

data/config/locales/de.yml

@@ -1,38 +1,30 @@
 de:
-  will_paginate:
-    previous_label: "«"
-    next_label: "»"
-  plugins:
-    refinery_core:
-      title: Refinery
-      description: Core Refinery Erweiterung
-    refinery_dialogs:
-      title: Dialoge
-      description: Refinery Dialog Erweiterung
-  welcome:
-    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ü umsortieren
-      reorder_menu_done: Ich bin mit dem Umsortieren fertig
-    dialogs:
-      show:
-        save: Speichern
-        cancel: Abbrechen
   refinery:
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Core Refinery Erweiterung
+      refinery_dialogs:
+        title: Dialoge
+        description: Refinery Dialog Erweiterung
+    welcome:
+      there_are_no_users: Es sind noch keine Benutzer vorhanden, darum lassen wir uns Ihren zuerst anlegen.
     crudify:
       created: '%{what} wurde erfolgreich angelegt.'
       updated: '%{what} wurde erfolgreich aktualisiert.'
       destroyed: '%{what} wurde erfolgreich gelöscht.'
-  shared:
     site_bar:
       log_out: Abmelden
       switch_to_your_website: Zu Ihrer Webseite wechseln
       switch_to_your_website_editor: Zum Editor Ihrer Webseite wechseln
     admin:
+      menu:
+        reorder_menu: Menü umsortieren
+        reorder_menu_done: Ich bin mit dem Umsortieren fertig
+      dialogs:
+        show:
+          save: Speichern
+          cancel: Abbrechen
       continue_editing:
         save_and_continue_editing: Speichern & Bearbeiten fortsetzen
       form_actions:
@@ -76,3 +68,6 @@ de:
   time:
     formats:
       short: "%A, %d %B %Y"
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"

data/config/locales/el.yml

@@ -1,38 +1,30 @@
 el:
-  will_paginate:
-    previous_label: "«"
-    next_label: "»"
-  plugins:
-    refinery_core:
-      title: Refinery
-      description: Core refinery plugin
-    refinery_dialogs:
-      title: Διάλογοι
-      description: Refinery dialogs plugin
-  welcome:
-    there_are_no_users: Δεν υπάρχουν χρήστες προς το παρόν, οπότε θα φτιάξουμε έναν για εσένα.
-    remember_admin_location: "Θυμήσου ότι η διεύθυνση διαχείρισης του Refinery είναι:"
-    lets_start: Τέλεια, ας φτιάξουμε ένα λογαριασμό για να συνδεθείς...
-    continue: Συνέχεια...
-  admin:
-    menu:
-      reorder_menu: Αναδιάταξη μενού
-      reorder_menu_done: Μόλις αναδιάταξα το μενού
-    dialogs:
-      show:
-        save: Αποθήκευση
-        cancel: Ακύρωση
   refinery:
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Core refinery plugin
+      refinery_dialogs:
+        title: Διάλογοι
+        description: Refinery dialogs plugin
+    welcome:
+      there_are_no_users: Δεν υπάρχουν χρήστες προς το παρόν, οπότε θα φτιάξουμε έναν για εσένα.
     crudify:
       created: '%{what} προστέθηκε επιτυχώς.'
       updated: '%{what} επεξεργάστηκε επιτυχώς.'
       destroyed: '%{what} αφαιρέθηκε επιτυχώς.'
-  shared:
     site_bar:
       log_out: Αποσύνδεση
       switch_to_your_website: Δες τον ιστότοπο
       switch_to_your_website_editor: Δες τη διαχείριση
     admin:
+      menu:
+        reorder_menu: Αναδιάταξη μενού
+        reorder_menu_done: Μόλις αναδιάταξα το μενού
+      dialogs:
+        show:
+          save: Αποθήκευση
+          cancel: Ακύρωση
       continue_editing:
         save_and_continue_editing: Αποθήκευση και συνέχισε
       form_actions:
@@ -76,3 +68,6 @@ el:
   time:
     formats:
       short: "%A, %d %B %Y"
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"

data/config/locales/en.yml

@@ -1,41 +1,33 @@
 en:
-  will_paginate:
-    previous_label: "«"
-    next_label: "»"
-  js:
-    admin:
-      confirm_changes: Any changes you've made will be lost. Are you sure you want to continue without saving?
-  plugins:
-    refinery_core:
-      title: Refinery
-      description: Core refinery plugin
-    refinery_dialogs:
-      title: Dialogs
-      description: Refinery dialogs plugin
-  welcome:
-    there_are_no_users: "There are no users yet, so we'll set you up first."
-    remember_admin_location: "Remember your Refinery admin area is at:"
-    lets_start: Alright let's get you setup so you can login...
-    continue: Continue...
-  admin:
-    menu:
-      reorder_menu: Reorder menu
-      reorder_menu_done: I'm done reordering the menu
-    dialogs:
-      show:
-        save: Save
-        cancel: Cancel
   refinery:
+    js:
+      admin:
+        confirm_changes: Any changes you've made will be lost. Are you sure you want to continue without saving?
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Core refinery plugin
+      refinery_dialogs:
+        title: Dialogs
+        description: Refinery dialogs plugin
+    welcome:
+      there_are_no_users: "There are no users yet, so we'll set you up first."
     crudify:
       created: '%{what} was successfully added.'
       updated: '%{what} was successfully updated.'
       destroyed: '%{what} was successfully removed.'
-  shared:
     site_bar:
       log_out: Log out
       switch_to_your_website: Switch to your website
       switch_to_your_website_editor: Switch to your website editor
     admin:
+      menu:
+        reorder_menu: Reorder menu
+        reorder_menu_done: I'm done reordering the menu
+      dialogs:
+        show:
+          save: Save
+          cancel: Cancel
       continue_editing:
         save_and_continue_editing: 'Save & continue editing'
       form_actions:
@@ -45,9 +37,9 @@ en:
         delete: Remove
         close: Close
       image_picker:
-        none_selected: 'There is currently no %{what} selected, please click here to add one.'
-        remove_current: 'Remove current %{what}'
-        change: Click here to pick a image
+        none_selected: There is currently no image selected, please click here to add one.
+        remove_current: Remove current image
+        change: Click here to pick an image
         show: Show
       resource_picker:
         download_current: Download current file
@@ -79,4 +71,6 @@ en:
   time:
     formats:
       short: "%A, %d %B %Y"
-      
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"