alchemy_cms 2.4.1 → 2.5.0.b2

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

@@ -11,6 +11,7 @@
     <span class="preview_text_element_name"><%= element.display_name %></span>
     <span class="preview_text_quote"><%= sanitize(element.preview_text) %></span>
   </span>
+  <%= render_hint_for(element) %>
   <span class="ajax_folder" <%= element.trashed? ? 'style="display: none"'.html_safe : '' %>>
     <%= image_tag(
       "alchemy/ajax_loader.gif",

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

@@ -0,0 +1,23 @@
+<%- label_title = t("Create #{resource_model_name}", :default => t('Create')) -%>
+
+<%- toolbar(
+  :buttons => [
+    {
+      :icon => 'create',
+      :label => label_title,
+      :url => new_resource_path,
+      :title => label_title,
+      :overlay_options => {
+        :title => label_title,
+        :size => "430x400"
+      },
+      :if_permitted_to => [:new, resource_permission_scope]
+    }
+  ],
+  :search => true,
+  :search_url => resources_path
+) -%>
+
+<div id="archive_all">
+  <%= render 'table' %>
+</div>

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

@@ -65,6 +65,10 @@
     <% end %>
   </div>
   <% end %>
+  <div class="button_with_label">
+    <%= select_tag('preview_size', preview_sizes_for_select, :class => 'alchemy_selectbox short') %>
+    <label><%= t :preview_size %></label>
+  </div>
 </div>
 <div id="toolbar_buttons_right">
   <div class="button_with_label" id="show_preview_window">
@@ -160,10 +164,14 @@
         }
       }
       jQuery('#cells').tabs().tabs('paging', { follow: true, followOnSelect: true } );
+
+      if (window.location.hash) {
+        $(window.location.hash).trigger('Alchemy.SelectElementEditor');
+      }
     });
   }
 
-  jQuery(document).ready(function($) {
+  jQuery(function($) {
     var texts = {
       title: '<%= t("Warning!") %>',
       message: '<%= t(:element_dirty_page_leave_warning) %>',
@@ -178,6 +186,24 @@
     Alchemy.PageLeaveObserver(texts);
     Alchemy.openElementsWindow();
     Alchemy.openPreviewWindow();
+
+    $('#preview_size').bind('open.selectBoxIt', function (e) {
+      $('#top_menu').css('z-index', 5000);
+    });
+
+    $('#preview_size').bind('blur.selectBoxIt', function (e) {
+      $('#top_menu').css('z-index', 5);
+    });
+
+    Alchemy.PreviewWindow.currentWidth = Alchemy.PreviewWindow.currentWindow.dialog('widget').width();
+
+    $('select#preview_size').on('change', function(e) {
+      var width = this.value;
+      if (this.value === 'auto') {
+        width = Alchemy.PreviewWindow.currentWidth;
+      }
+      Alchemy.PreviewWindow.currentWindow.dialog('widget').css('width', width);
+    });
   });
 
 </script>

data/app/views/alchemy/admin/pages/fold.js.erb

@@ -1,4 +1,5 @@
 (function($) {
   $('#page_<%= @page.id -%>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
   Alchemy.Tooltips();
+  Alchemy.overlayObserver('#page_<%= @page.id -%>');
 })(jQuery);

data/app/views/alchemy/admin/partials/_upload_form.html.erb

@@ -53,9 +53,11 @@
       file_upload_limit: <%= configuration(:uploader)['upload_limit'] || 50 -%>,
       locale: "<%= ::I18n.locale || 'en' %>",
       onQueueComplete: function() {
+        // While assigning picture in page edit mode
         <% if @while_assigning && model_name == 'picture' %>
         var url = '<%= alchemy.admin_pictures_path(:size => params[:size], :filter => :last_upload, :element_id => @element.id, :content_id => @content ? @content.id : nil, :options => @options).html_safe %>';
         $.get(url, null, null, 'script');
+        // While uploading picture in library
         <% elsif controller.class.name == 'Alchemy::Admin::PicturesController' %>
         var url = '<%= alchemy.admin_pictures_path(:size => params[:size], :filter => :last_upload).html_safe %>';
         Alchemy.pleaseWaitOverlay();

data/app/views/alchemy/admin/pictures/_picture.html.erb

@@ -2,7 +2,7 @@
   <span class="picture_tool select">
     <%= check_box_tag "picture_ids[]", picture.id %>
   </span>
-  <% permitted_to?(:destroy, :alchemy_admin_pictures) do %>
+  <% if permitted_to?(:destroy, :alchemy_admin_pictures) && picture.deletable? %>
   <span class="picture_tool delete">
     <%= link_to_confirmation_window(
       "",
@@ -43,6 +43,28 @@
     ) -%>
   </span>
   <% end %>
+  <% permitted_to?(:info, :alchemy_admin_pictures) do %>
+  <span class="picture_tool info">
+    <%= link_to_overlay_window(
+      "",
+      alchemy.info_admin_picture_path(
+        :id => picture,
+        :query => params[:query],
+        :page => params[:page],
+        :tagged_with => params[:tagged_with],
+        :size => params[:size],
+        :filter => params[:filter]
+      ),
+      {
+        :title => t('Picture infos'),
+        :size => "400x300"
+      },
+      {
+        :title => t('Show picture infos')
+      }
+    ) -%>
+  </span>
+  <% end %>
   <div class="image_spinner spinner">
     <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
   </div>
@@ -55,7 +77,7 @@
       :style => "display: none;"
     ),
     '#',
-    :onclick => "Alchemy.zoomImage('#{show_in_window_admin_picture_path(:id => picture.id, :sh => picture.security_token)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
+    :onclick => "Alchemy.zoomImage('#{show_in_window_admin_picture_path(:id => picture.id, :sh => picture.security_token)}', '#{picture.name}', #{picture.image_file_width || 320}, #{picture.image_file_height || 240})",
     :class => 'thumbnail_background',
     :id => 'show_in_window'
   ) %>

data/app/views/alchemy/admin/pictures/_tag_list.html.erb

@@ -1,12 +1,13 @@
+<% p = params.dup %>
 <h2><%= t("Filter by tag") %></h2>
 <ul>
   <% Alchemy::Picture.tag_counts.each do |t| %>
     <% picture_tags = pictures_filtered_by_tag?(t) ? picture_tag_filter(:remove => t) : picture_tag_filter(:add => t) %>
-    <%= content_tag 'li', :class => params[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
+    <%= content_tag 'li', :class => p[:tagged_with].try(:split, ',').try(:include?, t.name) ? 'active' : nil do %>
       <%= link_to(
         "#{t.name} (#{t.count})",
         url_for(
-          params.delete_if { |k, v| k == "page" }.merge(
+          p.delete_if { |k, v| k == "page" }.merge(
             :action => :index,
             :tagged_with => picture_tags
           )
@@ -17,10 +18,10 @@
     <% end %>
   <% end %>
 </ul>
-<% if params[:tagged_with].present? %>
+<% if p[:tagged_with].present? %>
   <%= link_to(
     render_icon('delete-small') + t('Remove tag filter'),
-    url_for(params.delete_if { |k, v| k == "tagged_with" }.merge(:action => :index)),
+    url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(:action => :index)),
     :remote => request.xhr?,
     :class => 'button small with_icon please_wait'
   ) %>

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

@@ -1,11 +1,3 @@
 (function($) {
-<%- if @while_assigning -%>
-  $('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) -%>');
-<%- else -%>
-  $('#picture_archive').html("<%= escape_javascript(render :partial => 'archive') %>");
-  Alchemy.pictureSelector();
-  Alchemy.overlayObserver('#picture_archive');
-  Alchemy.SelectBox('#filter_bar');
-<%- end -%>
   Alchemy.growl('<%= @message -%>');
-})(jQuery);
+})(jQuery);

data/app/views/alchemy/admin/pictures/info.html.erb

@@ -0,0 +1,42 @@
+<div class="with_padding">
+  <table>
+    <tr>
+      <td class="label"><%= Alchemy::Picture.human_attribute_name :name %></td>
+      <td class="value"><p><%= @picture.name %></p></td>
+    </tr>
+    <tr>
+      <td class="label"><%= Alchemy::Picture.human_attribute_name :image_file_name %></td>
+      <td class="value"><p><%= @picture.image_file_name %></p></td>
+    </tr>
+    <tr>
+      <td class="label"><%= Alchemy::Picture.human_attribute_name :image_file_dimensions %></td>
+      <td class="value"><p><%= @picture.image_file_dimensions %> px</p></td>
+    </tr>
+    <tr>
+      <td class="label"><%= Alchemy::Picture.human_attribute_name :image_file_size %></td>
+      <td class="value"><p><%= number_to_human_size @picture.image_file_size %></p></td>
+    </tr>
+  </table>
+</div>
+<div id="pictures_page_list">
+<% if @picture.deletable? %>
+  <h2><%= t :this_picture_is_not_used_on_any_page %></h2>
+<% else %>
+  <h2><%= t :this_picture_is_used_on_these_pages %>:</h2>
+  <ul class="list">
+  <% @picture.essence_pictures.group_by(&:page).each do |page, essence_pictures| %>
+    <li>
+      <h3><%= link_to page.name, edit_admin_page_path(page) %></h3>
+      <ul>
+        <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
+        <li class="<%= cycle('even', 'odd') %>">
+          <%= link_to element.display_name_with_preview_text, edit_admin_page_path(page, :anchor => "element_#{element.id}") %> in
+          <%= essence_pictures.collect { |e| e.content.name_for_label }.to_sentence %>
+        </li>
+        <% end %>
+      </ul>
+    </li>
+  <% end %>
+  </ul>
+<% end %>
+</div>

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

@@ -1,5 +1,4 @@
 <%= form_for resource_instance_variable, :url => resource_path(resource_instance_variable), :remote => true do |f| %>
-  <% if resource_instance_variable.errors.any? %>
   <div id="errors">
     <ul>
     <% resource_instance_variable.errors.full_messages.each do |error| %>
@@ -7,7 +6,6 @@
     <% end %>
     </ul>
   </div>
-  <% end %>
   <table>
     <%- resource_handler.attributes.each do |attribute| -%>
     <tr>

data/app/views/alchemy/admin/resources/_resource.html.erb

@@ -30,7 +30,8 @@
       '',
       edit_resource_path(resource),
       {
-        :title => t("Edit")
+        :title => t("Edit"),
+        :size => resource_window_size
       },
       {
         :class => "icon edit",

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

@@ -8,7 +8,8 @@
       :url => new_resource_path,
       :title => label_title,
       :overlay_options => {
-        :title => label_title
+        :title => label_title,
+        :size => resource_window_size
       },
       :if_permitted_to => [:new, resource_permission_scope]
     }

data/app/views/alchemy/elements/show.html.erb

@@ -1,6 +1 @@
-<%= render(
-  :partial => "alchemy/elements/#{@element.name}_view.html.erb",
-  :locals => {
-    :element => @element
-  }
-) -%>
+<%= render @element, :element => @element %>

data/app/views/alchemy/elements/show.js.erb

@@ -1,11 +1,5 @@
 (function($) {
-  
-  $('#<%= @container_id -%>').html('<%= escape_javascript(render(
-    :partial => "alchemy/elements/<%= @element.name -%>_view.html.erb",
-    :locals => {
-      :element => @element,
-      :options => @options
-    }
-  )) -%>');
-  
-})(jQuery);
+  $('#<%= @container_id -%>').html('<%= escape_javascript(
+    render @element, :element => @element, :options => @options
+  ) -%>');
+})(jQuery);

data/app/views/alchemy/essences/_essence_link_view.html.erb

@@ -1,2 +1,3 @@
 <%- options[:text] ||= content.ingredient %>
+<%- html_options = { target: content.essence.link_target == "blank" ? "_blank" : nil }.merge(html_options) %>
 <%= link_to options[:text], content.ingredient, html_options %>

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

@@ -1,8 +1,11 @@
-<%= form_tag(show_alchemy_page_path(@search_result_page), :method => :get, :class => 'fulltext_search') do %>
-  <% if options[:html5] %>
-    <%= search_field_tag(:query, params[:query], :placeholder => t('search query')) %>
-  <% else %>
-    <%= text_field_tag(:query, params[:query]) %>
+<% search_result_page ||= find_search_result_page %>
+<% if search_result_page %>
+  <%= form_tag show_alchemy_page_path(search_result_page), :method => :get, :id => options[:id], :class => options[:class] do %>
+    <% if options[:html5] %>
+      <%= search_field_tag(:query, params[:query], :placeholder => t('search query')) %>
+    <% else %>
+      <%= text_field_tag(:query, params[:query]) %>
+    <% end %>
+    <%= submit_tag(t("search"), :name => nil) %>
   <% end %>
-  <%= submit_tag(t("search"), :name => nil) %>
 <% end %>

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

@@ -4,6 +4,6 @@
     <%= link_to page.name, show_alchemy_page_path(page) %>
   </h3>
   <%- result.each do |highlight| -%>
-    <p><%= sanitize highlight %></p>
+    <p><%= sanitize highlight.force_encoding('UTF-8') %></p>
   <%- end -%>
 </li>

data/bin/alchemy

@@ -13,147 +13,40 @@ begin
 end
 
 class AlchemyInstaller < Thor
-
   include Thor::Actions
 
   map "-v" => :version
   map "--version" => :version
-
   desc "version", "Prints current Alchemy CMS version", :hide => true
   def version
     puts Alchemy::VERSION
   end
 
   desc "new PROJECT", "Creates a new Alchemy CMS project."
-  method_option :scm, :type => :string, :aliases => "-s", :desc => "Type of scm (git or svn) to use for this project. Leave blank for none."
   method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
   def new(project)
-    results = []
     @application = project.downcase.strip.gsub(/ /, '_')
-    say "Install Alchemy CMS into ./#{@application}", :yellow
-    say "Generating new Rails App...", :yellow
-
-    if system("rails new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
-
+    if system("rails new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
       create_database_yml if options[:database] == 'mysql'
-
-      system "rake alchemy:mount"
-
-      with_standard_set = yes?("\nDo you want to copy the files of Alchemy´s Standardset into your App? (y/N)")
-
-      if with_standard_set
-        sentinel = /::Application\.configure do\s*$/
-        inject_into_file "#{@application}/config/environments/production.rb", "\n  config.assets.precompile += %w( alchemy/standard_set.css )\n", { :after => sentinel, :verbose => true }
-      end
-
-      results << system("cd ./#{@application} && rake db:create alchemy:install:migrations db:migrate alchemy:db:seed")
-      results << system("cd ./#{@application} && rails g alchemy:scaffold#{' --with-standard-set' if with_standard_set}")
-
-      %x[
-        cd ./#{@application}
-        rm ./public/index.html
-        rm ./app/assets/images/rails.png
-      ]
-
-      if !options[:scm].nil? && !options[:scm].empty?
-
-        clean_mountpoint = mountpoint.gsub('/', '')
-
-        %x[
-          cd ./#{@application}
-          rm -rf ./tmp/*
-          rm -rf ./log/*
-          mkdir -p ./index
-          mkdir -p ./uploads
-        ]
-
-        if yes?("\nDo you want to generate a deploy script for Capistrano? (y/N)")
-          system "cd #{@application} && rails g alchemy:deploy_script --scm=#{options[:scm]} --db=#{options[:database]}"
-          say "\nCapifying...", :yellow
-          system "cd #{@application} && capify ."
-        end
-
-        case options[:scm]
-          when 'svn'
-            server = ask("\nURL of your svn server:")
-            repository = ask("\nName of the repository (#{@application}):")
-            repository = @application if repository.empty?
-
-            say "\nImporting #{@application} into #{server}/#{repository} ...", :yellow
-            output = %x[svn import ./#{@application} #{server}/#{repository} -m 'initial import by Alchemy installer']; imported = $?.success?
-
-            if imported
-
-              say "Removing and checking out again...", :yellow
-              %x[
-                rm -rf ./#{@application}
-                svn co #{server}/#{repository} #{@application}
-              ]
-
-              say "Committing ignores...", :yellow
-              %x[
-                cd ./#{@application}
-                svn propset svn:ignore '*' tmp/ log/ index/ uploads/
-                svn propset svn:ignore '#{clean_mountpoint.empty? ? 'pictures' : clean_mountpoint}' ./public
-                svn propset svn:ignore 'assets' ./public
-                svn propset svn:ignore 'database.yml' ./config
-                svn commit -m 'set ignores'
-              ]
-
-            else
-              say "Error while importing!", :red
-            end
-
-          when 'git'
-            gitignore = <<-GIT
+      system("cd ./#{@application} && rake alchemy:install")
+      gitignore = <<-GIT
 log/*
 tmp/*
 .DS_Store
 upload/*
 index/*
-public/#{clean_mountpoint.empty? ? 'pictures' : clean_mountpoint}
-public/assets
 config/database.yml
 GIT
-
-            %x[
-              cd #{@application}
-              echo "#{gitignore}" > .gitignore
-              touch ./index/.gitkeep
-              touch ./uploads/.gitkeep
-              git init .
-              git add .
-              git commit -am 'inital commit'
-            ]
-        end
-
-      end
-
-      readme = <<-EOF
-
-Successfully installed Alchemy CMS into ./#{@application}
-
-Next steps:
-
-1. Go into your projects folder:
-
- cd ./#{@application}
-
-2. Start your local Rails server:
-
- rails server
-
-3. Open a browser and enter the following URL:
-
- http://localhost:3000
-
-4. Follow the instructions to complete the installation!
-
-Thank you for using Alchemy CMS!
-http://alchemy-cms.com
-
-EOF
-      say readme, :green if results.detect { |r| r == false }.nil?
+      %x[
+        cd ./#{@application}
+        rm ./public/index.html
+        rm ./app/assets/images/rails.png
+        mkdir -p ./index
+        mkdir -p ./uploads
+        touch ./index/.gitkeep
+        touch ./uploads/.gitkeep
+        echo "#{gitignore}" > .gitignore
+      ]
     else
       say "\nError while installation!\n", :red
     end