alchemy_cms 2.1.beta6 → 2.1.rc2

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

@@ -13,8 +13,7 @@
 					<%= form.select(
 						'name',
 						@page.can_have_cells? ? grouped_elements_for_select(@elements) : elements_for_select(@elements),
-						{:prompt => t('select_element')},
-						{:class => 'long'}
+						{:prompt => t('select_element')}
 					) -%>
 				</td>
 			</tr>

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

@@ -18,7 +18,7 @@
 						<label for="paste_from_clipboard"><%= t("Element") %></label>
 					</td>
 					<td class="select">
-						<%= clipboard_select_tag(@clipboard_items, :class => 'long') %>
+						<%= clipboard_select_tag(@clipboard_items) %>
 					</td>
 				</tr>
 				<tr>

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

@@ -2,15 +2,15 @@
   <%- if @content.essence_type == "Alchemy::EssenceFile" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "title" %></td>
-      <td><%= f.text_field "title", :class => 'thin_border long' %></td>
+      <td class="label"><%= f.label "title" %></td>
+      <td class="input"><%= f.text_field "title", :class => 'thin_border' %></td>
     </tr>
     <tr>
-      <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>
+      <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 => 'long' %></td>
     </tr>
     <tr>
-      <td colspan="2" style="text-align:right">
+      <td colspan="2" class="submit">
         <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
@@ -18,19 +18,19 @@
   <%- elsif @content.essence_type == "Alchemy::EssenceFlash" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "width" %></td>
-      <td><%= f.text_field "width", :class => 'thin_border long' %></td>
+      <td class="label"><%= f.label "width" %></td>
+      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
     </tr>
     <tr>
-      <td><%= f.label "height" %></td>
-      <td><%= f.text_field "height", :class => 'thin_border long' %></td>
+      <td class="label"><%= f.label "height" %></td>
+      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
     </tr>
     <tr>
-      <td><%= f.label "player_version" %></td>
-      <td><%= f.text_field "player_version", :class => 'thin_border long' %></td>
+      <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" style="text-align:right">
+      <td colspan="2" class="submit">
         <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
@@ -38,27 +38,27 @@
   <%- elsif @content.essence_type == "Alchemy::EssenceVideo" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "width" %></td>
-      <td><%= f.text_field "width", :class => 'thin_border long' %></td>
+      <td class="label"><%= f.label "width" %></td>
+      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
     </tr>
     <tr>
-      <td><%= f.label "height" %></td>
-      <td><%= f.text_field "height", :class => 'thin_border long' %></td>
+      <td class="label"><%= f.label "height" %></td>
+      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
     </tr>
     <tr>
-      <td><%= f.label "allow_fullscreen" %></td>
-      <td><%= f.check_box "allow_fullscreen" %></td>
+      <td class="label"><%= f.label "allow_fullscreen" %></td>
+      <td class="checkbox"><%= f.check_box "allow_fullscreen" %></td>
     </tr>
     <tr>
-      <td><%= f.label "auto_play" %></td>
-      <td><%= f.check_box "auto_play" %></td>
+      <td class="label"><%= f.label "auto_play" %></td>
+      <td class="checkbox"><%= f.check_box "auto_play" %></td>
     </tr>
     <tr>
-      <td><%= f.label "show_navigation" %></td>
-      <td><%= f.check_box "show_navigation" %></td>
+      <td class="label"><%= f.label "show_navigation" %></td>
+      <td class="check_box"><%= f.check_box "show_navigation" %></td>
     </tr>
     <tr>
-      <td colspan="2" style="text-align:right">
+      <td colspan="2" class="submit">
         <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>
@@ -66,23 +66,23 @@
   <%- elsif @content.essence_type == "Alchemy::EssenceAudio" -%>
   <table>
     <tr>
-      <td class="label long"><%= f.label "width" %></td>
-      <td><%= f.text_field "width", :class => 'thin_border long' %></td>
+      <td class="label"><%= f.label "width" %></td>
+      <td class="input"><%= f.text_field "width", :class => 'thin_border' %></td>
     </tr>
     <tr>
-      <td><%= f.label "height" %></td>
-      <td><%= f.text_field "height", :class => 'thin_border long' %></td>
+      <td class="label"><%= f.label "height" %></td>
+      <td class="input"><%= f.text_field "height", :class => 'thin_border' %></td>
     </tr>
     <tr>
-      <td><%= f.label "show_eq" %></td>
-      <td><%= f.check_box "show_eq" %></td>
+      <td class="label"><%= f.label "show_eq" %></td>
+      <td class="checkbox"><%= f.check_box "show_eq" %></td>
     </tr>
     <tr>
-      <td><%= f.label "show_navigation" %></td>
-      <td><%= f.check_box "show_navigation" %></td>
+      <td class="label"><%= f.label "show_navigation" %></td>
+      <td class="checkbox"><%= f.check_box "show_navigation" %></td>
     </tr>
     <tr>
-      <td colspan="2" style="text-align:right">
+      <td colspan="2" class="submit">
         <%= f.button t("save"), :class => 'button' %>
       </td>
     </tr>

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

@@ -7,39 +7,39 @@
 </div>
 <%- 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 %>
-    <%= f.hidden_field :crop_size %>
-    <%= hidden_field_tag 'content_id', @content.id %>
-    <%= f.button t("save"), :class => 'button' %>
-  <% end %>
-  <div class="toolbar_spacer"></div>
-  <div class="button_with_label">
-    <%= link_to_function(
-      render_icon('delete-small'),
-      'Alchemy.ImageCropper.reset()',
-      :class => 'icon_button',
-      :title => t('Reset Imagemask')
-    ) %>
-    <label><%= t("Reset Imagemask") %></label>
-  </div>
+	<%= 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 t("save"), :class => 'button' %>
+	<% end %>
+	<div class="toolbar_spacer"></div>
+	<div class="button_with_label">
+		<%= link_to_function(
+			render_icon('delete-small'),
+			'Alchemy.ImageCropper.reset()',
+			:class => 'icon_button',
+			:title => t('Reset Imagemask')
+		) %>
+		<label><%= t("Reset Imagemask") %></label>
+	</div>
 </div>
 
 <div id="crop_explain" class="tip">
-  <%= t('explain cropping') %>
+	<%= t('explain cropping') %>
 </div>
 
 <div id="jscropper">
-  <%= image_tag(
-    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]}],
-      #{@size_x},
-      #{@size_y},
-      [#{@default_box[:x1]}, #{@default_box[:y1]}, #{@default_box[:x2]}, #{@default_box[:y2]}],
-      #{@ratio}
-    );"
-  ) %>
+	<%= image_tag(
+		alchemy.zoom_picture_path(:id => @essence_picture.picture.id, :name => @essence_picture.picture.urlname),
+		:id => 'imageToCrop',
+		:onload => "Alchemy.ImageCropper.init(
+			[#{@initial_box[:x1]}, #{@initial_box[:y1]}, #{@initial_box[:x2]}, #{@initial_box[:y2]}],
+			#{@size_x},
+			#{@size_y},
+			[#{@default_box[:x1]}, #{@default_box[:y1]}, #{@default_box[:x2]}, #{@default_box[:y2]}],
+			#{@ratio}
+		);"
+	) %>
 </div>
-<%- end -%>
+<%- end -%>

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

@@ -1,16 +1,17 @@
 (function($) {
-  
-  $('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
-    render(
-      :partial => "alchemy/essences/essence_picture_editor",
-      :locals => {:content => @content, :options => params[:options]}
-    )
-  ) -%>');
-  Alchemy.growl('<%= t("Image updated successfully") -%>');
-  Alchemy.closeCurrentWindow();
-  Alchemy.reloadPreview();
+
+	$('#<%= content_dom_id(@content) -%>').replaceWith('<%= escape_javascript(
+		render(
+			:partial => "alchemy/essences/essence_picture_editor",
+			:locals => {:content => @content, :options => params[:options]}
+		)
+	) -%>');
+	Alchemy.growl('<%= t("Image updated successfully") -%>');
+	Alchemy.ImageCropper.destroy();
+	Alchemy.closeCurrentWindow();
+	Alchemy.reloadPreview();
 <%- if @content.element.contents.find_all_by_essence_type("Alchemy::EssencePicture").size > 1 -%>
-  Alchemy.SortableContents('<%= form_authenticity_token -%>');
+	Alchemy.SortableContents('<%= form_authenticity_token -%>');
 <%- end -%>
-  
+
 })(jQuery);

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

@@ -1,4 +1,7 @@
-<h1><%= t("language_does_not_exist") %></h1>
+<div class="info">
+	<%= render_icon('info') %>
+	<%= t("language_does_not_exist") %>
+</div>
 <%- if @language -%>
 <%- if @languages_with_page_tree.size >= 1 -%>
 	<p><%= t("want_to_make_copy_of_existing_language") %></p>

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

@@ -8,7 +8,7 @@
 				<%= f.label :page_layout %>
 			</td>
 			<td class="select">
-				<%= f.select('page_layout', @page_layouts, {}, :class => 'long') %>
+				<%= f.select('page_layout', @page_layouts) %>
 			</td>
 		</tr>
 		<tr>

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

@@ -67,7 +67,7 @@
 	<div class="button_with_label" id="show_preview_window">
 		<%= link_to_function(
 			render_icon('preview_window'),
-			"openPreviewWindow()",
+			"Alchemy.openPreviewWindow()",
 			{
 				:title => t('Show Preview Window'),
 				:class => 'icon_button'
@@ -78,7 +78,7 @@
 	<div class="button_with_label" id="show_element_window">
 		<%= link_to_function(
 			render_icon('element_window'),
-			"openElementsWindow()",
+			"Alchemy.openElementsWindow()",
 			{
 				:title => t('Show Elements Window'),
 				:class => 'icon_button'
@@ -93,12 +93,12 @@
 <%= tinymce_javascript_tags %>
 <script type="text/javascript" charset="utf-8">
 
-	function openPreviewWindow() {
-		Alchemy.openPreviewWindow('<%= admin_page_url(@page) %>', '<%= t("Page Preview") -%>');
+	Alchemy.openPreviewWindow = function() {
+		Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= t("Page Preview") -%>');
 	}
 
-	function openElementsWindow() {
-		Alchemy.openElementsWindow('<%= alchemy.admin_elements_path(:page_id => @page.id) -%>', {
+	Alchemy.openElementsWindow = function() {
+		Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(:page_id => @page.id) -%>', {
 			texts: {
 				title: '<%= t("Elements") -%>',
 				dirtyTitle: '<%= t("Warning!") -%>',
@@ -173,8 +173,8 @@
 			return Alchemy.checkPageDirtyness(this, texts);
 		});
 		Alchemy.PageLeaveObserver(texts);
-		openElementsWindow();
-		openPreviewWindow();
+		Alchemy.openElementsWindow();
+		Alchemy.openPreviewWindow();
 	});
 
 </script>

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

@@ -74,7 +74,7 @@
 <div id="bottom_panel" style="display: none">
 	<div class="info">
 		<%= render_icon('info') %>
-		<%= t('Explain|Sitemap|Dragndrop sorting') %>
+		<%= t('explain_sitemap_dragndrop_sorting') %>
 	</div>
 	<div id="bottom_buttons">
 		<%= link_to( t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;

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

@@ -19,7 +19,7 @@
 						<label for="paste_from_clipboard"><%= t("Page") %></label>
 					</td>
 					<td class="select">
-						<%= clipboard_select_tag(@clipboard_items, :class => 'long') %>
+						<%= clipboard_select_tag(@clipboard_items) %>
 					</td>
 				</tr>
 				<tr>

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

@@ -1,33 +1,40 @@
 (function($) {
-	
+
 	Alchemy.closeCurrentWindow();
 
 	<%- if @while_page_edit -%>
-	
+
 		Alchemy.reloadPreview();
 		$('#page_<%= @page.id -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
-	
+
 	<%- else -%>
 
 		$('#page_<%= @page.id -%> > .sitemap_page > .sitemap_sitename .sitemap_pagename_link').text('<%= @page.name -%>');
-		
+
 		<%- if @page.locked? && @page.locker == current_user -%>
+
 			$('#locked_page_<%= @page.id -%> > a').text('<%= @page.name -%>');
+
 		<%- end -%>
-		
+
 		$('#page_<%= @page.id -%>_infos').html('<%= escape_javascript(render(:partial => "page_infos", :locals => {:page => @page})) -%>');
-		
+
 		<%- if @page.restricted? -%>
-		
+
 			$('#page_<%= @page.id -%> .page_status:nth-child(3)').addClass('restricted', 'not_restricted').removeClass('not_restricted');
-			
+
+		<%- elsif @page.redirects_to_external? -%>
+
+			$('#page_<%= @page.id -%> span.redirect_url').html('&raquo; <%= t("Redirects to") %>: <%= h @page.urlname %>');
+
 		<%- else -%>
-		
+
 			$('#page_<%= @page.id -%> .page_status:nth-child(3)').addClass('not_restricted').removeClass('restricted');
+
 		<%- end -%>
-	
+
 	<%- end -%>
-	
+
 	Alchemy.growl("<%= @notice -%>");
-	
+
 })(jQuery);

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

@@ -27,7 +27,7 @@
 			:onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
 			:style => "display: none;"
 		),
-		"Alchemy.zoomImage('/admin/pictures/#{picture.id}/show_in_window', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
+		"Alchemy.zoomImage('#{show_in_window_admin_picture_path(picture.id)}', '#{picture.name}', #{picture.image_width || 320}, #{picture.image_height || 240})",
 		:class => 'thumbnail_background'
 	) %>
 	<span class="picture_name<%= ' rename' if permitted_to?(:edit, :alchemy_admin_pictures) -%>" title="<%= permitted_to?(:edit, :alchemy_admin_pictures) ? picture.name + ' (' + t('Click to rename') + ')' : picture.name %>" id="image_picture_<%= picture.id %>_name"><%= picture.name %></span>

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

@@ -1,14 +1,16 @@
 <%- if @pictures.blank? && params[:query].nil? -%>
-<p class="padding_left_right">
+<div class="info">
+	<%= render_icon('info') %>
 	<%= t("no_images_in_archive") %>
-</p>
+</div>
 <%- elsif @pictures.blank? -%>
-<p class="padding_left_right">
+<div class="info">
+	<%= render_icon('info') %>
 	<%= t("no_search_results") %>
-</p>
+</div>
 <%- else  -%>
 <div id="pictures">
-	<%= render(:partial => 'picture', :collection => @pictures) %>
+	<%= render :partial => 'picture', :collection => @pictures %>
+	<%= render 'alchemy/admin/partials/pagination_links', :items => @pictures %>
 </div>
-<%= render :partial => 'alchemy/admin/partials/pagination_links', :locals => {:items => @pictures} %>
 <%- end -%>

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

@@ -1 +1,6 @@
-<%= image_tag(alchemy.zoom_picture_path(@picture, :format => 'png')) %>
+<%= image_tag(
+	alchemy.zoom_picture_path(
+		:id => @picture.id,
+		:name => @picture.urlname
+	)
+) %>

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

@@ -17,7 +17,7 @@
 	<%= render_resources %>
 </table>
 <%- elsif params[:query] -%>
-<p><%= t('Nothing found.') %></p>
+<p><%= t('Nothing found') %></p>
 <%- end -%>
 
 <%= render 'alchemy/admin/partials/pagination_links', :items => resources_instance_variable %>

data/app/views/alchemy/admin/users/_table.html.erb

@@ -1,40 +1,40 @@
 <table>
 	<tr>
 		<td class="label"><%= f.label 'gender' %></td>
-		<td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')}, {:class => 'long'} -%></td>
+		<td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')} -%></td>
 	</tr>
 	<tr>
 		<td class="label"><%= f.label 'firstname' %></td>
-		<td class="input"><%= f.text_field 'firstname', :class => 'thin_border' -%></td>
+		<td class="input"><%= f.text_field 'firstname', :class => 'thin_border' %></td>
 	</tr>
 	<tr>
 		<td class="label"><%= f.label 'lastname' %></td>
-		<td class="input"><%= f.text_field 'lastname', :class => 'thin_border' -%></td>
+		<td class="input"><%= f.text_field 'lastname', :class => 'thin_border' %></td>
 	</tr>
 	<tr>
-		<td class="label"><%= f.label 'login' %></td>
-		<td class="input"><%= f.text_field 'login', :class => 'thin_border' -%></td>
+		<td class="label mandatory"><%= f.label 'login' %></td>
+		<td class="input"><%= f.text_field 'login', :class => 'thin_border', :required => true %></td>
 	</tr>
 	<tr>
-		<td class="label"><%= f.label 'email' %></td>
-		<td class="input"><%= f.text_field 'email', :class => 'thin_border' -%></td>
+		<td class="label mandatory"><%= f.label 'email' %></td>
+		<td class="input"><%= f.email_field 'email', :class => 'thin_border', :required => true %></td>
 	</tr>
 	<tr>
 		<td class="label"><%= f.label 'language' %></td>
-		<td class="select"><%= f.select 'language', translations_for_select, {}, :class => 'long' -%></td>
+		<td class="select"><%= f.select 'language', translations_for_select %></td>
 	</tr>
 	<tr>
-		<td class="label"><%= f.label 'password' %></td>
-		<td class="input"><%= f.password_field 'password', :class => 'thin_border', :autocomplete => "off" -%></td>
+		<td class="label mandatory"><%= f.label 'password' %></td>
+		<td class="input mandatory"><%= f.password_field 'password', :class => 'thin_border', :autocomplete => "off", :required => action_name == 'signup' %></td>
 	</tr>
 	<tr>
-		<td class="label"><%= f.label 'password_confirmation' %></td>
-		<td class="input"><%= f.password_field 'password_confirmation', :class => 'thin_border', :autocomplete => "off" -%></td>
+		<td class="label mandatory"><%= f.label 'password_confirmation' %></td>
+		<td class="input"><%= f.password_field 'password_confirmation', :class => 'thin_border', :autocomplete => "off", :required => action_name == 'signup' %></td>
 	</tr>
 	<%- unless action_name == 'signup' -%>
 	<tr>
 		<td class="label"><%= f.label 'role' %></td>
-		<td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role), {}, :class => 'long' -%></td>
+		<td class="select"><%= f.select :role, options_for_select(@user_roles, @user.role) %></td>
 	</tr>
 	<%- else -%>
 	<%= f.hidden_field :role %>