alchemy_cms 2.1.beta1 → 2.1.beta5

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

@@ -1,11 +1,11 @@
 (function($) {
   
   <%- if @page.can_have_cells? -%>
-  Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? _("other Elements") : @cell.name_for_label -%>');
+  Alchemy.selectOrCreateCellTab('<%= @cell.nil? ? "for_other_elements" : @cell.name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>');
   <%- end -%>
   $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').append('<%= escape_javascript render(:partial => "element", :object => @element, :locals => {:draggable => true}) -%>');
   $('#cell_<%= @cell.nil? ? "for_other_elements" : @cell.name -%>').sortable('refresh');
-  Alchemy.growl('<%= _("successfully_added_element") -%>');
+  Alchemy.growl('<%= t("successfully_added_element") -%>');
   Alchemy.closeCurrentWindow();
   <%- @element.rtf_contents.each do |content| -%>
   Alchemy.Tinymce.addEditor('<%= content.form_field_id -%>');

data/app/views/{admin → alchemy/admin}/elements/destroy.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 	$('.element_editor[data-element-id="<%= @element.id -%>"]').remove();
-	Alchemy.growl('<%= _("element_deleted_successful") -%>');
+	Alchemy.growl('<%= t("element_deleted_successful") -%>');
 	$('#element_area').sortable('refresh');
 	Alchemy.PreviewWindow.refresh();
 })(jQuery);

data/app/views/{admin → alchemy/admin}/elements/fold.js.erb

@@ -8,9 +8,9 @@
   
   $('.element_editor[data-element-id="<%= @element.id -%>"]').replaceWith('<%= escape_javascript render(:partial => "element", :object => @element) -%>');
   $('#element_area .sortable_cell').sortable('refresh');
-  Alchemy.ElementEditorSelector.bindEvent('#element_<%= @element.id -%>');
+  Alchemy.ElementEditorSelector.reinit('.element_editor[data-element-id="<%= @element.id -%>"]');
 
-  $('.element_editor[data-element-id="<%= @element.id -%>"]');
+  Alchemy.ButtonObserver('.element_editor[data-element-id="<%= @element.id -%>"] button.button');
 
   <%- if @element.folded -%>
     

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

@@ -5,7 +5,7 @@
       <%- @elements.each do |cell, elements| -%>
       <li>
         <a href="#cell_<%= cell.name -%>">
-          <%= cell.name == 'for_other_elements' ? _('other Elements') : t("alchemy.cell_names.#{cell.name}", :default => cell.name.camelcase) -%>
+          <%= cell.name == 'for_other_elements' ? t('other Elements') : t("alchemy.cell_names.#{cell.name}", :default => cell.name.camelcase) -%>
         </a>
       </li>
       <%- end -%>
@@ -22,12 +22,3 @@
   </div>
   <%- end -%>
 </div>
-<script type="text/javascript" charset="utf-8">
-  Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
-  Alchemy.ElementEditorSelector.init();
-  Alchemy.SelectBox('.element_editor select');
-  Alchemy.Tinymce.init();
-  Alchemy.ElementDirtyObserver('#element_area');
-  jQuery('#cells').tabs();
-  jQuery('#cells').tabs('paging', { follow: true, followOnSelect: true } );
-</script>

data/app/views/{admin → alchemy/admin}/elements/list.js.erb

@@ -1,10 +1,10 @@
 (function($) {
 
   $('#elements_for_page_<%= @page_id -%>').html('<%= escape_javascript(
-    render(:partial => "elements_select")
+    render("elements_select")
   ) %>');
   $('#elements_for_page_<%= @page_id -%>')
-    .append('<a class=\"close_elements_from_page_selector\" title=\"<%= _("remove") -%>\">–</a>')
+    .append('<a class=\"close_elements_from_page_selector\" title=\"<%= t("remove") -%>\">–</a>')
     .click(function(){
       Alchemy.LinkOverlay.hideElementsSelect(<%= @page_id -%>);
     });

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

@@ -0,0 +1,41 @@
+<%- if clipboard_empty?('elements') -%>
+<%= render :partial => 'new_element_form' %>
+<%- else -%>
+<div id="overlay_tabs">
+	<ul>
+		<li><a href="#create_element_tab"><%= t('New') %></a></li>
+		<li><a href="#paste_element_tab"><%= t('Paste from clipboard') %></a></li>
+	</ul>
+	<div id="create_element_tab">
+		<%= render :partial => 'new_element_form' %>
+	</div>
+	<div id="paste_element_tab">
+		<%= form_for([:admin, @element], :remote => true, :id => 'paste_element_form') do |f| %>
+			<div id="errors" style="display: none"></div>
+			<table>
+				<tr>
+					<td class="label">
+						<label for="paste_from_clipboard"><%= t("Element") %></label>
+					</td>
+					<td class="select">
+						<%= clipboard_select_tag(@clipboard_items, :class => 'long') %>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2" class="submit">
+						<%= f.hidden_field(:page_id) %>
+						<%= f.button t("paste"), :class => 'button' %>
+					</td>
+				</tr>
+			</table>
+		<% end %>
+	</div>
+</div>
+<script type="text/javascript" charset="utf-8">
+
+	jQuery(function() {
+		jQuery("#overlay_tabs").tabs();
+	});
+
+</script>
+<%- end -%>

data/app/views/{admin → alchemy/admin}/elements/order.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 
-	Alchemy.growl('<%= _("successfully_saved_element_position") -%>');
+	Alchemy.growl('<%= t("successfully_saved_element_position") -%>');
 	$('#element_area .ajax_folder').show();
 	Alchemy.PreviewWindow.refresh();
 

data/app/views/{admin → alchemy/admin}/elements/trash.js.erb

@@ -1,7 +1,7 @@
 (function($) {
   
   $('.element_editor[data-element-id="<%= @element.id -%>"]').remove();
-  Alchemy.growl('<%= _("Element trashed") -%>');
+  Alchemy.growl('<%= t("Element trashed") -%>');
   $('#element_area').sortable('refresh');
   Alchemy.refreshTrashWindow(<%= @page_id -%>);
   $('#element_trash_button .icon').addClass('full');

data/app/views/{admin → alchemy/admin}/elements/update.js.erb

@@ -7,7 +7,7 @@
   $('div.content_editor').removeClass('validation_failed');
   $("#element_<%= @element.id -%>_errors").hide();
   Alchemy.setElementSaved('#element_<%= @element.id -%>');
-  Alchemy.growl('<%= _("element_saved") -%>');
+  Alchemy.growl('<%= t("element_saved") -%>');
   Alchemy.PreviewWindow.refresh();
 
 	<%- else -%>

data/app/views/{admin → alchemy/admin}/essence_files/assign.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 	
-	$('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(render(:partial => "essences/essence_file_editor.html.erb", :locals => {:content => @content, :options => @options})) %>');
+	$('#<%= content_dom_id(@content) %>').replaceWith('<%= escape_javascript(render(:partial => "alchemy/essences/essence_file_editor.html.erb", :locals => {:content => @content, :options => @options})) %>');
 	Alchemy.closeCurrentWindow();
 	Alchemy.reloadPreview();
 	Alchemy.setElementDirty('#element_<%= @content.element.id %>');

data/app/views/{admin → alchemy/admin}/essence_files/edit.html.erb

@@ -1,89 +1,89 @@
 <%= form_for([:admin, @essence_file], :remote => true, :method => "put") do |f| %>
-  <%- if @content.essence_type == "EssenceFile" -%>
+  <%- if @content.essence_type == "Alchemy::EssenceFile" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "title", _("title") %></td>
+      <td class="label long"><%= f.label "title" %></td>
       <td><%= f.text_field "title", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td><%= f.label "css_class", _("align_in_text") %></td>
-      <td><%= f.select "css_class", [[_("Layout default"), ""], [_("above"), "no_float"], [_("left"), "left"], [_("right"), "right"]] %></td>
+      <td><%= f.label "css_class" %></td>
+      <td><%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]] %></td>
     </tr>
     <tr>
       <td colspan="2" style="text-align:right">
-        <%= f.button _("save"), :class => 'button' %>
+        <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
   </table>
-  <%- elsif @content.essence_type == "EssenceFlash" -%>
+  <%- elsif @content.essence_type == "Alchemy::EssenceFlash" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "width", _("width") %></td>
+      <td class="label long"><%= f.label "width" %></td>
       <td><%= f.text_field "width", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td><%= f.label "height", _("height") %></td>
+      <td><%= f.label "height" %></td>
       <td><%= f.text_field "height", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td><%= f.label "player_version", _("player_version") %></td>
+      <td><%= f.label "player_version" %></td>
       <td><%= f.text_field "player_version", :class => 'thin_border long' %></td>
     </tr>
     <tr>
       <td colspan="2" style="text-align:right">
-        <%= f.button _("save"), :class => 'button' %>
+        <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
   </table>
-  <%- elsif @content.essence_type == "EssenceVideo" -%>
+  <%- elsif @content.essence_type == "Alchemy::EssenceVideo" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "width", _("width") %></td>
+      <td class="label long"><%= f.label "width" %></td>
       <td><%= f.text_field "width", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td><%= f.label "height", _("height") %></td>
+      <td><%= f.label "height" %></td>
       <td><%= f.text_field "height", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td><%= f.label "allow_fullscreen", _("allow_fullscreen") %></td>
+      <td><%= f.label "allow_fullscreen" %></td>
       <td><%= f.check_box "allow_fullscreen" %></td>
     </tr>
     <tr>
-      <td><%= f.label "auto_play", _("auto_play") %></td>
+      <td><%= f.label "auto_play" %></td>
       <td><%= f.check_box "auto_play" %></td>
     </tr>
     <tr>
-      <td><%= f.label "show_navigation", _("show_navigation") %></td>
+      <td><%= f.label "show_navigation" %></td>
       <td><%= f.check_box "show_navigation" %></td>
     </tr>
     <tr>
       <td colspan="2" style="text-align:right">
-        <%= f.button _("save"), :class => 'button' %>
+        <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
   </table>
-  <%- elsif @content.essence_type == "EssenceAudio" -%>
+  <%- elsif @content.essence_type == "Alchemy::EssenceAudio" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "width", _("width") %></td>
+      <td class="label long"><%= f.label "width" %></td>
       <td><%= f.text_field "width", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td><%= f.label "height", _("height") %></td>
+      <td><%= f.label "height" %></td>
       <td><%= f.text_field "height", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td><%= f.label "show_eq", _("show_eq") %></td>
+      <td><%= f.label "show_eq" %></td>
       <td><%= f.check_box "show_eq" %></td>
     </tr>
     <tr>
-      <td><%= f.label "show_navigation", _("show_navigation") %></td>
+      <td><%= f.label "show_navigation" %></td>
       <td><%= f.check_box "show_navigation" %></td>
     </tr>
     <tr>
       <td colspan="2" style="text-align:right">
-        <%= f.button _("save"), :class => 'button' %>
+        <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
   </table>

data/app/views/{admin → alchemy/admin}/essence_pictures/assign.js.erb

@@ -2,11 +2,11 @@
   
   $('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
     render(
-      :partial => "/essences/essence_picture_editor",
+      :partial => "alchemy/essences/essence_picture_editor",
       :locals => {:content => @content, :options => params[:options]}
     )
   ) -%>');
-<%- if @content.element.contents.find_all_by_essence_type("EssencePicture").size > 1 -%>
+<%- if @content.element.contents.find_all_by_essence_type("Alchemy::EssencePicture").size > 1 -%>
   Alchemy.SortableContents('#<%= @content.element.id -%>_contents', '<%= form_authenticity_token -%>');
 <%- end -%>
   Alchemy.closeCurrentWindow();

data/app/views/{admin → alchemy/admin}/essence_pictures/crop.html.erb

@@ -1,9 +1,17 @@
+<%- if @no_image_notice -%>
+<div class="with_padding">
+	<div class="info">
+		<%= render_icon('info') %>
+		<%= @no_image_notice %>
+	</div>
+</div>
+<%- else -%>
 <div id="overlay_toolbar">
-  <%= form_for(@essence_picture, :url => admin_essence_picture_path(@essence_picture, :options => @options), :id => 'image_cropper_form', :remote => true) do |f| %>
+  <%= 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 %>
     <%= f.hidden_field :crop_size %>
     <%= hidden_field_tag 'content_id', @content.id %>
-    <%= f.button _("save"), :class => 'button' %>
+    <%= f.button t("save"), :class => 'button' %>
   <% end %>
   <div class="toolbar_spacer"></div>
   <div class="button_with_label">
@@ -11,19 +19,19 @@
       render_icon('delete-small'),
       'Alchemy.ImageCropper.reset()',
       :class => 'icon_button',
-      :title => _('Reset Imagemask')
+      :title => t('Reset Imagemask')
     ) %>
-    <label><%= _("Reset Imagemask") %></label>
+    <label><%= t("Reset Imagemask") %></label>
   </div>
 </div>
 
 <div id="crop_explain" class="tip">
-  <%= _('explain cropping') %>
+  <%= t('explain cropping') %>
 </div>
 
 <div id="jscropper">
   <%= image_tag(
-    zoom_picture_path(@essence_picture.picture, :format => :png),
+    alchemy.zoom_picture_path(@essence_picture.picture, :format => :png),
     :id => 'imageToCrop',
     :onload => "Alchemy.ImageCropper.init(
       [#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
@@ -34,3 +42,4 @@
     );"
   ) %>
 </div>
+<%- end -%>

data/app/views/{admin → alchemy/admin}/essence_pictures/destroy.js.erb

@@ -6,7 +6,7 @@
   <%- if max_image_count.blank? || (@essence_pictures.length < max_image_count) -%>
   $('#element_<%= @element.id -%>_contents').append('<%= escape_javascript(
     render(
-      :partial => "admin/elements/add_content",
+      :partial => "alchemy/admin/elements/add_content",
       :locals => {
         :element => @element,
         :options => @options

data/app/views/{admin → alchemy/admin}/essence_pictures/edit.html.erb

@@ -1,11 +1,11 @@
 <%= form_for(
     @essence_picture,
-    :url => admin_essence_picture_path(@essence_picture, :options => @options),
+    :url => alchemy.admin_essence_picture_path(@essence_picture, :options => @options),
 		:remote => true
 ) do |f| %>
   <table>
     <tr>
-      <td class="label"><%= f.label "caption", _("image_caption") %></td>
+      <td class="label"><%= f.label "caption" %></td>
       <td class="input">
         <%- if @options[:caption_as_textarea] -%>
         <%= f.text_area "caption", :class => 'thin_border' %>
@@ -15,22 +15,22 @@
       </td>
     </tr>
     <tr>
-      <td class="label"><%= f.label "title", _("image_title") %></td>
+      <td class="label"><%= f.label "title" %></td>
       <td><%= f.text_field "title", :class => 'thin_border long' %></td>
     </tr>
     <tr>
-      <td class="label"><%= f.label "alt_tag", _("image_alt_tag") %></td>
+      <td class="label"><%= f.label "alt_tag" %></td>
       <td><%= f.text_field "alt_tag", :class => 'thin_border long' %></td>
     </tr>
     <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
     <%- if @options[:sizes].is_a?(HashWithIndifferentAccess) -%>
     <tr>
-      <td class="label"><%= f.label "render_size", _("Size") %></td>
+      <td class="label"><%= f.label "render_size" %></td>
       <td>
       <%= f.select(
         "render_size",
         options_for_select(
-          [[_('Layout default'), @options[:image_size]]] + @options[:sizes].sort,
+          [[t('Layout default'), @options[:image_size]]] + @options[:sizes].sort,
           @essence_picture.render_size
         )
       ) %>
@@ -45,17 +45,17 @@
     <%- end -%>
     <%- if @options[:image_float_selector] -%>
     <tr>
-      <td class="label"><%= f.label "css_class", _("align_in_text") %></td>
+      <td class="label"><%= f.label "css_class" %></td>
       <td class="input">
-        <%= f.select "css_class", [[_("Layout default"), ""], [_("above"), "no_float"], [_("left"), "left"], [_("right"), "right"]] %>
+        <%= f.select "css_class", [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]] %>
       </td>
     </tr>
     <%# Have to use a Hash here, because Rails has a Hash.to_params bug with nested Arrays!!!! %>
     <%- elsif @options[:css_classes].is_a?(HashWithIndifferentAccess) -%>
     <tr>
-      <td class="label"><%= f.label "css_class", _("Select style") %></td>
+      <td class="label"><%= f.label "css_class" %></td>
       <td class="input">
-        <%= f.select("css_class", options_for_select([[_('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class)) %>
+        <%= f.select("css_class", options_for_select([[t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class)) %>
       </td>
     </tr>
     <%- elsif @options[:css_classes] && !@options[:css_classes].is_a?(HashWithIndifferentAccess) -%>
@@ -68,7 +68,7 @@
     <tr>
       <td colspan="2" style="text-align:right">
         <%= hidden_field_tag 'content_id', @content.id %>
-        <%= f.button _("save"), :class => 'button' %>
+        <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
   </table>

data/app/views/{admin → alchemy/admin}/essence_pictures/update.js.erb

@@ -6,10 +6,10 @@
       :locals => {:content => @content, :options => params[:options]}
     )
   ) -%>');
-  Alchemy.growl('<%= _("Image updated successfully") -%>');
+  Alchemy.growl('<%= t("Image updated successfully") -%>');
   Alchemy.closeCurrentWindow();
   Alchemy.reloadPreview();
-<%- if @content.element.contents.find_all_by_essence_type("EssencePicture").size > 1 -%>
+<%- if @content.element.contents.find_all_by_essence_type("Alchemy::EssencePicture").size > 1 -%>
   Alchemy.SortableContents('<%= form_authenticity_token -%>');
 <%- end -%>
   

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

@@ -0,0 +1,36 @@
+<tr class="<%= cycle('even', 'odd') %>">
+	<td class="name"><%= language.name -%></td>
+	<td class="code"><%= language.code %></td>
+	<td class="name"><%= language.frontpage_name %></td>
+	<td class="name"><%= language.page_layout %></td>
+	<td class="center"><%= render_icon language.public? %></td>
+	<td class="center"><%= render_icon language.default? %></td>
+	<td class="tools">
+		<%- permitted_to?(:edit, :alchemy_admin_languages) do -%>
+		<%= link_to_overlay_window(
+			'',
+			alchemy.edit_admin_language_path(language),
+			{
+				:title => t('edit_language'),
+				:size => '420x280',
+				:overflow => true
+			},
+			{
+				:class => "icon edit",
+				:title => t('edit_language')
+			}
+		) -%>
+		<%- end -%>
+		<%- unless language.default? -%>
+		<%- permitted_to?(:destroy, :alchemy_admin_languages) do -%>
+		<%= link_to_confirmation_window(
+			'',
+			t("confirm_to_delete_language"),
+			alchemy.admin_language_path(language),
+			:title => t('delete_language'),
+			:class => "icon destroy"
+		) -%>
+		<%- end -%>
+		<%- end -%>
+	</td>
+</tr>