alchemy_cms 2.4.beta2 → 2.4.rc1

data/app/models/alchemy/page.rb

@@ -2,6 +2,17 @@
 module Alchemy
   class Page < ActiveRecord::Base
 
+    RESERVED_URLNAMES = %w(admin messages new)
+    DEFAULT_ATTRIBUTES_FOR_COPY = {
+      :do_not_autogenerate => true,
+      :do_not_sweep => true,
+      :visible => false,
+      :public => false,
+      :locked => false,
+      :locked_by => nil
+    }
+    SKIPPED_ATTRIBUTES_ON_COPY = %w(id updated_at created_at creator_id updater_id lft rgt depth cached_tag_list)
+
     attr_accessible(
       :do_not_autogenerate,
       :do_not_sweep,
@@ -23,14 +34,15 @@ module Alchemy
       :robot_index,
       :robot_follow,
       :sitemap,
+      :tag_list,
       :title,
       :urlname,
       :visible
     )
 
-    RESERVED_URLNAMES = %w(admin messages new)
-
+    acts_as_taggable
     acts_as_nested_set(:dependent => :destroy)
+
     stampable(:stamper_class_name => 'Alchemy::User')
 
     has_many :folded_pages
@@ -177,19 +189,6 @@ module Alchemy
     end
     alias_method :next_page, :next
 
-    def find_first_public(page)
-      if (page.public == true)
-        return page
-      end
-      page.children.each do |child|
-        result = find_first_public(child)
-        if (result!=nil)
-          return result
-        end
-      end
-      return nil
-    end
-
     def name_entered?
       !self.name.blank?
     end
@@ -394,16 +393,11 @@ module Alchemy
     # You can pass any kind of Page#attributes as a difference to source.
     # Notice: It prevents the element auto_generator from running.
     def self.copy(source, differences = {})
-      attributes = source.attributes.symbolize_keys.merge(differences)
-      attributes.merge!(
-        :do_not_autogenerate => true,
-        :do_not_sweep => true,
-        :visible => false,
-        :public => false,
-        :locked => false,
-        :locked_by => nil
-      )
-      page = self.new(attributes.except(:id, :updated_at, :created_at, :creator_id, :updater_id, :lft, :rgt, :depth))
+      source.attributes.stringify_keys!
+      differences.stringify_keys!
+      attributes = source.attributes.merge(differences)
+      attributes.merge!(DEFAULT_ATTRIBUTES_FOR_COPY)
+      page = self.new(attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY))
       if page.save
         # copy the page´s cells
         source.cells.each do |cell|
@@ -527,6 +521,10 @@ module Alchemy
       "alchemy/#{language_code}/#{urlname}"
     end
 
+    def taggable?
+      definition['taggable'] == true
+    end
+
   private
 
     def next_or_previous(direction = :next, options = {})

data/app/models/alchemy/picture.rb

@@ -28,8 +28,8 @@ module Alchemy
       :image_height,
       :image_width,
       :name,
-      :upload_hash,
-      :tag_list
+      :tag_list,
+      :upload_hash
     )
 
     stampable(:stamper_class_name => 'Alchemy::User')

data/app/models/alchemy/tag.rb

@@ -0,0 +1,16 @@
+# Just holds some useful tag methods.
+# The original Tag model is ActsAsTaggableOn::Tag
+module Alchemy
+  class Tag
+
+    # Replaces tag with new tag on all models tagged with tag.
+    def self.replace(tag, new_tag)
+      tag.taggings.collect(&:taggable).each do |taggable|
+        taggable.tag_list.delete(tag.name)
+        taggable.tag_list << new_tag.name
+        taggable.save
+      end
+    end
+
+  end
+end

data/app/models/alchemy/user.rb

@@ -7,6 +7,7 @@ module Alchemy
       c.transition_from_restful_authentication = true
       c.logged_in_timeout = Config.get(:auto_logout_time).minutes
     end
+    acts_as_taggable
 
     attr_accessible(
       :firstname,
@@ -17,7 +18,8 @@ module Alchemy
       :role,
       :language,
       :password,
-      :password_confirmation
+      :password_confirmation,
+      :tag_list
     )
 
     has_many :folded_pages

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -3,31 +3,31 @@
     <%= render_icon attachment.icon_css_class %>
   </td>
   <td class="name">
-    <%- if permitted_to?(:show, :attachments) -%>
+  <% if permitted_to?(:show, :attachments) %>
     <%= link_to(
       attachment.name,
       alchemy.admin_attachment_path(attachment),
       :target => '_blank',
       :title => t('View File')
     ) %>
-    <%- else -%>
+  <% else %>
     <%= attachment.name %>
-    <%- end -%>
+  <% end %>
   </td>
   <td class="file_name"><%= attachment.filename %></td>
   <td class="file_type"><%= mime_to_human(attachment.content_type) %></td>
   <td class="file_size"><%= number_to_human_size(attachment.size) %></td>
   <td class="date"><%= l(attachment.created_at, :format => :short) %></td>
   <td class="tools long">
-    <%- permitted_to?(:download, :attachments) do -%>
+  <% permitted_to?(:download, :alchemy_attachments) do %>
     <%= link_to(
       "",
       alchemy.download_admin_attachment_path(attachment),
       :title => t("download_file", :filename => attachment.filename),
       :class => "icon file_download"
     ) %>
-    <%- end -%>
-    <%- permitted_to?(:destroy, :alchemy_admin_attachments) do -%>
+  <% end %>
+  <% permitted_to?(:destroy, :alchemy_admin_attachments) do %>
     <%= link_to_confirmation_window(
       "",
       t("confirm_to_delete_file"),
@@ -41,18 +41,18 @@
         :class => 'icon file_delete',
         :title => t('delete_file')
       }
-    ) -%>
-    <%- end -%>
-    <%- permitted_to?(:edit, :alchemy_admin_attachments) do -%>
+    ) %>
+  <% end %>
+  <% permitted_to?(:edit, :alchemy_admin_attachments) do %>
     <%= link_to_overlay_window("",
       alchemy.edit_admin_attachment_path(attachment, :query => params[:query], :page => params[:page]),
       {
         :title => t('rename_file'),
-        :size => '410x180'
+        :size => '380x220'
       },
       :class => 'icon file_edit',
       :title => t('rename_file')
-    ) -%>
-    <%- end -%>
+    ) %>
+  <% end %>
   </td>
 </tr>

data/app/views/alchemy/admin/attachments/edit.html.erb

@@ -1,12 +1,18 @@
 <%= form_for([:admin, @attachment], :url => {:action => :update, :query => params[:query], :page => params[:page]}) do |f| -%>
   <table>
     <tr>
-      <td class="label"><%= f.label 'name', :class => "short" %></td>
-      <td class="input"><%= f.text_field 'name', :class => 'thin_border very_long', :autofocus => true %></td>
+      <td class="label"><%= f.label 'name' %></td>
+      <td class="input"><%= f.text_field 'name', :class => 'thin_border long', :autofocus => true %></td>
     </tr>
     <tr>
-      <td class="label"><%= f.label 'filename', :class => "short" %>*</td>
-      <td class="input"><%= f.text_field 'filename', :class => 'thin_border very_long' %></td>
+      <td class="label"><%= f.label 'filename' %>*</td>
+      <td class="input"><%= f.text_field 'filename', :class => 'thin_border long' %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= f.label 'tag_list' %></td>
+      <td class="input">
+        <%= render 'alchemy/admin/partials/autocomplete_tag_list', :object => @attachment, :f => f %>
+      </td>
     </tr>
     <tr>
       <td colspan="2" class="submit">

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -1,23 +1,20 @@
-<div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id -%>" data-element-id="<%= element.id -%>">
+<div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>" data-element-id="<%= element.id %>">
   <%= render :partial => "alchemy/admin/elements/element_head", :locals => {:element => element} %>
-  <%- if !element.folded? -%>
-    <%= form_for(
-      [:admin, element],
-      :remote => true,
-      :html => {
-        :id => "element_#{element.id}_form"
-      }
-    ) do %>
+  <% if !element.folded? %>
+    <%= form_for [:admin, element], :remote => true, :html => {:id => "element_#{element.id}_form"} do |f| %>
       <div id="element_<%= element.id %>_errors" class="element_errors" style="display: none"></div>
       <div id="element_<%= element.id %>_content" class="element_content">
         <%= render_editor(element) %>
       </div>
-      <%- if element.has_validations? -%>
+      <% if element.has_validations? %>
       <p class="validation_notice">
         <span class="validation_indicator">*</span> <%= t('Mandatory') %>
       </p>
-      <%- end -%>
-      <%= render :partial => 'alchemy/admin/elements/element_foot', :locals => {:element => element} %>
+      <% end %>
+      <% if element.taggable? %>
+        <%= render 'alchemy/admin/partials/autocomplete_tag_list', :f => f, :object => element %>
+      <% end %>
+      <%= render :partial => 'alchemy/admin/elements/element_foot', :locals => {:element => element, :f => f} %>
     <% end %>
-  <%- end -%>
+  <% end %>
 </div>

data/app/views/alchemy/admin/elements/_element_foot.html.erb

@@ -27,7 +27,7 @@
     ) %>
   </span>
   <span class="element_public">
-    <%= check_box_tag "public", "1", element.public?, :id => "element_#{element.id}_public" -%>
+    <%= f.check_box :public, :id => "element_#{element.id}_public" -%>
     <%= label_tag "element_#{element.id}_public", t("visible") -%>
   </span>
   <button type="submit" class="button">

data/app/views/alchemy/admin/essence_files/edit.html.erb

@@ -1,5 +1,4 @@
-<%= form_for([:admin, @essence_file], :remote => true, :method => "put") do |f| %>
-  <%- if @content.essence_type == "Alchemy::EssenceFile" -%>
+<%= form_for([:admin, @essence_file], :remote => true) do |f| %>
   <table>
     <tr>
       <td class="label"><%= f.label "title" %></td>
@@ -7,85 +6,22 @@
     </tr>
     <tr>
       <td class="label"><%= f.label "css_class" %></td>
-      <td class="select"><%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]], :class => 'alchemy_selectbox' %></td>
-    </tr>
-    <tr>
-      <td colspan="2" class="submit">
-        <%= f.button t("save"), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
-  <%- elsif @content.essence_type == "Alchemy::EssenceFlash" -%>
-  <table>
-    <tr>
-      <td class="label"><%= f.label "width" %></td>
-      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "height" %></td>
-      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "player_version" %></td>
-      <td class="input"><%= f.text_field "player_version", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td colspan="2" class="submit">
-        <%= f.button t("save"), :class => 'button' %>
-      </td>
-    </tr>
-  </table>
-  <%- elsif @content.essence_type == "Alchemy::EssenceVideo" -%>
-  <table>
-    <tr>
-      <td class="label"><%= f.label "width" %></td>
-      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "height" %></td>
-      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "allow_fullscreen" %></td>
-      <td class="checkbox"><%= f.check_box "allow_fullscreen" %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "auto_play" %></td>
-      <td class="checkbox"><%= f.check_box "auto_play" %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "show_navigation" %></td>
-      <td class="check_box"><%= f.check_box "show_navigation" %></td>
-    </tr>
-    <tr>
-      <td colspan="2" class="submit">
-        <%= f.button t("save"), :class => 'button' %>
+      <td class="select">
+        <%= f.select(
+          "css_class", [
+            [t("Layout default"), ""],
+            [t("above"), "no_float"],
+            [t("left"), "left"],
+            [t("right"), "right"]
+          ],
+          :class => 'alchemy_selectbox'
+        ) %>
       </td>
     </tr>
-  </table>
-  <%- elsif @content.essence_type == "Alchemy::EssenceAudio" -%>
-  <table>
-    <tr>
-      <td class="label"><%= f.label "width" %></td>
-      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "height" %></td>
-      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "show_eq" %></td>
-      <td class="checkbox"><%= f.check_box "show_eq" %></td>
-    </tr>
-    <tr>
-      <td class="label"><%= f.label "show_navigation" %></td>
-      <td class="checkbox"><%= f.check_box "show_navigation" %></td>
-    </tr>
     <tr>
       <td colspan="2" class="submit">
         <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
   </table>
-  <%- end -%>
-<%- end -%>
+<% end %>

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -1,11 +1,11 @@
-<%- if @no_image_notice -%>
+<% if @no_image_notice %>
 <div class="with_padding">
   <div class="info">
     <%= render_icon('info') %>
     <%= @no_image_notice %>
   </div>
 </div>
-<%- else -%>
+<% else %>
 <div id="overlay_toolbar">
   <%= form_for(@essence_picture, :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options), :id => 'image_cropper_form', :remote => true) do |f| %>
     <%= f.hidden_field :crop_from %>
@@ -30,7 +30,12 @@
 
 <div id="jscropper">
   <%= image_tag(
-    alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname, :format => @options[:format], :sh => @essence_picture.picture.security_token),
+    alchemy.zoom_picture_path(
+      :id => @essence_picture.picture.id,
+      :name => @essence_picture.picture.urlname,
+      :format => @options[:format],
+      :sh => @essence_picture.picture.security_token
+    ),
     :id => 'imageToCrop',
     :onload => "Alchemy.ImageCropper.init(
       [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
@@ -41,4 +46,4 @@
     );"
   ) %>
 </div>
-<%- end -%>
+<% end %>

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -10,7 +10,7 @@
         alchemy.configure_admin_page_path(layoutpage),
         {
           :title => t('edit_page_properties'),
-          :size => '340x150'
+          :size => '410x150'
         },
         :class => '',
         :title => t('edit_page_properties')

data/app/views/alchemy/admin/layoutpages/index.html.erb

@@ -26,7 +26,7 @@
     :url => alchemy.new_admin_page_path(:parent_id => @layout_root.id, :layoutpage => true),
     :overlay_options => {
       :title => t('Add global page'),
-      :size => '405x150',
+      :size => '340x150',
       :overflow => true
     },
     :title => t('Add global page'),

data/app/views/alchemy/admin/pages/_external_link.html.erb

@@ -1,7 +1,12 @@
 <div id="overlay_tab_external_link">
-  <h2>
-    <%= t("enter_external_link") %>
-  </h2>
+  <h2><%= t("enter_external_link") %></h2>
+  <%= render_message do %>
+    <p><%= t(:external_link_notice_1) %></p>
+    <p><%= t(:external_link_notice_2) %></p>
+  <% end %>
+  <div id="errors" class="errors">
+    <ul></ul>
+  </div>
   <table class="window_form">
     <tr>
       <td class="label long">
@@ -28,7 +33,7 @@
     <tr>
       <td class="submit" colspan="2">
         <%= link_to(t(:apply), '#', {
-          :onclick => "Alchemy.LinkOverlay.createLink('external', jQuery('#external_url').val(), jQuery('#extern_link_title').val(), jQuery('#external_link_target').val()); Alchemy.LinkOverlay.close()",
+          :onclick => "Alchemy.LinkOverlay.createLink('external', jQuery('#external_url').val(), jQuery('#extern_link_title').val(), jQuery('#external_link_target').val());",
           :class => 'button'
         }) %>
       </td>