alchemy_cms 2.5.3.1 → 2.6.0.rc5

data/app/views/alchemy/navigation/_link.html.erb

@@ -1,20 +1,20 @@
-<% if page.redirects_to_external? -%>
+<% if page.redirects_to_external? %>
   <%= link_to(
     h(page.name),
     page.urlname,
     :title => options[:show_title] == true ? page.title : nil,
     :target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil,
     :class => external_page_css_class(page)
-  ) -%>
-<% else -%>
+  ) %>
+<% else %>
   <%= link_to(
     h(page.name),
-    @preview_mode ? 'javascript:void(0)' : show_alchemy_page_path(page),
+    @preview_mode ? 'javascript: void(0)' : show_alchemy_page_path(page),
     {
       :class => (page_active?(page) ? 'active' : nil),
       :title => (options[:show_title] ? page.title : nil),
       :lang => page.language_code,
-      'data-page-id' => page.id
+      :data => {'page-id' => page.id}
     }
-  ) -%>
-<% end -%>
+  ) %>
+<% end %>

data/app/views/alchemy/navigation/_renderer.html.erb

@@ -1,37 +1,30 @@
-<% unless pages.blank? -%>
-  <%= content_tag(
-    'ul',
-    :class => html_options[:class] || "navigation level_#{pages.first.level - 1}",
-    :id => html_options[:id]
-  ) do %>
-    <% pages.each do |page| -%>
-      <% position = 'first' if page == pages.to_a.first -%>
-      <% position = 'last' if page == pages.to_a.last -%>
-      <%= content_tag(
-        'li',
-        :class => [page.urlname, position, page_active?(page) ? 'active' : nil].compact.join(' ')
-      ) do %>
-        <%= render(
-          :partial => options[:navigation_link_partial],
-          :object => page,
-          :locals => {
-            :page => page,
-            :options => options
-          }
-        ) -%>
-        <% options[:from_page] = page -%>
-        <% if options[:reverse_children] -%>
-          <%- options[:reverse] = true -%>
-        <% end -%>
-        <% if options[:show_nonactive] -%>
-        <%= render_navigation(options) if options[:submenu] -%>
-        <% else -%>
-        <%= render_navigation(options) if (options[:submenu] && page_active?(page)) || options[:all_sub_menues] -%>
-        <% end -%>
-      <% end -%>
-      <% unless options[:spacer].empty? -%>
-        <%= raw "<li class=\"navigation_spacer\">#{options[:spacer]}</li>" unless page == pages.to_a.last -%>
-      <% end -%>
-    <% end -%>
+<% if pages.present? %>
+<%= content_tag(
+  'ul',
+  :class => html_options[:class] || "navigation level_#{pages.first.level - 1}",
+  :id => html_options[:id]
+) do %>
+  <% pages.each do |page| %>
+    <% position = 'first' if page == pages.first %>
+    <% position = 'last' if page == pages.last %>
+    <%= content_tag(
+      'li',
+      :class => [page.slug, position, page_active?(page) ? 'active' : nil].compact.join(' ')
+    ) do %>
+      <%= render options[:navigation_link_partial], :page => page, :options => options %>
+      <% options[:from_page] = page %>
+      <% if options[:reverse_children] %>
+        <% options[:reverse] = true %>
+      <% end %>
+      <% if options[:show_nonactive] %>
+      <%= render_navigation(options) if options[:submenu] %>
+      <% else %>
+      <%= render_navigation(options) if (options[:submenu] && page_active?(page)) || options[:all_sub_menues] %>
+      <% end %>
+    <% end %>
+    <% if options[:spacer].present? && position != 'last' %>
+      <%= content_tag :li, options[:spacer].html_safe, class: 'navigation_spacer' %>
+    <% end %>
   <% end %>
-<% end -%>
+<% end %>
+<% end %>

data/app/views/alchemy/notifications/admin_user_created.de.text.erb

@@ -6,6 +6,10 @@ Um die Inhalte Ihrer Webseite zu bearbeiten klicken Sie bitte auf folgenden Link
 
 Ihr Benutzername lautet: <%= @user.login %>
 
-(Aus Sicherheitsgründen stellen wir Ihr Passwort hier nicht da. Wenn Sie Ihr Passwort vergessen haben oder dies Ihr erster Login ist, gehen Sie bitte auf: <%= new_password_url(@user) %>)
+Aus Sicherheitsgründen stellen wir Ihr Passwort hier nicht dar.
+
+Wenn Sie Ihr Passwort vergessen haben oder dies Ihr erster Login ist, gehen Sie bitte auf:
+
+<%= alchemy.new_password_url %>
 
 Viel Spaß mit Alchemy!

data/app/views/alchemy/notifications/admin_user_created.en.text.erb

@@ -6,6 +6,10 @@ To manage your website open a browser and go to:
 
 Your username is: <%= @user.login %>
 
-(For security reasons we do not show your password here. If you forgot your password or this is your first login, please goto: <%= new_password_url(@user) %>)
+For security reasons we do not show your password here.
+
+If you forgot your password or this is your first login, please goto:
+
+<%= alchemy.new_password_url %>
 
 Have much fun with Alchemy!

data/app/views/alchemy/notifications/registered_user_created.de.text.erb

@@ -0,0 +1,13 @@
+Hallo <%= @user.name %>!
+
+Ihnen wurde ein Benutzerkonto eingerichtet.
+
+Ihr Benutzername lautet: <%= @user.login %>
+
+Es wurde ein Zufallspasswort generiert. Aus Sicherheitsgründen wird dieses hier aber nicht angezeigt.
+
+Klicken Sie bitte daher auf den folgenden Link (*), um sich ein neues Passwort zu vergeben:
+
+<%= alchemy.new_password_url(@user, email: @user.email) %>
+
+*) Sollte dies nicht funktionieren, so kopieren Sie Sich bitte diesen Link und tragen Sie ihn in die Adresszeile Ihres Webbrowsers ein.

data/app/views/alchemy/notifications/registered_user_created.en.text.erb

@@ -0,0 +1,13 @@
+Greetings <%= @user.name %>!
+
+A login was created for you.
+
+Your username is: <%= @user.login %>
+
+The password was randomly created. For security reasons it is not displayed here.
+
+Please follow this link (*) to reset your password:
+
+<%= alchemy.new_password_url(@user, email: @user.email) %>
+
+*) If this does not work, please copy the url and paste it into the address bar of your web browser.

data/app/views/alchemy/search/_result.html.erb

@@ -1,9 +1,7 @@
 <li class="search_result">
-  <h3>
-    <%= _t('search_result_page.result_page') %>:
-    <%= link_to page.name, show_alchemy_page_path(page) %>
-  </h3>
-  <%- result.each do |highlight| -%>
+  <h3><%= page.name %></h3>
+  <% result.each do |highlight| %>
     <p><%= sanitize highlight.force_encoding('UTF-8') %></p>
-  <%- end -%>
+  <% end %>
+  <p><%= link_to page.urlname, show_alchemy_page_path(page) %></p>
 </li>

data/app/views/alchemy/search/_results.html.erb

@@ -16,12 +16,11 @@
     <% end %>
     <ul class="search_result_list">
       <% @search_results.each do |search_result| %>
-        <% result = search_result.highlight(
-          "*#{params[:query]}*", {
-            :field => (search_result.class.name == "Alchemy::EssenceRichtext" ? :stripped_body : :body)
-          }
+        <%= render('alchemy/search/result',
+          result: search_result.highlight("*#{params[:query]}*"),
+          options: options,
+          page: search_result.page
         ) %>
-        <%= render 'alchemy/search/result', :result => result, :options => options, :page => search_result.page %>
       <% end %>
     </ul>
   <% end %>

data/app/views/alchemy/user_sessions/leave.html.erb

@@ -6,6 +6,6 @@
   </p>
   <%= form_tag alchemy.logout_path, :method => :delete, :class => 'buttons' do %>
     <label><%= _t('or to completly') %></label>
-    <%= button _t('logout') %>
+    <%= button _t(:logout) %>
   <% end %>
 </div>

data/app/views/alchemy/user_sessions/new.html.erb

@@ -21,14 +21,14 @@
           <td class="input">
             <%= f.password_field :password, :class => 'thin_border' %>
             <p class="foot_note">
-              <%= link_to _t('Forgot your password?'), new_password_path(@user) %>
+              <%= link_to _t('Forgot your password?'), new_password_path %>
             </p>
           </td>
         </tr>
         <tr>
           <td colspan="2" class="submit">
             <%= hidden_field_tag 'user_screensize' %>
-            <%= f.button _t('login'), :class => 'button', :name => nil %>
+            <%= f.button _t(:login), :class => 'button', :name => nil %>
           </td>
         </tr>
       </table>

data/app/views/kaminari/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="first">
+  <%= link_to_unless current_page.first?, '&laquo;'.html_safe, url, :remote => remote, :title => t('views.pagination.first'), :class => 'button' %>
+</span>

data/app/views/kaminari/_gap.html.erb

@@ -5,4 +5,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap"><%= raw(_t 'pagination.truncate') -%></span>
+<span class="page gap">&hellip;</span>

data/app/views/kaminari/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="last">
+  <%= link_to_unless current_page.last?, '&raquo;'.html_safe, url, {:remote => remote, :title => t('views.pagination.last'), :class => 'button'} %>
+</span>

data/app/views/kaminari/_next_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% if current_page.last? -%>
-<span class="next_page disabled"><%= raw(_t 'pagination.next_page') -%></span>
+<span class="next_page disabled">&rsaquo;</span>
 <% else -%>
-<%= link_to raw(_t 'pagination.next_page'), url, :rel => 'next', :remote => remote -%>
+<%= link_to '&rsaquo;'.html_safe, url, :rel => 'next', :remote => remote, :title => t('views.pagination.next_page'), :class => "next_page button" -%>
 <% end -%>

data/app/views/kaminari/_page.html.erb

@@ -10,5 +10,5 @@
 <% if page.current? -%>
 <span class="page current"><%= page -%></span>
 <% else -%>
-<%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} -%>
+<%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil, :class => 'button'} -%>
 <% end -%>

data/app/views/kaminari/_paginator.html.erb

@@ -8,6 +8,7 @@
 -%>
 <%= paginator.render do -%>
   <div class="pagination">
+    <%= first_page_tag %>
     <%= prev_page_tag -%>
     <% each_page do |page| -%>
       <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
@@ -17,5 +18,6 @@
       <% end -%>
     <% end -%>
     <%= next_page_tag -%>
+    <%= last_page_tag %>
   </div>
 <% end -%>

data/app/views/kaminari/_prev_page.html.erb

@@ -7,7 +7,7 @@
     remote:        data-remote
 -%>
 <% if current_page.first? -%>
-<span class="previous_page disabled"><%= raw(_t 'pagination.previous_page') %></span>
+<span class="previous_page disabled">&lsaquo;</span>
 <% else -%>
-<%= link_to raw(_t 'pagination.previous_page'), url, :rel => 'prev', :remote => remote, :class => 'previous_page' -%>
+<%= link_to '&lsaquo;'.html_safe, url, :rel => 'prev', :remote => remote, :class => 'previous_page button', :title => t('views.pagination.previous_page') -%>
 <% end -%>

data/app/views/layouts/alchemy/admin.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="no-js">
   <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title><%= render_alchemy_title %></title>
     <%= csrf_meta_tag %>
     <meta name="robots" content="noindex">
@@ -32,8 +32,7 @@
     </noscript>
     <div id="overlay">
       <div id="overlay_text_box">
-        <%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
-        <span id="overlay_text"><%= _t("please_wait") %></span>
+        <span id="overlay_text"><%= _t(:please_wait) %></span>
       </div>
     </div>
     <div id="left_menu">
@@ -44,7 +43,7 @@
       <div id="logout">
         <% if current_user %>
           <%= link_to_overlay_window(
-            "<span class='module icon exit'></span><label>#{_t('leave')}</label>".html_safe,
+            "<span class='module icon exit'></span><label>#{_t(:leave)}</label>".html_safe,
             alchemy.leave_admin_path, {
               :size => "300x105",
               :title => _t("Leave Alchemy")
@@ -52,7 +51,7 @@
         <% else %>
           <%= link_to(alchemy.root_path) do %>
             <span class="module icon exit"></span>
-            <label><%= _t('leave') %></label>
+            <label><%= _t(:leave) %></label>
           <% end %>
         <% end %>
       </div>

data/config/alchemy/config.yml

@@ -60,31 +60,27 @@ sitemap:
 
 # === URL nesting
 #
-# By default Alchemy does not nest page urls respectivley to their page tree position.
+# Since Alchemy 2.6.0 page urls are nested, respectivley to their tree position.
 #
-# Enable +url_nesting+ to get nested urls.
+# Disable +url_nesting+ to get slug only urls.
 #
-# ==== Example of a nested url:
+# NOTE: After changing the url_nesting, you should run one of these convert rake task:
 #
-# +http://homepage.com/company/history/the-early-years+
+#   rake alchemy:convert:urlnames:to_nested
+#   rake alchemy:convert:urlnames:to_slug
 #
-# Alchemy supports url nesting up to three levels deep. We think that's more then enough,
-# because URLs like this are possible:
-#
-# +http://homepage.com/en/2011/12/08/my-post
-#
-url_nesting: false
+url_nesting: true
 
 # === Picture rendering settings
 #
-# Alchemy uses Dragonfly and RMagick to render images. Use {:image_size => "XXXxYYY", :crop => BOOLEAN [true]} to resize images.
+# Alchemy uses Dragonfly to render images. Use {:image_size => "XXXxYYY", :crop => BOOLEAN [true]} to resize images.
 #
 # See http://markevans.github.com/dragonfly for further infos.
 #
 # ==== Options:
 #
 #   output_image_jpg_quality  [Integer]       # If image gets rendered as JPG this is the quality setting for it. (Default 85)
-#   preprocess_image_resize   [String]        # I.E.: 1000x1000. If you are limited on diskspace use this option to downsize large images to that value. (Default nil)
+#   preprocess_image_resize   [String]        # Use this option to resize images to that value. Downsizing example: '1000x1000>' (Default nil)
 #   image_output_format       [String]        # The global image output format setting.
 #
 # TIP: You can always override the output format in the options of your Essence. I.E. {:format => :gif}

data/config/authorization_rules.rb

@@ -18,7 +18,8 @@ authorization do
   role :registered do
     includes :guest
     has_permission_on :alchemy_pages, :to => [:show] do
-      if_attribute :public => true
+      if_attribute :public => true, :restricted => true
+      if_attribute :public => true, :restricted => false
     end
     has_permission_on :alchemy_elements, :to => [:show] do
       if_attribute :public => true
@@ -36,7 +37,7 @@ authorization do
     has_permission_on :alchemy_pictures, :to => [:thumbnail]
     has_permission_on :alchemy_admin_pages, :to => [:index, :fold, :edit_page_content, :link]
     has_permission_on :alchemy_admin_elements, :to => [:manage_elements]
-    has_permission_on :alchemy_admin_pictures, :to => [:index, :archive_overlay, :show_in_window, :info]
+    has_permission_on :alchemy_admin_pictures, :to => [:read, :archive_overlay, :info]
     has_permission_on :alchemy_admin_attachments, :to => [:index, :archive_overlay, :show, :download]
     has_permission_on :alchemy_admin_contents, :to => [:manage_contents]
     has_permission_on :alchemy_admin_essence_pictures, :to => [:manage_picture_essences]
@@ -60,7 +61,7 @@ authorization do
 
   role :admin do
     includes :editor
-    has_permission_on :alchemy_admin_users, :to => [:manage, :update_role]
+    has_permission_on :alchemy_admin_users, :to => [:manage, :update_roles]
     has_permission_on :alchemy_admin_languages, :to => [:manage]
     has_permission_on :authorization_rules, :to => :read
     has_permission_on :alchemy_admin_sites, :to => [:manage]

data/config/initializers/dragonfly.rb

@@ -1,20 +1,28 @@
 # Alchemy CMS Dragonfly configuration.
-app = Dragonfly[:alchemy_pictures]
 
-app.configure_with :imagemagick
-app.configure_with :rails
-app.define_macro ActiveRecord::Base, :image_accessor
-
-app.configure do |c|
-
-  c.datastore.configure do |d|
-    d.root_path = Rails.root.join('uploads/pictures').to_s
-    d.store_meta = false
+# Pictures
+pictures = Dragonfly[:alchemy_pictures]
+pictures.configure_with :imagemagick
+pictures.configure_with :rails
+pictures.define_macro ActiveRecord::Base, :image_accessor
+pictures.configure do |config|
+  config.datastore.configure do |store|
+    store.root_path = Rails.root.join('uploads/pictures').to_s
+    store.store_meta = false
   end
-
   # You only need this if you use Dragonfly url helpers, what you not need to ;)
   # If you use the Dragonfly url helpers and you have a different mountpoint for Alchemy,
   # you have to alter this to include the mountpoint.
-  c.url_format = '/pictures/:job/:basename.:format'
+  config.url_format = '/pictures/:job/:basename.:format'
+end
 
+# Attachments
+attachments = Dragonfly[:alchemy_attachments]
+attachments.configure_with :rails
+attachments.define_macro ActiveRecord::Base, :file_accessor
+attachments.configure do |config|
+  config.datastore.configure do |store|
+    store.root_path = Rails.root.join('uploads/attachments').to_s
+    store.store_meta = false
+  end
 end

data/config/locales/alchemy.de.yml

@@ -134,12 +134,7 @@ de:
     mailer:
       # The mail the user gets after registering for alchemy
       new_user_mail:
-        subject: 'Ihre Zugangsdaten zu meiner Seite'
-        welcome: 'Willkommen auf meiner Seite'
-        login_url_explanation: 'Zum Anmelden klicken Sie bitte auf folgenden Link'
-        username: 'Ihr Benutzername lautet:'
-        password_notice: "(Aus Sicherheitsgründen stellen wir Ihr Passwort hier nicht da. Wenn Sie Ihr Passwort vergessen haben oder dies Ihr erster Login ist, gehen Sie bitte auf: %{url})"
-        greeting: 'Einen schönen Tag noch'
+        subject: 'Ihre Zugangsdaten'
 
     # == Translated language names for translation select
     translations:
@@ -222,7 +217,7 @@ de:
     "Error with the Flash® Uploader!": "Fehler mit dem Flash® Uploader!"
     "Excerpt": "Auszug"
     "File %{name} uploaded succesfully": "Datei %{name} wurde hochgeladen"
-    "File renamed successfully from: '%{from}' to '%{to}'": "Datei wurde erfolgreich von: '%{from}' nach '%{to}' umbenannt."
+    "File successfully updated": "Datei wurde erfolgreich gespeichert."
     "File upload error: %{error}": "Datei konnte nicht hochgeladen werden: %{error}"
     "File: '%{name}' deleted successfully": "%{name} wurde gelöscht"
     "Filter by tag": "Nach Tags filtern"
@@ -395,6 +390,7 @@ de:
     delete_user: "Benutzer löschen"
     document: "Dokument"
     documents: "Dateien"
+    download_csv: "CSV runterladen"
     download_file: "%{filename} runterladen"
     do_you_really_want_to_delete_this_tag?: "Wollen Sie dieses Tag wirklich löschen?"
     drag_to_sort: "Mit der Maus halten und verschieben"
@@ -519,10 +515,6 @@ de:
     pages:
       update:
         comma_seperated: "Durch Kommata getrennt eingeben"
-    pagination:
-      next_page: "nächste Seite »"
-      previous_page: "« vorherige Seite"
-      truncate: '...'
     password: "Passwort"
     paste: "einfügen"
     picture_gallery_editor: 'Bilder'
@@ -550,6 +542,9 @@ de:
     rename: umbenennen
     replace: ersetzen
     'Replaced Tag %{old_tag} with %{new_tag}': "Das Tag '%{old_tag}' wurde durch das Tag '%{new_tag}' ersetzt"
+    resources:
+      relation_select:
+        blank: '- ohne -'
     right: "rechts"
     robot_follow: "den Robot Links folgen lassen"
     robot_index: "durch Robot indizieren"
@@ -825,6 +820,9 @@ de:
   activerecord:
 
     models:
+      acts_as_taggable_on/tag:
+        one: Tag
+        other: Tags
 
       alchemy/attachment:
         one: "Datei"
@@ -861,11 +859,11 @@ de:
         taggings_count: Anzahl Verwendung
 
       alchemy/attachment:
-        content_type: "Dateityp"
+        file_mime_type: "Dateityp"
         created_at: "Erstellt Am"
-        filename: "Dateiname"
+        file_name: "Dateiname"
         name: "Name"
-        size: "Dateigröße"
+        file_size: "Dateigröße"
         tag_list: Tags
 
       alchemy/element:
@@ -940,7 +938,7 @@ de:
         name: "Name"
         password: "Passwort"
         password_confirmation: "Passwort Bestätigung"
-        role: "Benutzerrolle"
+        roles: "Benutzerrollen"
         tag_list: Tags
 
       alchemy/site:
@@ -952,3 +950,10 @@ de:
 
     errors:
       <<: *errors
+
+  views:
+    pagination:
+      first: "erste Seite"
+      previous_page: "vorherige Seite"
+      next_page: "nächste Seite"
+      last: "letzte Seite"