refinerycms-core 2.0.10 → 2.1.0

data/config/locales/sv.yml

@@ -47,13 +47,17 @@ sv:
         current: Aktuell fil
       search:
         button_text: Sök
-        results_for: Sökresultat för '%{query}'
+        results_for_html: "Sökresultat för &#8216;<em>%{query}</em>&#8217;"
         no_results: Tyvärr, sökningen gav inga träffar.
       delete:
         message: 'Är du säker på att du vill ta bort %{title}?'
       error_messages:
         problems_in_following_fields: Det uppstod problem med följande fält
       help: hjälp
+      form_advanced_options_menu:
+        advanced_options: Avancerade alternativ
+        toggle_advanced_options: Klicka för att få tillgång till meta-taggar och menyval
+        save_as_draft: Spara som Utkast
     message:
       close: Stäng
       close_this_message: Stäng detta meddelande

data/config/locales/tr.yml

@@ -0,0 +1,82 @@
+tr:
+  refinery:
+    js:
+      admin:
+        confirm_changes: Yaptiginiz degisiklikler kaybolacaktir. Kayit etmeden devam etmek istediginize emin misiniz ?
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Cekirdek refinery eklentisi
+      refinery_dialogs:
+        title: Iletisim
+        description: Refinery diyalog eklentisi
+    welcome:
+      there_are_no_users: "Henuz kayitli bir kullanici yok. Ilk once sizi kayit edelim."
+    crudify:
+      created: '%{what} basari ile eklendi'
+      updated: '%{what} basari ile guncellendi'
+      destroyed: '%{what} basari ile silindi.'
+    site_bar:
+      log_out: Cikis Yap
+      switch_to_your_website: Web Siteni Ac
+      switch_to_your_website_editor: Web Site Editorunu Ac
+    admin:
+      menu:
+        reorder_menu: Yeniden duzenleme menusu
+        reorder_menu_done: Yeniden duzenleme tamamlandi
+      dialogs:
+        show:
+          save: Kayit Et
+          cancel: Vazgec
+      continue_editing:
+        save_and_continue_editing: 'Kaydet & Duzenlemeye Devam Et'
+      form_actions:
+        save: Kayit Et
+        cancel: Vazgec
+        cancel_lose_changes: Eger vazgec'e tiklarsaniz burada yaptiginiz degisiklikler kaybolacaktir.
+        delete: Sil
+        close: Kapat
+      image_picker:
+        none_selected: Secilmis bir fotograf bulunmamaktadir. Eklemek icin buraya tiklayin
+        remove_current: Mevcut fotografi sil
+        change: Fotograf secmek icin tiklayin
+        show: Goster
+      resource_picker:
+        download_current: Mevcut dosyayi indir
+        opens_in_new_window: Yeni bir pencerede ac
+        remove_current: "Mevcut dosyayi sil"
+        no_resource_selected: 'Herhangi bir dosya secilmemis. Eklemek icin tiklayin'
+        name: Dosya Ekle
+        current: Mevcut Dosya
+      search:
+        button_text: Arama
+        results_for_html: " &#8216;<em>%{query}</em>&#8217; icin arama sonucu"
+        no_results: 'Uzgunum, herhangi bir sonuc bulunamadi'
+        cancel_search: 'Aramayi iptal et'
+        search_input_notice: "Buraya aradiginiz karakterleri iceren en az 3 tane harf girin."
+      delete:
+        message: " '%{title}' Silmek istediginize emin misiniz?"
+      error_messages:
+        problems_in_following_fields: Asagidaki alanlarda problem vardir.
+      help: yardim
+      form_advanced_options_menu:
+        advanced_options: Gelismis Secenekler
+        toggle_advanced_options: Gelismis Secenekleri Ac
+        save_as_draft: Taslak Olarak Kaydet
+    message:
+      close: Kapat
+      close_this_message: Bu Mesaji Kapat
+    draft_page_message:
+      not_live: Bu sayfa halka acik canli goruntuleme degildir.
+    footer:
+      copyright: "Telif Hakki © %{year} %{site_name}"
+    no_script:
+      enable_javascript_html: Bu sayfanin tum fonsiyonlari icin JavaScript'in aktif olmasi gerekmekte
+      here_are: Iste burada
+      instructions_enable_javascript_html: Tarayicinizin JavaScript'ini nasil aktif edilecegi.
+  time:
+    formats:
+      short: "%A, %d %B %Y"
+  will_paginate:
+    previous_label: "&laquo;"
+    next_label: "&raquo;"

data/config/locales/uk.yml

@@ -0,0 +1,77 @@
+uk:
+  refinery:
+    plugins:
+      refinery_core:
+        title: Refinery
+        description: Ядро Refinery
+      refinery_dialogs:
+        title: Діалоги
+        description: Плагін для діалогів Refinery
+    welcome:
+      there_are_no_users: "Жодного користувача не створено. Ви будете першим."
+    crudify:
+      created: "%{what} створений(а)."
+      updated: "%{what} відредагований(а)."
+      destroyed: "%{what} знищений(а)."
+    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:
+        save: Зберегти
+        cancel: Відміна
+        cancel_lose_changes: При скасуванні всі зміни будуть втрачені
+        delete: Видалити
+        close: Закрити
+      image_picker:
+        none_selected: Жодного зображення не вибрано. Будь ласка, натисніть тут, щоб додати зображення.
+        remove_current: Видалити поточне зображення
+        change: Натисніть тут, щоб вибрати зображення
+        show: Показати
+      resource_picker:
+        download_current: Завантажити поточний файл
+        opens_in_new_window: Відкриється в новому вікні
+        remove_current: "Видалити поточний файл"
+        no_resource_selected: Жоден файл не вибраний, натисніть тут, щоб додати файл.
+        name: Додати файл
+        current: Поточний файл
+      search:
+        button_text: Пошук
+        results_for_html: "Результати пошуку для &#8216;<em>%{query}</em>&#8217;"
+        no_results: Нічого не знайдено
+      delete:
+        message: Ви впевнені, що хочете видалити '%{title}'?
+      error_messages:
+        problems_in_following_fields: Виявлені проблеми з наступними полями
+      help: Допомога
+      form_advanced_options_menu:
+        advanced_options: Додаткові налаштування
+        toggle_advanced_options: Налаштування мета-тегів, меню та ін.
+        save_as_draft: Зберегти як чернетку
+    message:
+      close: Закрити
+      close_this_message: Закрити це повідомлення
+    draft_page_message:
+      not_live: Ця сторінка не призначена для публічного перегляду.
+    footer:
+      copyright: © %{site_name}, %{year}
+    no_script:
+      enable_javascript_html: Для використання всіх можливостей цієї сторінки необхідно увімкнути JavaScript
+      here_are: Вот
+      instructions_enable_javascript_html: інструкції як включити Javascript у вашому браузері
+  time:
+    formats:
+      short: "%A, %d %B %Y"
+  will_paginate:
+    previous_label: "&laquo;"
+    next_label: "&raquo;"

data/config/locales/vi.yml

@@ -47,13 +47,17 @@ vi:
         current: File hiện tại
       search:
         button_text: Tìm kiếm
-        results_for: Các kết quả tìm kiếm với truy vấn '%{query}'
+        results_for_html: "Các kết quả tìm kiếm với truy vấn &#8216;<em>%{query}</em>&#8217;"
         no_results: Rất tiếc, không có kết quả nào được tìm thấy
       delete:
         message: Bạn có thực sự chắc chắn khi xóa bỏ '%{title}' không?
       error_messages:
         problems_in_following_fields: Có lỗi xảy ra với những trường sau
       help: giúp đỡ
+      form_advanced_options_menu:
+        advanced_options: Các tùy chọn nâng cao
+        toggle_advanced_options: Mở các thiết lập meta-tag và menu
+        save_as_draft: Lưu trữ dưới dạng bản thảo
     message:
       close: Đóng
       close_this_message: Đóng thông báo này

data/config/locales/zh-CN.yml

@@ -47,13 +47,17 @@ zh-CN:
         current: 当前文件
       search:
         button_text: 搜索
-        results_for: 搜索 '%{query}' 的结果
+        results_for_html: "搜索 &#8216;<em>%{query}</em>&#8217; 的结果"
         no_results: 对不起, 没有找到结果
       delete:
         message: 您确认要删除 '%{title}'?
       error_messages:
         problems_in_following_fields: 以下字段存在问题
       help: 帮助
+      form_advanced_options_menu:
+        advanced_options: 高级选项
+        toggle_advanced_options: meta 标签设定与菜单选项
+        save_as_draft: 另存为草稿
     message:
       close: 关闭
       close_this_message: 关闭这条信息

data/config/locales/zh-TW.yml

@@ -47,13 +47,17 @@ zh-TW:
         current: 目前檔案
       search:
         button_text: 搜尋
-        results_for: 搜尋 '%{query}' 的結果
+        results_for_html: "搜尋 &#8216;<em>%{query}</em>&#8217; 的結果"
         no_results: 抱歉, 沒有任何搜尋結果
       delete:
         message: 確定要移除 '%{title}' 嗎?
       error_messages:
         problems_in_following_fields: 以下幾個欄位出現問題
       help: 求助
+      form_advanced_options_menu:
+        advanced_options: 進階選項
+        toggle_advanced_options: 存取 meta 標籤設定與選單選項
+        save_as_draft: 儲存草稿
     message:
       close: 關閉
       close_this_message: 關閉這個訊息

data/config/routes.rb

@@ -1,14 +1,14 @@
 Refinery::Core::Engine.routes.draw do
   filter(:refinery_locales) if defined?(RoutingFilter::RefineryLocales) # optionally use i18n.
   get 'wymiframe(/:id)', :to => 'fast#wymiframe', :as => :wymiframe
-  get 'refinery/message', :to => 'fast#message', :as => :message
+  get "#{Refinery::Core.backend_route}/message", :to => 'fast#message', :as => :message
 
-  namespace :admin, :path => 'refinery' do
+  namespace :admin, :path => Refinery::Core.backend_route do
     root :to => 'dashboard#index'
     resources :dialogs, :only => [:index, :show]
   end
 
-  match '/refinery/update_menu_positions', :to => 'admin/core#update_plugin_positions'
+  post "/#{Refinery::Core.backend_route}/update_menu_positions", :to => 'admin/core#update_plugin_positions'
 
   get '/sitemap.xml' => 'sitemap#index', :defaults => { :format => 'xml' }
 end

data/lib/generators/refinery/cms/cms_generator.rb

@@ -30,6 +30,8 @@ module Refinery
 
       append_gitignore!
 
+      append_asset_pipeline!
+
       forced_overwriting?
 
       copy_files!
@@ -49,6 +51,15 @@ module Refinery
 
   protected
 
+    def append_asset_pipeline!
+      application_css = 'app/assets/stylesheets/application.css'
+      if destination_path.join(application_css).file?
+        insert_into_file application_css, %q{*= require refinery/formatting
+ *= require refinery/theme
+ },      :before => "*= require_self"
+      end
+    end
+
     def append_gemfile!
       if destination_path.join('Gemfile').file? &&
          destination_path.join('Gemfile').read !~ %r{group :development, :test do\n.+?gem 'sqlite3'\nend}m
@@ -149,6 +160,24 @@ gem 'pg'
       %w(development test production).map{|e| "config/environments/#{e}.rb"}.each do |env|
         next unless destination_path.join(env).file?
 
+        # Refinery does not necessarily expect action_mailer to be available as
+        # we may not always require it (currently only the authentication extension).
+        # Rails, however, will optimistically place config entries for action_mailer.
+        current_mailer_config = File.read(destination_path.join(env)).to_s.
+                                     match(%r{^\s.+?config\.action_mailer\..+([\w\W]*\})?}).
+                                     to_a.flatten.first
+
+        if current_mailer_config.present?
+          new_mailer_config = [
+            "  if config.respond_to?(:action_mailer)",
+            current_mailer_config.gsub(%r{\A\n+?}, ''). # remove extraneous newlines at the start
+                                  gsub(%r{^\ \ }) { |line| "  #{line}" }, # add indentation on each line
+            "  end"
+          ].join("\n")
+
+          gsub_file env, current_mailer_config, new_mailer_config, :verbose => false
+        end
+
         gsub_file env, "config.assets.compile = false", "config.assets.compile = true", :verbose => false
       end
     end

data/lib/generators/refinery/cms/templates/.gitignore

@@ -20,6 +20,7 @@ public/themes/*
 # Public Cache
 public/javascripts/cache
 public/stylesheets/cache
+public/refinery/*
 
 # Vendor Cache
 vendor/cache

data/lib/generators/refinery/cms/templates/app/views/sitemap/index.xml.builder

@@ -5,20 +5,20 @@ 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
+      # 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 url_for(page_url)
-       xml.lastmod page.updated_at.to_date
-     end if page_url.present? and page.show_in_menu?
+      # Add XML entry only if there is a valid page_url found above.
+      xml.url do
+        xml.loc url_for(page_url)
+        xml.lastmod page.updated_at.to_date
+      end if page_url.present? and page.show_in_menu?
     end
   end
 

data/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb

@@ -10,6 +10,11 @@ Refinery::Core.configure do |config|
   # the default file system for storing resources and images
   config.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
 
+  # Use a custom Dragonfly storage backend instead of the default
+  # file system for storing resources and images
+  # config.dragonfly_custom_backend_class = <%= Refinery::Core.dragonfly_custom_backend_class.inspect %>
+  # config.dragonfly_custom_backend_opts = <%= Refinery::Core.dragonfly_custom_backend_opts.inspect %>
+
   # Whenever Refinery caches anything and can set a cache key, it will add
   # a prefix to the cache key containing the string you set here.
   # config.base_cache_key = <%= Refinery::Core.base_cache_key.inspect %>
@@ -25,22 +30,10 @@ Refinery::Core.configure do |config|
   # Enable/disable authenticity token on frontend
   # config.authenticity_token_on_frontend = <%= Refinery::Core.authenticity_token_on_frontend.inspect %>
 
-  # Hide/show child pages in menu
-  # config.menu_hide_children = <%= Refinery::Core.menu_hide_children.inspect %>
-
-  # CSS class selectors for menu helper
-  # config.menu_css = <%= Refinery::Core.menu_css.inspect %>
-
   # Should set this if concerned about DOS attacks. See
   # http://markevans.github.com/dragonfly/file.Configuration.html#Configuration
   # config.dragonfly_secret = <%= Refinery::Core.dragonfly_secret.inspect %>
 
-  # Show/hide IE6 upgrade message in the backend
-  # config.ie6_upgrade_message_enabled = <%= Refinery::Core.ie6_upgrade_message_enabled.inspect %>
-
-  # Show/hide browser update message in the backend
-  # config.show_internet_explorer_upgrade_message = <%= Refinery::Core.show_internet_explorer_upgrade_message.inspect %>
-
   # Add extra tags to the wymeditor whitelist e.g. = {'tag' => {'attributes' => {'1' => 'href'}}} or just {'tag' => {}}
   # config.wymeditor_whitelist_tags = <%= Refinery::Core.wymeditor_whitelist_tags.inspect %>
 
@@ -49,4 +42,7 @@ Refinery::Core.configure do |config|
 
   # Register extra stylesheet for backend (optional options)
   # config.register_stylesheet "custom", :media => 'screen'
+
+  # Specify a different backend path than the default of /refinery.
+  # config.backend_route = <%= Refinery::Core.backend_route.inspect %>
 end

data/lib/generators/refinery/dummy/templates/rails/database.yml

@@ -1,13 +1,13 @@
 login: &login
-<% if database == 'mysql' %>
-  adapter: mysql2
+<% if /mysql$/ === @database %>
+  adapter: mysql<%= '2' unless /jdbc/ === @database %>
   encoding: utf8
   reconnect: false
   pool: 5
   username: root
   password:
   #socket: /tmp/mysql.sock
-<% elsif database == 'postgresql' %>
+<% elsif /postgresql/ === @database %>
   adapter: postgresql
   encoding: unicode
   database: refinery_database_development

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

@@ -18,22 +18,18 @@ module Refinery
     end
 
     def generate
-      sanity_check!
-
-      evaluate_templates!
-
-      unless options[:pretend]
-        merge_locales!
-
-        copy_or_merge_seeds!
+      default_generate!
+    end
 
-        append_extension_to_gemfile!
+    def backend_route
+      @backend_route ||= if namespacing.underscore != plural_name
+          %Q{"#\{Refinery::Core.backend_route\}/#{namespacing.underscore}"}
+      else
+        "Refinery::Core.backend_route"
       end
-
-      finalize_extension!
     end
 
-  protected
+    protected
 
     def generator_command
       'rails generate refinery:engine'