alchemy_cms 2.1.beta1 → 2.1.beta5

data/app/views/{admin → alchemy/admin}/attachments/new.html.erb

@@ -1,11 +1,11 @@
 <%= form_for([:admin, @attachment], :html => {:multipart => true}) do |f| %>
 	<%= render(
-		:partial => "admin/partials/upload_form",
+		:partial => "alchemy/admin/partials/upload_form",
 		:locals => {
 			:file_types => configuration(:uploader)[:allowed_filetypes][:attachments],
-			:file_types_description => _('documents'),
+			:file_types_description => t('documents'),
 			:model_name => 'attachment',
-			:item_type => _('files')
+			:item_type => t('files')
 		}
 	) %>
 <% end %>

data/app/views/{admin → alchemy/admin}/clipboard/clear.js.erb

@@ -1,6 +1,6 @@
 (function($) {
   
-  $("#clipboard_items").replaceWith("<p><%= _('No items in your clipboard') -%></p>");
+  $("#clipboard_items").replaceWith("<p><%= t('No items in your clipboard') -%></p>");
   $('#clipboard_button .icon.clipboard').removeClass('full');
   
 })(jQuery);

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

@@ -0,0 +1,19 @@
+<div class="with_padding">
+	<%- if @clipboard_items.blank? -%>
+	<p><%= t('No items in your clipboard') %></p>
+	<%- else -%>
+	<div id="clipboard_items">
+		<ul>
+			<%- @clipboard_items.each do |item| -%>
+			<li id="clipboard_item_<%= item.id %>">
+				<%= item.class.to_s == 'Element' ? item.display_name_with_preview_text(60) : item.name %>
+				<span class="float_right"><%= link_to(render_icon('delete-small'), alchemy.remove_admin_clipboard_path(:remarkable_type => item.class.name.demodulize.underscore, :remarkable_id => item.id), :remote => true, :method => :delete, :title => t('Remove item from clipboard')) %></span>
+			</li>
+			<%- end -%>
+		</ul>
+		<p>
+			<%= link_to_confirmation_window(t('clear clipboard'), t('Do you really want to clear the clipboard?'), alchemy.clear_admin_clipboard_path, :class => 'button') %>
+		</p>
+	</div>
+	<%- end -%>
+</div>

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -0,0 +1,14 @@
+(function($) {
+  
+<%- if params[:remove] -%>
+  $("#<%= @item.class.to_s.downcase -%>_<%= @item.id -%>").remove();
+  <%- if @item.class.to_s == 'Element' -%>
+  $('#element_area').sortable('refresh');
+  <%- end -%>
+  Alchemy.growl('<%= t("item moved to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
+<%- else -%>
+  Alchemy.growl('<%= t("item copied to clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>')
+<%- end -%>
+  $('#clipboard_button .icon.clipboard').addClass('full');
+  
+})(jQuery);

data/app/views/alchemy/admin/clipboard/remove.js.erb

@@ -0,0 +1,10 @@
+(function($) {
+  
+  $("#clipboard_item_<%= @item.id -%>").remove();
+  Alchemy.growl('<%= t("item removed from clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
+<%- if @clipboard.blank? -%>
+  $('#clipboard_button .icon.clipboard').removeClass('full');
+  $("#clipboard_items").replaceWith("<p><%= t('No items in your clipboard') -%></p>");
+<%- end -%>
+  
+})(jQuery);

data/app/views/{admin → alchemy/admin}/contents/_missing.html.erb

@@ -1,11 +1,11 @@
 <div class="content_editor missing" id="element_<%= element.id %>_content_missing">
-  <label><%= I18n.t("content_names.#{element.name}.#{name}", :default => ["content_names.#{name}".to_sym, name.capitalize]) %></label>
+  <label><%= Alchemy::I18n.t("content_names.#{element.name}.#{name}", :default => ["content_names.#{name}".to_sym, name.capitalize]) %></label>
   <p>
     <%= render_icon('warning') %>
-    <%= _('content_not_found') %>
+    <%= t('content_not_found') %>
     <%= link_to(
-      _('create'),
-      admin_contents_path(
+      t('create'),
+      alchemy.admin_contents_path(
         :content => {
           :element_id => element.id,
           :name => name

data/app/views/{admin → alchemy/admin}/contents/create.js.erb

@@ -1,10 +1,10 @@
 (function($) {
 
-<%- if @content.essence_type == "EssencePicture" -%>
+<%- if @content.essence_type == "Alchemy::EssencePicture" -%>
 
   $('#add_content_<%= @element.id -%>').before('<%= escape_javascript(
     render(
-      :partial => "essences/essence_picture_editor",
+      :partial => "alchemy/essences/essence_picture_editor",
       :locals => {
         :content => @content,
         :options => @options
@@ -24,7 +24,7 @@
   Alchemy.reloadPreview();
   Alchemy.closeCurrentWindow();
   
-<%- elsif @content.essence_type ==  "EssenceText" -%>
+<%- elsif @content.essence_type ==  "Alchemy::EssenceText" -%>
 
   <%- locals = {
     :content => @content,
@@ -35,7 +35,7 @@
 
   $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
     render(
-      :partial => "essences/essence_text_editor",
+      :partial => "alchemy/essences/essence_text_editor",
       :locals => locals
     )
   ) -%>');
@@ -44,7 +44,7 @@
 
   $("#add_content_for_element_<%= @element.id -%>").before('<%= escape_javascript(
     render(
-      :partial => "essences/essence_text_editor",
+      :partial => "alchemy/essences/essence_text_editor",
       :locals => locals
     )
   ) -%>');
@@ -53,7 +53,7 @@
 
   <%- end -%>
 
-<%- elsif @content.essence_type ==  "EssenceRichtext" -%>
+<%- elsif @content.essence_type ==  "Alchemy::EssenceRichtext" -%>
 
   <%- locals = {
     :content => @content,
@@ -64,7 +64,7 @@
 
   $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
     render(
-      :partial => "essences/essence_richtext_editor",
+      :partial => "alchemy/essences/essence_richtext_editor",
       :locals => locals
     )
   ) -%>');
@@ -73,7 +73,7 @@
 
   $("#add_content_for_element_<%= @element.id -%>").before('<%= escape_javascript(
     render(
-      :partial => "essences/essence_richtext_editor",
+      :partial => "alchemy/essences/essence_richtext_editor",
       :locals => locals
     )
   ) -%>');
@@ -87,7 +87,7 @@
 
   $('#add_content_for_element_<%= @element.id -%>').before('<%= escape_javascript(
     render(
-      :partial => "essences/#{@content.essence_type.underscore}_editor",
+      :partial => "alchemy/essences/#{@content.essence_type.underscore}_editor",
       :locals => {
         :content => @content,
         :options => (@options.nil? ? {} : @options)
@@ -97,6 +97,6 @@
 
 <%- end -%>
 
-  Alchemy.growl('<%= _("Successfully added %{content}") % {:content => @content.name} -%>');
+  Alchemy.growl('<%= t("Successfully added content", :content => @content.name) -%>');
 
 })(jQuery);

data/app/views/{admin → alchemy/admin}/contents/new.html.erb

@@ -8,7 +8,7 @@
 				<%= hidden_field_tag('options', @options) %>
 			</td>
 			<td>
-				&nbsp;<%= f.button _('save'), :class => 'button' %>
+				&nbsp;<%= f.button t('save'), :class => 'button' %>
 			</td>
 		</tr>
 	</table>

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

@@ -0,0 +1,96 @@
+<div id="dashboard">
+	<h1><%= t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %></h1>
+	<h2><%= t('You were last time online at %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></h2>
+	
+	<div class="widget">
+		<h2><%= t('Your last updated pages') %>:</h2>
+		<%- if @last_edited_pages.blank? -%>
+		<p><%= t('no pages') %></p>
+		<%- else -%>
+		<ul>
+			<%- @last_edited_pages.each do |page| -%>
+			<li class="<%= cycle('even', 'odd', :name => 'edited_pages') %>"><%= link_to_if((page.locked_by.blank? || page.locked_by == current_user.id), page.name, edit_admin_page_path(page)) %> <small>(<%= l(page.updated_at) %>)</small></li>
+			<%- end -%>
+		</ul>
+		<%- end -%>
+	</div>
+	<%- reset_cycle('edited_pages') -%>
+	<div class="widget">
+		<h2><%= t('Currently locked pages') %>:</h2>
+		<%- if @locked_pages.blank? -%>
+		<p><%= t('no pages') %></p>
+		<%- else -%>
+		<ul>
+			<%- @locked_pages.each do |page| -%>
+			<li class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
+				<%- if current_user.id == page.locked_by -%>
+				<%= link_to(page.name, alchemy.edit_admin_page_path(page)) %> <small>(<%= page.locker.name %>)</small>
+				<%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => request.path)) do %>
+			  	  <button class="icon_button small" title="<%= t('explain_unlocking') %>">
+			  		    <%= render_icon('close small') %>
+			  	  </button>
+			  <% end %>
+				<%- else -%>
+				<%= page.name %> <small>(<%= page.locker_name %>)</small>
+				<%- end -%>
+			</li>
+			<%- end -%>
+		</ul>
+		<%- end -%>
+	</div>
+	<%- reset_cycle('locked_pages') -%>
+	<div class="widget">
+		<h2><%= t('Who else is online') %>:</h2>
+		<%- if @online_users.blank? -%>
+		<p><%= t('no users') %></p>
+		<%- else -%>
+		<ul>
+			<%- @online_users.each do |user| -%>
+			<li class="<%= cycle('even', 'odd') %>"><%= user.name %> <small>(<%= Alchemy::I18n.t("alchemy.user_roles.#{user.role}") %>)</small></li>
+			<%- end -%>
+		</ul>
+		<%- end -%>
+	</div>
+</div>
+<div id="sideboard">
+	<%= image_tag("alchemy/alchemy-logo.png") %>
+	<p><%= t("Version") %>: <%= @alchemy_version %></p>
+	<div class="sideboard_body" style="display: none">
+		<p><%= t('Alchemy is open software and itself uses open software and free resources:') %></p>
+		<ul>
+			<li>
+				<a href="http://rubyonrails.org" target="_blank">RubyOnRails</a>
+			</li>
+			<li>
+				<a href="http://jquery.com" target="_blank">jQuery Javascript Library</a>
+			</li>
+			<li>
+				<a href="http://jqueryui.com" target="_blank">jQuery UI Javascript GUI Library</a>
+			</li>
+			<li>
+				<a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE - Javascript WYSIWYG Editor</a>
+			</li>
+			<li>
+				<a href="http://swfupload.org" target="_blank">SWFUpload</a>
+			</li>
+			<li>
+				<a href="http://p.yusukekamiyamane.com" target="_blank">Fugue Icons by Yusuke Kamiyamane</a>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<%= content_for :javascripts do %>
+<script type="text/javascript" charset="utf-8">
+	(function($) {
+		
+		$('#sideboard img:first-child').click(function(e) {
+			e.preventDefault();
+			$('#sideboard .sideboard_body').toggle();
+		}).bind('mouseover', function() {
+			$(this).css({cursor: 'pointer'});
+		});
+		
+	})(jQuery);
+</script>
+<% end %>

data/app/views/{admin → alchemy/admin}/elements/_add_content.html.erb

@@ -1,12 +1,12 @@
 <div class="add_content" id="add_content_<%= element.id %>">
 	<%= link_to_overlay_window(
 		render_icon('assign'),
-		admin_pictures_path(
+		alchemy.admin_pictures_path(
 			:element_id => element,
 			:options => options
 		),
 		{
-			:title => _('assign_image'),
+			:title => t('assign_image'),
 			:size => '720x580',
 			:resizable => true
 		}

data/app/views/{admin → alchemy/admin}/elements/_element.html.erb

@@ -1,5 +1,5 @@
 <div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>" data-element-id="<%= element.id %>">
-  <%= render :partial => "admin/elements/element_head", :locals => {:element => element} %>
+  <%= render :partial => "alchemy/admin/elements/element_head", :locals => {:element => element} %>
   <%- if !element.folded? -%>
     <%= form_for(
       [:admin, element],
@@ -15,10 +15,10 @@
       </div>
       <%- if element.has_validations? -%>
       <p class="validation_notice">
-        <span class="validation_indicator">*</span> <%= _('Mandatory') %>
+        <span class="validation_indicator">*</span> <%= t('Mandatory') %>
       </p>
       <%- end -%>
-      <%= render :partial => 'admin/elements/element_foot', :locals => {:element => element} %>
+      <%= render :partial => 'alchemy/admin/elements/element_foot', :locals => {:element => element} %>
     <% end %>
   <%- end -%>
 </div>

data/app/views/{admin → alchemy/admin}/elements/_element_foot.html.erb

@@ -2,34 +2,34 @@
   <span class="element_tools">
     <%= link_to(
       "",
-      trash_admin_element_path(element),
+      alchemy.trash_admin_element_path(element),
       :method => :delete,
       :class => "delete_element_button",
-      :title => _("trash element"),
+      :title => t("trash element"),
       :remote => true
     ) -%>
     <%= link_to(
       "",
-      insert_admin_clipboard_path(:remarkable_type => 'element', :remarkable_id => element.id, :remove => true),
+      alchemy.insert_admin_clipboard_path(:remarkable_type => element.class.name.demodulize.underscore, :remarkable_id => element.id, :remove => true),
       :remote => true,
       :method => :post,
       :class => "element_move_button",
-      :title => _("cut_element")
+      :title => t("cut_element")
     ) %>
     <%= link_to(
       "",
-      insert_admin_clipboard_path(:remarkable_type => 'element', :remarkable_id => element.id),
+      alchemy.insert_admin_clipboard_path(:remarkable_type => element.class.name.demodulize.underscore, :remarkable_id => element.id),
       :remote => true,
       :method => :post,
       :class => "element_copy_button",
-      :title => _("copy_element")
+      :title => t("copy_element")
     ) %>
   </span>
   <span class="element_public">
     <%= check_box_tag "public", "1", element.public?, :id => "element_#{element.id}_public" -%>
-    <%= label_tag "element_#{element.id}_public", _("visible") -%>
+    <%= label_tag "element_#{element.id}_public", t("visible") -%>
   </span>
   <button type="submit" class="button">
-    <%= _('save') %>
+    <%= t('save') %>
   </button>
 </div>

data/app/views/{admin → alchemy/admin}/elements/_element_head.html.erb

@@ -2,7 +2,7 @@
   <div class="element_handle">
     <span class="element_icon"></span>
     <%- if element.description.nil? -%>
-    <span class="warning icon" title="<%= _("Warning: Element '%{elementname}' is missing its description.") % {:elementname => element.name} %>"></span>
+    <span class="warning icon" title="<%= t("Warning: Element '%{elementname}' is missing its description.", :elementname => element.name) %>"></span>
     <%- else -%>
     <%= render_icon("element_#{element.public? ? 'public' : 'draft'}") %>
     <%- end -%>
@@ -20,9 +20,9 @@
     ) %>
     <%= link_to_function(
       "",
-      "Alchemy.toggleElement(#{element.id}, '#{fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{ _('Warning!') }', message: '#{ _('This element has unsaved changes. Do you really want to fold it?') }', okLabel: '#{ _('Yes') }', cancelLabel: '#{ _('No') }'})",
-      :class => (element.folded? ? 'expand_element' : 'fold_element'),
-      :title => (element.folded? ? _('show_element_content') : _('hide_element_content')),
+      "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{ t('Warning!') }', message: '#{ t('This element has unsaved changes. Do you really want to fold it?') }', okLabel: '#{ t('Yes') }', cancelLabel: '#{ t('No') }'})",
+      :class => element.folded? ? 'expand_element' : 'fold_element',
+      :title => element.folded? ? t('show_element_content') : t('hide_element_content'),
       :id => "element_#{element.id}_folder"
     ) %>
   </span>

data/app/views/{admin → alchemy/admin}/elements/_elements_select.html.erb

@@ -1,8 +1,8 @@
 <%= select_tag(
   "element_from_page_#{@page_id}_to_link",
   options_for_select(@elements.collect{ |m| [m.display_name_with_preview_text, "##{m.dom_id}"] }),
-  :prompt => _("choose_element_to_link"),
+  :prompt => t("choose_element_to_link"),
   :class => "elements_from_page_selector",
   :onchange => "jQuery('#page_anchor').val(value)",
-  :title => _("choose_element_as_target")
+  :title => t("choose_element_as_target")
 ) %>

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

@@ -0,0 +1,30 @@
+<div class="new_alchemy_element">
+<%- if @elements.blank? -%>
+	<p class="with_padding"><%= t('no_more_elements_to_add') %></p>
+<%- else -%>
+	<%= form_for [:admin, @element], :remote => true, :class => "add_element_content" do |form| %>
+		<div id="errors" style="display: none"></div>
+		<table>
+			<tr>
+				<td class="label">
+					<%= form.label :name, t("element_of_type") %>
+				</td>
+				<td class="select">
+					<%= form.select(
+						'name',
+						@page.can_have_cells? ? grouped_elements_for_select(@elements) : elements_for_select(@elements),
+						{:prompt => t('select_element')},
+						{:class => 'long'}
+					) -%>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2" class="submit">
+					<%= form.hidden_field 'page_id' %>
+					<%= form.button t('add'), :class => 'button' %>
+				</td>
+			</tr>
+		</table>
+	<% end %>
+<%- end -%>
+</div>

data/app/views/{admin → alchemy/admin}/elements/_picture_editor.html.erb

@@ -7,11 +7,11 @@
 	<%- end -%>
 	<%- if max_image_count.blank? || picture_contents.length < max_image_count.to_i -%>
 		<%= render(
-			:partial => 'admin/elements/add_content',
+			:partial => 'alchemy/admin/elements/add_content',
 			:locals => {
 				:element => element,
-				:essence_type => "EssencePicture",
-				:link_text => _("add_image_to_element"),
+				:essence_type => "Alchemy::EssencePicture",
+				:link_text => t("add_image_to_element"),
 				:options => options,
 				:dragable => (picture_contents.size > 1)
 			}