alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,3 +1,3 @@
 <div class="download" <%= element_preview_code(element) -%>>
-	<%= render_essence_view_by_name(element, 'file') %>
+  <%= render_essence_view_by_name(element, 'file') %>
 </div>

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

@@ -1,5 +1,5 @@
 <div class="error">
-	<%= render_icon('error') %>
-	<h1><%= t("element_editor_not_found") %>:</h1>
-	<p><%= error %></p>
+  <%= render_icon('error') %>
+  <h1><%= t("element_editor_not_found") %>:</h1>
+  <p><%= error %></p>
 </div>

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

@@ -1,4 +1,4 @@
 <div class="searchresult" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
-	<%= render_search_form %>
-	<%= render_search_results %>
+  <%= render_search_form %>
+  <%= render_search_results %>
 </div>

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

@@ -1,3 +1,3 @@
 <div class="content_editor">
-	<p><%= t(:sitemap_editor_info) %></p>
+  <p><%= t(:sitemap_editor_info) %></p>
 </div>

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

@@ -14,20 +14,20 @@
 </div>
 <script type="text/javascript" charset="utf-8">
 //<!--[CDATA[
-	var alchemy_audio_player_<%= content.id %> = new SWFObject("/mediaplayer.swf", "mediaplayer", <%= width %>, <%= height %>, "8");
-	alchemy_audio_player_<%= content.id %>.addVariable("width", <%= width %>);
-	alchemy_audio_player_<%= content.id %>.addVariable("height", <%= height %>);
-	alchemy_audio_player_<%= content.id %>.addVariable("backcolor", '<%= options[:player_backcolor] || "0xFFFFFF" %>');
-	alchemy_audio_player_<%= content.id %>.addVariable("frontcolor", '<%= options[:player_frontcolor] || "0x000000" %>');
-	alchemy_audio_player_<%= content.id %>.addVariable("lightcolor", '<%= options[:player_lightcolor] || "0xEDEDED" %>');
-	alchemy_audio_player_<%= content.id %>.addVariable("screencolor", '<%= options[:player_screencolor] || "0x000000" %>');
-	alchemy_audio_player_<%= content.id %>.addVariable("showeq", '<%= content.essence.show_eq ? "true" : "false" %>');
-	alchemy_audio_player_<%= content.id %>.addVariable("shownavigation", '<%= content.essence.show_navigation ? "true" : "false" %>');
-	alchemy_audio_player_<%= content.id %>.addVariable("file", '<%= content.essence.attachment.public_filename %>');
-	<%- unless options[:player_cover_image].blank? -%>
-	alchemy_audio_player_<%= content.id %>.addVariable("image", '<%= "/" + options[:player_cover_image].file_name %>');
+  var alchemy_audio_player_<%= content.id %> = new SWFObject("/mediaplayer.swf", "mediaplayer", <%= width %>, <%= height %>, "8");
+  alchemy_audio_player_<%= content.id %>.addVariable("width", <%= width %>);
+  alchemy_audio_player_<%= content.id %>.addVariable("height", <%= height %>);
+  alchemy_audio_player_<%= content.id %>.addVariable("backcolor", '<%= options[:player_backcolor] || "0xFFFFFF" %>');
+  alchemy_audio_player_<%= content.id %>.addVariable("frontcolor", '<%= options[:player_frontcolor] || "0x000000" %>');
+  alchemy_audio_player_<%= content.id %>.addVariable("lightcolor", '<%= options[:player_lightcolor] || "0xEDEDED" %>');
+  alchemy_audio_player_<%= content.id %>.addVariable("screencolor", '<%= options[:player_screencolor] || "0x000000" %>');
+  alchemy_audio_player_<%= content.id %>.addVariable("showeq", '<%= content.essence.show_eq ? "true" : "false" %>');
+  alchemy_audio_player_<%= content.id %>.addVariable("shownavigation", '<%= content.essence.show_navigation ? "true" : "false" %>');
+  alchemy_audio_player_<%= content.id %>.addVariable("file", '<%= content.essence.attachment.public_filename %>');
+  <%- unless options[:player_cover_image].blank? -%>
+  alchemy_audio_player_<%= content.id %>.addVariable("image", '<%= "/" + options[:player_cover_image].file_name %>');
   <%- end -%>
-	alchemy_audio_player_<%= content.id %>.write("alchemy_audio_player_<%= content.id %>");
+  alchemy_audio_player_<%= content.id %>.write("alchemy_audio_player_<%= content.id %>");
 //]]-->
 </script>
 <%- end -%>

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

@@ -1,12 +1,12 @@
 <div class="content_editor essence_date" id="<%= content_dom_id(content) %>">
-	<label><%= render_content_name(content) %></label>
-	<%= alchemy_datepicker(
-		content.essence, :date, {
-			:name => content.form_field_name,
-			:id => content.form_field_id
-		}
-	) %>
-	<label for="<%= content.form_field_id %>" style="cursor: pointer; display: inline; display: inline-block; position: relative; top: 3px; margin: 0;">
-		<span class="ui-icon ui-icon-calendar"></span>
-	</label>
+  <label><%= render_content_name(content) %></label>
+  <%= alchemy_datepicker(
+    content.essence, :date, {
+      :name => content.form_field_name,
+      :id => content.form_field_id
+    }
+  ) %>
+  <label for="<%= content.form_field_id %>" style="cursor: pointer; display: inline; display: inline-block; position: relative; top: 3px; margin: 0;">
+    <span class="ui-icon ui-icon-calendar"></span>
+  </label>
 </div>

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

@@ -1,64 +1,64 @@
 <div class="content_editor" id="<%= content_dom_id(content) %>">
-	<label style="display: inline">
-		<%= render_content_name(content) %>
-	</label>
-	<div class="file" id="file_<%= content.id %>">
-		<div class="file_icon">
-		<%- if content.ingredient.nil? -%>
-			<%= link_to_overlay_window("",
-				alchemy.admin_attachments_path(
-					:content_id => content.id,
-					:only => options[:file_assign_show_only],
-					:except => options[:file_assign_do_not_show],
-					:options => options
-				),
-				{
-					:title => t('assign_file'),
-					:size => '520x400',
-					:resizable => 'true'
-				},
-				:class => 'assign_file',
-				:title => t('assign_file')
-			) %>
-		<%- else -%>
-			<%= render_icon(content.ingredient.icon_css_class) %>
-		<%- end -%>
-		</div>
-		<div class="file_name">
-			<%= content.ingredient.name rescue ("&#x2190;" + t('assign_file_from_archive')).html_safe %>
-		</div>
-		<%- unless content.ingredient.nil? -%>
-		<%= hidden_field_tag content.form_field_name(:attachment_id), content.ingredient.id %>
-		<div class="essence_file_tools">
-			<%= link_to_overlay_window("",
-				alchemy.admin_attachments_path(
-					:content_id => content.id,
-					:only => options[:file_assign_show_only],
-					:except => options[:file_assign_do_not_show],
-					:options => options
-				),
-				{
-					:title => t('assign_file'),
-					:size => '520x400',
-					:resizable => 'true'
-				},
-				:class => 'assign_file',
-				:title => t('assign_file')
-			) %>
-			<%= link_to_overlay_window("",
-				url_for(
-					:controller => 'essence_files',
-					:action => 'edit',
-					:id => content
-				),
-				{
-					:title => t('edit_file_properties'),
-					:size => '400x150'
-				},
-				:class => 'edit_file',
-				:title => t('edit_file_properties')
-			) %>
-		</div>
-		<%- end -%>
-	</div>
+  <label style="display: inline">
+    <%= render_content_name(content) %>
+  </label>
+  <div class="file" id="file_<%= content.id %>">
+    <div class="file_icon">
+    <%- if content.ingredient.nil? -%>
+      <%= link_to_overlay_window("",
+        alchemy.admin_attachments_path(
+          :content_id => content.id,
+          :only => options[:file_assign_show_only],
+          :except => options[:file_assign_do_not_show],
+          :options => options
+        ),
+        {
+          :title => t('assign_file'),
+          :size => '520x400',
+          :resizable => 'true'
+        },
+        :class => 'assign_file',
+        :title => t('assign_file')
+      ) %>
+    <%- else -%>
+      <%= render_icon(content.ingredient.icon_css_class) %>
+    <%- end -%>
+    </div>
+    <div class="file_name">
+      <%= content.ingredient.name rescue ("&#x2190;" + t('assign_file_from_archive')).html_safe %>
+    </div>
+    <%- unless content.ingredient.nil? -%>
+    <%= hidden_field_tag content.form_field_name(:attachment_id), content.ingredient.id %>
+    <div class="essence_file_tools">
+      <%= link_to_overlay_window("",
+        alchemy.admin_attachments_path(
+          :content_id => content.id,
+          :only => options[:file_assign_show_only],
+          :except => options[:file_assign_do_not_show],
+          :options => options
+        ),
+        {
+          :title => t('assign_file'),
+          :size => '520x400',
+          :resizable => 'true'
+        },
+        :class => 'assign_file',
+        :title => t('assign_file')
+      ) %>
+      <%= link_to_overlay_window("",
+        url_for(
+          :controller => 'essence_files',
+          :action => 'edit',
+          :id => content
+        ),
+        {
+          :title => t('edit_file_properties'),
+          :size => '400x150'
+        },
+        :class => 'edit_file',
+        :title => t('edit_file_properties')
+      ) %>
+    </div>
+    <%- end -%>
+  </div>
 </div>

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

@@ -1,10 +1,10 @@
 <%= link_to(
-	h(content.essence.attachment.name),
-	alchemy.download_attachment_path(
-		:id => content.essence.attachment.id,
-		:name => content.essence.attachment.urlname,
-		:format => content.essence.attachment.suffix
-	),
-	:class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
-	:title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"
+  h(content.essence.attachment.name),
+  alchemy.download_attachment_path(
+    :id => content.essence.attachment.id,
+    :name => content.essence.attachment.urlname,
+    :format => content.essence.attachment.suffix
+  ),
+  :class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
+  :title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"
 ) if content.essence.attachment %>

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

@@ -3,24 +3,24 @@
 <%- height = content.essence.height.blank? ? (options[:flash_movie_size].split('x')[1] rescue 200) : content.essence.height -%>
 <%- player_version = content.essence.player_version.blank? ? "8" : content.essence.player_version -%>
 <div class="flash_film">
-	<div id="swf_container_<%= content.id %>">
-		Sie brauchen den neusten <a href="http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash" target="_blank">Flash-Player</a> und Sie müssen JavaScript aktivieren.
-	</div>
-	<script type="text/javascript" charset="utf-8">
-		var flashvars = {};
-		var params = {};
-		var attributes = {};
-		swfobject.embedSWF(
-			"<%= content.essence.attachment.public_filename %>",
-			"swf_container_<%= content.id %>",
-			'<%= width %>',
-			'<%= height %>',
-			'<%= player_version %>',
-			false,
-			flashvars,
-			params,
-			attributes
-		);
-	</script>
+  <div id="swf_container_<%= content.id %>">
+    Sie brauchen den neusten <a href="http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash" target="_blank">Flash-Player</a> und Sie müssen JavaScript aktivieren.
+  </div>
+  <script type="text/javascript" charset="utf-8">
+    var flashvars = {};
+    var params = {};
+    var attributes = {};
+    swfobject.embedSWF(
+      "<%= content.essence.attachment.public_filename %>",
+      "swf_container_<%= content.id %>",
+      '<%= width %>',
+      '<%= height %>',
+      '<%= player_version %>',
+      false,
+      flashvars,
+      params,
+      attributes
+    );
+  </script>
 </div>
 <%- end -%>

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

@@ -1,8 +1,8 @@
 <div class="content_editor content_text_editor"<%= " style=\"float: left;\"" if options[:css_class] == "text_short" %>>
-	<label><%= render_content_name(content) %></label>
-	<%= text_field_tag(
-		content.form_field_name,
-		content.ingredient,
-		:class => 'thin_border text_long'
-	) %>
+  <label><%= render_content_name(content) %></label>
+  <%= text_field_tag(
+    content.form_field_name,
+    content.ingredient,
+    :class => 'thin_border text_long'
+  ) %>
 </div>

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

@@ -1,75 +1,75 @@
 <div id="<%= content_dom_id(content) %>" class="essence_picture_editor<%= ' dragable_picture' if options[:dragable] %><%= ' content_editor' unless options[:grouped] %>">
-	<% unless options[:grouped] %>
-	<label><%= render_content_name(content) %></label>
-	<% end %>
-	<div class="picture_thumbnail">
-		<span class="picture_tool_delete">
-			<% if options[:grouped] %>
-			<%= link_to_confirmation_window(
-				"",
-				t("confirm_to_delete_image"),
-				alchemy.admin_essence_picture_path(
-					:id => content,
-					:options => options
-				),
-				{
-					:title => t("delete_image"),
-					:class => "picture_delete"
-				}
-			) -%>
-			<% else %>
-			<%= link_to(
-				'',
-				'#',
-				:onclick => "Alchemy.removePicture('##{content.form_field_id(:picture_id)}');"
-			) %>
-			<% end %>
-		</span>
-		<%- if content.ingredient -%>
-		<div class="picture_handle" title="<%= t('drag_to_sort') if options[:dragable] %>"></div>
-		<div class="picture_content_spinner">
-			<%= image_tag("alchemy/image_loader.gif", :alt => '') %>
-		</div>
-		<%- end -%>
-		<div class="picture_image">
-			<div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">
-				<%- if content.ingredient -%>
-				<%= image_tag(
-					alchemy.thumbnail_path(
-						:id => content.ingredient.id,
-						:size => content.ingredient.cropped_thumbnail_size(content.essence.render_size.blank? ? options[:image_size] : content.essence.render_size),
-						:crop_from => content.essence.crop_from.blank? ? nil : content.essence.crop_from,
-						:crop_size => content.essence.crop_size.blank? ? nil : content.essence.crop_size,
-						:crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil,
-						:name => content.ingredient.urlname
-					),
-					:alt => content.ingredient.name,
-					:class => 'img_paddingtop',
-					:title => t("image_name") + ": #{content.ingredient.name}",
-					:onload => "Alchemy.fadeImage(this, '##{content_dom_id(content)} .picture_content_spinner');",
-					:style => "display: none;"
-				) %>
-				<%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
-				<% end %>
-			</div>
-		</div>
-		<%- unless options[:css_class].blank? || content.essence.css_class.blank? -%>
-		<div class="essence_picture_css_class">
-			<%= t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}", :default => content.essence.css_class.camelcase) %>
-		</div>
-		<%- end -%>
-		<div class="edit_images_bottom">
-			<%= render(
-				:partial => 'alchemy/essences/essence_picture_tools',
-				:locals => {
-					:content => content,
-					:options => options
-				}
-			) %>
-		</div>
-	</div>
-	<%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
-	<%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
-	<%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
-	<%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
+  <% unless options[:grouped] %>
+  <label><%= render_content_name(content) %></label>
+  <% end %>
+  <div class="picture_thumbnail">
+    <span class="picture_tool_delete">
+      <% if options[:grouped] %>
+      <%= link_to_confirmation_window(
+        "",
+        t("confirm_to_delete_image"),
+        alchemy.admin_essence_picture_path(
+          :id => content,
+          :options => options
+        ),
+        {
+          :title => t("delete_image"),
+          :class => "picture_delete"
+        }
+      ) -%>
+      <% else %>
+      <%= link_to(
+        '',
+        '#',
+        :onclick => "Alchemy.removePicture('##{content.form_field_id(:picture_id)}');"
+      ) %>
+      <% end %>
+    </span>
+    <%- if content.ingredient -%>
+    <div class="picture_handle" title="<%= t('drag_to_sort') if options[:dragable] %>"></div>
+    <div class="picture_content_spinner">
+      <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
+    </div>
+    <%- end -%>
+    <div class="picture_image">
+      <div class="thumbnail_background<%= ' missing' if content.ingredient.nil? %>">
+        <%- if content.ingredient -%>
+        <%= image_tag(
+          alchemy.thumbnail_path(
+            :id => content.ingredient.id,
+            :size => content.ingredient.cropped_thumbnail_size(content.essence.render_size.blank? ? options[:image_size] : content.essence.render_size),
+            :crop_from => content.essence.crop_from.blank? ? nil : content.essence.crop_from,
+            :crop_size => content.essence.crop_size.blank? ? nil : content.essence.crop_size,
+            :crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil,
+            :name => content.ingredient.urlname
+          ),
+          :alt => content.ingredient.name,
+          :class => 'img_paddingtop',
+          :title => t("image_name") + ": #{content.ingredient.name}",
+          :onload => "Alchemy.fadeImage(this, '##{content_dom_id(content)} .picture_content_spinner');",
+          :style => "display: none;"
+        ) %>
+        <%= hidden_field_tag content.form_field_name(:picture_id), content.ingredient.id %>
+        <% end %>
+      </div>
+    </div>
+    <%- unless options[:css_class].blank? || content.essence.css_class.blank? -%>
+    <div class="essence_picture_css_class">
+      <%= t("alchemy.essence_pictures.css_classes.#{content.essence.css_class}", :default => content.essence.css_class.camelcase) %>
+    </div>
+    <%- end -%>
+    <div class="edit_images_bottom">
+      <%= render(
+        :partial => 'alchemy/essences/essence_picture_tools',
+        :locals => {
+          :content => content,
+          :options => options
+        }
+      ) %>
+    </div>
+  </div>
+  <%= hidden_field_tag content.form_field_name(:link), content.essence.link %>
+  <%= hidden_field_tag content.form_field_name(:link_title), content.essence.link_title %>
+  <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
+  <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
 </div>

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

@@ -1,39 +1,39 @@
 <%- unless content.essence.picture.nil? -%>
-	<%- img_tag = image_tag(
-		alchemy.show_picture_url(
-			:id => content.essence.picture.id,
-			:name => content.essence.picture.urlname,
-			:size => options[:image_size],
-			:crop => options[:crop] ? 'crop' : nil,
-			:crop_from => options[:crop] && !content.essence.crop_from.blank? ? content.essence.crop_from : nil,
-			:crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil,
-			:upsample  => options[:upsample],
-			:padding => options[:padding],
-			:format => options[:format],
-			:effects => options[:effects].blank? ? nil : options[:effects]
-		),
-		{
-			:alt => (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
-			:title => (content.essence.title.blank? ? nil : content.essence.title),
-			:class => (content.essence.css_class.blank? ? nil : content.essence.css_class)
-		}.merge(html_options)
-	) -%>
+  <%- img_tag = image_tag(
+    alchemy.show_picture_url(
+      :id => content.essence.picture.id,
+      :name => content.essence.picture.urlname,
+      :size => options[:image_size],
+      :crop => options[:crop] ? 'crop' : nil,
+      :crop_from => options[:crop] && !content.essence.crop_from.blank? ? content.essence.crop_from : nil,
+      :crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil,
+      :upsample  => options[:upsample],
+      :padding => options[:padding],
+      :format => (options[:format] or 'png'),
+      :effects => options[:effects].blank? ? nil : options[:effects]
+    ),
+    {
+      :alt => (content.essence.alt_tag.blank? ? nil : content.essence.alt_tag),
+      :title => (content.essence.title.blank? ? nil : content.essence.title),
+      :class => (content.essence.css_class.blank? ? nil : content.essence.css_class)
+    }.merge(html_options)
+  ) -%>
 
-	<%- caption = (content_tag("div", content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") unless (options[:show_caption] == false)) -%>
+  <%- caption = (content_tag("div", content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") unless (options[:show_caption] == false)) -%>
 
-	<%- if content.essence.link.blank? || options[:disable_link] -%>
-		<%= img_tag %>
-		<%- unless content.essence.caption.blank? -%>
-			<%= caption %>
-		<%- end -%>
-	<%- else -%>
-		<%= link_to(
-			content.essence.caption.blank? || options[:show_caption] == false ? img_tag : img_tag + caption,
-			url_for(content.essence.link),
-			:title => content.essence.link_title,
-			:target => (content.essence.link_target == "blank" ? "_blank" : nil),
-			'data-link-target' => content.essence.link_target
-		) %>
-	<%- end -%>
+  <%- if content.essence.link.blank? || options[:disable_link] -%>
+    <%= img_tag %>
+    <%- unless content.essence.caption.blank? -%>
+      <%= caption %>
+    <%- end -%>
+  <%- else -%>
+    <%= link_to(
+      content.essence.caption.blank? || options[:show_caption] == false ? img_tag : img_tag + caption,
+      url_for(content.essence.link),
+      :title => content.essence.link_title,
+      :target => (content.essence.link_target == "blank" ? "_blank" : nil),
+      'data-link-target' => content.essence.link_target
+    ) %>
+  <%- end -%>
 
 <%- end -%>