alchemy_cms 3.4.2 → 3.5.0.rc1

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -46,27 +46,47 @@ module Alchemy
     protected
 
     def page_hash(page, has_children, level, folded)
-      {
+      p_hash = {
         id: page.id,
         name: page.name,
-        permissions: page_permissions(page, opts[:ability]),
         public: page.public?,
         visible: page.visible?,
         restricted: page.restricted?,
-        status_titles: page_status_titles(page),
         page_layout: page.page_layout,
         slug: page.slug,
         redirects_to_external: page.redirects_to_external?,
-        locked: page.locked?,
-        definition_missing: page.definition.blank?,
         urlname: page.urlname,
-        external_urlname: page.external_urlname,
+        external_urlname: page.redirects_to_external? ? page.external_urlname : nil,
         level: level,
         root: level == 1,
-        folded: folded,
         root_or_leaf: level == 1 || !has_children,
         children: []
       }
+
+      if opts[:elements]
+        p_hash.update(elements: ActiveModel::ArraySerializer.new(page_elements(page)))
+      end
+
+      if opts[:ability].can?(:index, :alchemy_admin_pages)
+        p_hash.merge({
+          definition_missing: page.definition.blank?,
+          folded: folded,
+          locked: page.locked?,
+          locked_notice: page.locked? ? Alchemy.t('This page is locked', name: page.locker_name) : nil,
+          permissions: page_permissions(page, opts[:ability]),
+          status_titles: page_status_titles(page)
+        })
+      else
+        p_hash
+      end
+    end
+
+    def page_elements(page)
+      if opts[:elements] == 'true'
+        page.elements
+      else
+        page.elements.named(opts[:elements].split(',') || [])
+      end
     end
 
     def page_permissions(page, ability)
@@ -75,7 +95,8 @@ module Alchemy
         configure: ability.can?(:configure, page),
         copy: ability.can?(:copy, page),
         destroy: ability.can?(:destroy, page),
-        create: ability.can?(:create, Alchemy::Page)
+        create: ability.can?(:create, Alchemy::Page),
+        edit_content: ability.can?(:edit_content, page)
       }
     end
 

data/app/views/alchemy/_edit_mode.html.erb

@@ -0,0 +1,2 @@
+<%= render 'alchemy/menubar' %>
+<%= render "alchemy/preview_mode_code" %>

data/app/views/alchemy/_menubar.html.erb

@@ -1,4 +1,4 @@
-<% if !@preview_mode && can?(:edit_content, @page) %>
+<% if !@preview_mode && @page && can?(:edit_content, @page) %>
   <div id="alchemy_menubar" style="display: none">
     <ul>
       <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>

data/app/views/alchemy/_preview_mode_code.html.erb

@@ -0,0 +1,6 @@
+<% if @preview_mode %>
+  <script type="text/javascript">
+    Alchemy = { locale: "<%= session[:alchemy_locale] %>" };
+  </script>
+  <%= javascript_include_tag("alchemy/preview") %>
+<% end %>

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

@@ -1,7 +1,7 @@
 <div id="overlay_toolbar">
   <% if can? :create, Alchemy::Attachment %>
     <%= render 'alchemy/admin/uploader/button',
-      model_class: Alchemy::Attachment,
+      object: Alchemy::Attachment.new,
       dropzone: '#assign_file_list',
       file_attribute: 'file',
       in_dialog: true,

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

@@ -3,16 +3,16 @@
     <%= render_icon attachment.icon_css_class %>
   </td>
   <td class="name">
-  <% if can?(:show, attachment) && %w(audio image video flash pdf text).include?(attachment.icon_css_class) %>
+  <% if can?(:show, attachment) %>
     <%= link_to_dialog(
       attachment.name,
       alchemy.admin_attachment_path(attachment),
       {
         title: attachment.name,
-        size: "fullscreen"
+        size: attachment_preview_size(attachment)
       },
       {
-        title: Alchemy.t('View File')
+        title: Alchemy.t('Attachment Preview')
       }
     ) %>
   <% else %>
@@ -24,14 +24,34 @@
   <td class="file_size"><%= number_to_human_size(attachment.file_size) %></td>
   <td class="date"><%= l(attachment.created_at, format: :default) %></td>
   <td class="tools long">
+  <% if can?(:show, attachment) %>
+    <%= link_to_dialog(
+      render_icon(:info),
+      alchemy.admin_attachment_path(attachment),
+      {
+        title: attachment.name,
+        size: attachment_preview_size(attachment)
+      },
+      {
+        title: Alchemy.t('Attachment Preview')
+      }
+    ) %>
+  <% end %>
   <% if can?(:download, attachment) %>
     <%= link_to(
       "",
       alchemy.download_admin_attachment_path(attachment),
       title: Alchemy.t("download_file", filename: attachment.file_name),
-      class: "icon file_download"
+      class: "icon file_download",
+      target: "_blank"
     ) %>
   <% end %>
+  <% if can?(:edit, attachment) %>
+    <%= render 'alchemy/admin/attachments/replace_button',
+      redirect_url: alchemy.admin_attachments_path,
+      object: attachment,
+      file_attribute: 'file' %>
+  <% end %>
   <% if can?(:destroy, attachment) %>
     <%= link_to_confirm_dialog(
       "",
@@ -53,7 +73,7 @@
       alchemy.edit_admin_attachment_path(attachment, q: params[:q], page: params[:page]),
       {
         title: Alchemy.t(:rename_file),
-        size: '380x250'
+        size: '500x250'
       },
       class: 'icon file_edit',
       title: Alchemy.t(:rename_file)

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

@@ -0,0 +1,26 @@
+<%= form_for [:admin, object], html: {multipart: true, class: 'upload-button'} do |f| %>
+  <%= f.file_field file_attribute,
+    class: 'fileupload--field',
+    name: "#{f.object_name}[#{file_attribute}]",
+    id: "replace_#{dom_id(object)}" %>
+  <%= label_tag "replace_#{dom_id(object)}", title: Alchemy.t(:replace_file) do %>
+    <%= render_icon :file_change %>
+  <% end %>
+<% end %>
+
+<% file_types = local_assigns[:file_types].presence ||
+  configuration(:uploader)['allowed_filetypes'][object.class.model_name.collection] || ['*'] %>
+
+<script type='text/javascript'>
+  $(function() {
+    var options = {
+      selector: '#replace_<%= dom_id(object) %>',
+      file_types: '<%= file_types.join("|") %>',
+      complete: function() {
+        Alchemy.pleaseWaitOverlay();
+        window.location.href = '<%= redirect_url.html_safe %>';
+      }
+    };
+    Alchemy.Uploader(options);
+  });
+</script>

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

@@ -3,7 +3,7 @@
     <% if can? :create, Alchemy::Attachment %>
       <%= render 'alchemy/admin/uploader/button',
         redirect_url: alchemy.admin_attachments_path,
-        model_class: Alchemy::Attachment,
+        object: Alchemy::Attachment.new,
         file_attribute: 'file' %>
     <% end %>
   </div>

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

@@ -1,3 +1,55 @@
+<div class="resource_info">
+  <div class="value">
+    <label>
+      <%= render_icon @attachment.icon_css_class %>
+    </label>
+    <p><%= @attachment.file_name %></p>
+  </div>
+  <div class="value with-icon">
+    <label><%= Alchemy::Attachment.human_attribute_name(:url) %></label>
+    <p><%= alchemy.show_attachment_url(@attachment) %></p>
+    <a data-clipboard-text="<%= alchemy.show_attachment_url(@attachment) %>" class="icon_button--right">
+      <%= render_icon('clipboard full') %>
+    </a>
+  </div>
+  <div class="value with-icon">
+    <label><%= Alchemy::Attachment.human_attribute_name(:download_url) %></label>
+    <p><%= alchemy.download_attachment_url(@attachment) %></p>
+    <a data-clipboard-text="<%= alchemy.download_attachment_url(@attachment) %>" class="icon_button--right">
+      <%= render_icon('clipboard full') %>
+    </a>
+  </div>
+</div>
+
+<% case @attachment.icon_css_class %>
+<% when "image" %>
+<div class="attachment_preview_container image-preview">
+  <%= image_tag(alchemy.show_attachment_path(@attachment), class: "full_width") %>
+</div>
+<% when "audio" %>
+<div class="attachment_preview_container player-preview">
+  <%= audio_tag(alchemy.show_attachment_path(@attachment), preload: "none", controls: true, class: "full_width") %>
+</div>
+<% when "video" %>
+<div class="attachment_preview_container player-preview">
+  <%= video_tag(alchemy.show_attachment_path(@attachment), preload: "metadata", controls: true, class: "full_width") %>
+</div>
+<% when "archive", "file" %>
+<% else %>
 <iframe src="<%= alchemy.show_attachment_path(@attachment) %>" frameborder=0 class="full-iframe">
   Your browser does not support frames.
 </iframe>
+<% end %>
+
+<script type="text/javascript">
+  $(function() {
+    var clipboard = new Clipboard('.icon_button--right');
+    clipboard.on('success', function(e) {
+      Alchemy.growl('<%= Alchemy.t("Copied to clipboard") %>');
+      e.clearSelection();
+    });
+    Alchemy.currentDialog().dialog.on('DialogClose.Alchemy', function() {
+      clipboard.destroy();
+    });
+  });
+</script>

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

@@ -1,10 +1,13 @@
-<div class="element-header">
+<div class="element-header<%= ' has-hint' if element.has_hint? %>">
   <span class="element-handle">
     <%= render_icon(:element) %>
     <% if element.definition.blank? %>
-    <span class="warning icon" title="<%= Alchemy.t(:element_definition_missing) %>"></span>
+      <%= hint_with_tooltip(
+        Alchemy.t(:element_definition_missing),
+        class: 'warning icon'
+      ) %>
     <% else %>
-    <%= render_icon("element_#{element.public? ? 'public' : 'draft'}") %>
+      <%= render_icon("element_#{element.public? ? 'public' : 'draft'}") %>
     <% end %>
   </span>
   <span class="element-title">

data/app/views/alchemy/admin/elements/create.js.erb

@@ -46,6 +46,4 @@
 <%- if @clipboard.blank? -%>
   $('#clipboard_button .icon.clipboard').removeClass('full');
 <%- end -%>
-
-  <%= update_essence_select_elements(@page, @element) -%>
 })();

data/app/views/alchemy/admin/elements/trash.js.erb

@@ -8,5 +8,4 @@ $('#element_<%= @element.id %>').hide(200, function() {
   <% @element.richtext_contents_ids.each do |id| %>
   tinymce.get('tinymce_<%= id %>').remove();
   <% end %>
-  <%= update_essence_select_elements(@page, @element) -%>
 });

data/app/views/alchemy/admin/elements/update.js.erb

@@ -11,7 +11,6 @@
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.selectElementInPreview(<%= @element.id %>);
   });
-  <%= update_essence_select_elements(@page, @element) -%>
 
 <%- else -%>
 
@@ -22,5 +21,4 @@
   Alchemy.Buttons.enable($el);
 
 <%- end -%>
-
 })();

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

@@ -8,10 +8,7 @@
     <%= simple_format Alchemy.t(:explain_cropping) %>
   <% end %>
   <div class="thumbnail_background">
-    <%= image_tag(
-      show_alchemy_picture_path(@picture, size: '800x600', format: 'png'),
-      id: 'imageToCrop'
-    ) %>
+    <%= image_tag @picture.url(size: '800x600', flatten: true), id: 'imageToCrop' %>
   </div>
   <%= form_for(
     @essence_picture,

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

@@ -6,7 +6,7 @@
   <%= f.input :alt_tag %>
   <%- if @options[:sizes].present? -%>
     <%= f.input :render_size,
-      collection: [[Alchemy.t('Layout default'), @options[:image_size]]] + @options[:sizes].to_a,
+      collection: [[Alchemy.t('Layout default'), @options[:size]]] + @options[:sizes].to_a,
       include_blank: false,
       input_html: {class: 'alchemy_selectbox'} %>
   <%- end -%>

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

@@ -14,6 +14,7 @@
       },
       if_permitted_to: [:create, Alchemy::Language] %>
   </div>
+  <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all" class="resources-table-wrapper">

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

@@ -2,26 +2,27 @@
   <div class="sitemap_page<%= layoutpage.locked? ? ' locked' : '' %>">
     <div class="sitemap_left_images">
     <% if layoutpage.definition.blank? %>
-      <span class="inline warning icon" title="<%= Alchemy.t(:page_definition_missing) %>"></span>
+      <%= page_layout_missing_warning %>
     <% else %>
       <%= render_icon(:page) %>
     <% end %>
     </div>
     <div class="sitemap_right_tools">
-      <%- if can?(:configure, layoutpage) -%>
-      <%= link_to_dialog(
-        render_icon('configure_page'),
-        alchemy.edit_admin_layoutpage_path(layoutpage),
-        {
-          title: Alchemy.t(:edit_page_properties),
-          size: '410x170'
-        },
-        class: 'sitemap_tool',
-        title: Alchemy.t(:edit_page_properties)
-      ) -%>
-      <%- end -%>
-      <span class="sitemap_sitetools">
-      <%- if can?(:copy, layoutpage) -%>
+    <%- if can?(:configure, layoutpage) -%>
+      <div class="button_with_label sitemap_tool">
+        <%= link_to_dialog(
+          render_icon('configure_page'),
+          alchemy.edit_admin_layoutpage_path(layoutpage),
+          {
+            title: Alchemy.t(:edit_page_properties),
+            size: '410x170'
+          }
+        ) -%>
+        <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
+      </div>
+    <%- end -%>
+    <%- if can?(:copy, layoutpage) -%>
+      <div class="button_with_label sitemap_tool">
         <%= link_to(
           render_icon("copy_page"),
           alchemy.insert_admin_clipboard_path(
@@ -29,12 +30,13 @@
             remarkable_id: layoutpage.id
           ),
           remote: true,
-          method: 'post',
-          class: "sitemap_tool",
-          title: Alchemy.t(:copy_page)
+          method: 'post'
         ) %>
-      <%- end -%>
-      <%- if can?(:destroy, layoutpage) -%>
+        <label class="center"><%= Alchemy.t(:copy_page) %></label>
+      </div>
+    <%- end -%>
+    <%- if can?(:destroy, layoutpage) -%>
+      <div class="button_with_label sitemap_tool">
         <%= link_to_confirm_dialog(
           render_icon('delete_page'),
           Alchemy.t(:confirm_to_delete_page),
@@ -42,14 +44,11 @@
             controller: 'pages',
             action: 'destroy',
             id: layoutpage.id
-          ),
-          {
-            class: "sitemap_tool",
-            title: Alchemy.t(:delete_page)
-          }
+          )
         ) -%>
-      <%- end -%>
-      </span>
+        <label class="left"><%= Alchemy.t(:delete_page) %></label>
+      </div>
+    <%- end -%>
     </div>
     <div class="sitemap_sitename">
       <%= link_to(

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

@@ -1,7 +1,7 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
   <%= f.input :page_layout,
     collection: @page_layouts,
-    label: @page.definition.blank? ? (%(<span class="inline warning icon" title="#{ Alchemy.t(:page_definition_missing) }"></span>&nbsp;) + Alchemy.t(:page_type)).html_safe : Alchemy.t(:page_type),
+    label: page_layout_label(@page),
     include_blank: false,
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name, autofocus: true %>

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

@@ -4,74 +4,47 @@
     label: page_layout_label(@page),
     include_blank: false,
     input_html: {class: 'alchemy_selectbox'} %>
+
   <div class="input check_boxes">
     <label class="control-label"><%= Alchemy.t(:page_status) %></label>
     <div class="control_group">
-      <label class="checkbox">
-        <%= check_box_tag :page_public, nil, @page.public?, name: nil,
-          data: {date_format: I18n.t(:datetimepicker, scope: 'time.formats')} %>
-        <%= f.object.class.human_attribute_name :public %>
-      </label>
-      <%= content_tag :div, class: [
-        @page.public_on.present? || @page.public_until.present? ? nil : 'hidden',
-        'page-publication-date-fields',
-        'input-row'
-      ] do %>
-        <div class="input-column">
-          <label><%= Alchemy.t(:from) %></label>
-          <%= alchemy_datepicker @page, :public_on, type: :datetime %>
-        </div>
-        <div class="input-column">
-          <label><%= Alchemy.t(:until) %></label>
-          <%= alchemy_datepicker @page, :public_until, type: :datetime %>
-        </div>
+      <%= render 'alchemy/admin/pages/publication_fields' %>
+      <%= page_status_checkbox(@page, :visible) %>
+      <%= page_status_checkbox(@page, :restricted) %>
+      <% if configuration(:sitemap)['show_flag'] %>
+        <%= page_status_checkbox(@page, :sitemap) %>
       <% end %>
-      <label class="checkbox">
-        <%= f.check_box :visible %>
-        <%= f.object.class.human_attribute_name :visible %>
-      </label>
-      <label class="checkbox">
-        <%= f.check_box :restricted %>
-        <%= f.object.class.human_attribute_name :restricted %>
-      </label>
-    <% if configuration(:sitemap)['show_flag'] %>
-      <label class="checkbox">
-        <%= f.check_box :sitemap %>
-        <%= f.object.class.human_attribute_name :sitemap %>
-      </label>
-    <% end %>
     </div>
   </div>
+
   <h2><%= Alchemy.t(:names) %></h2>
   <%= f.input :name, autofocus: true %>
   <%= f.input :urlname, as: 'string', input_html: {value: @page.slug} %>
   <%= f.input :title,
     input_html: {'data-alchemy-char-counter' => 60} %>
+
   <h2><%= Alchemy.t(:meta_data) %></h2>
   <div class="input check_boxes">
     <label class="control-label"><%= Alchemy.t(:search_engines) %></label>
     <div class="control_group">
-      <label class="checkbox">
-        <%= f.check_box :robot_index %>
-        <%= f.object.class.human_attribute_name :robot_index %>
-      </label>
-      <label class="checkbox">
-        <%= f.check_box :robot_follow %>
-        <%= f.object.class.human_attribute_name :robot_follow %>
-      </label>
+      <%= page_status_checkbox(@page, :robot_index) %>
+      <%= page_status_checkbox(@page, :robot_follow) %>
     </div>
   </div>
+
   <%= f.input :meta_description,
     as: 'text',
     input_html: {'data-alchemy-char-counter' => 160} %>
   <%= f.input :meta_keywords,
     as: 'text',
     hint: Alchemy.t('pages.update.comma_seperated') %>
+
   <% if @page.taggable? %>
     <div class="input string">
       <%= f.label :tag_list %>
       <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
     </div>
   <% end %>
+
   <%= f.submit Alchemy.t(:save) %>
 <% end %>