alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,47 +1,47 @@
 (function($) {
-	<% if params[:was_missing] -%>
+  <% if params[:was_missing] -%>
 
-	$("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
-		render(
-			:partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-			:locals => @locals
-		)
-	) -%>');
+  $("#element_<%= @element.id -%>_content_missing").replaceWith('<%= escape_javascript(
+    render(
+      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+      :locals => @locals
+    )
+  ) -%>');
 
-	<% else -%>
+  <% else -%>
 
-	$("<%= @element_dom_id -%>").before('<%= escape_javascript(
-		render(
-			:partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-			:locals => @locals
-		)
-	) -%>');
+  $("<%= @element_dom_id -%>").before('<%= escape_javascript(
+    render(
+      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
+      :locals => @locals
+    )
+  ) -%>');
 
-	<% end -%>
+  <% end -%>
 
-	<% case @content.essence_type -%>
-	<% when "Alchemy::EssencePicture" -%>
+  <% case @content.essence_type -%>
+  <% when "Alchemy::EssencePicture" -%>
 
-	<% if @contents_of_this_type.length > 1 -%>
-	$('#element_<%= @element.id -%>_contents .essence_picture_editor').addClass('dragable_picture');
-	<% end -%>
-	<% if !max_image_count.blank? && (@contents_of_this_type.length >= max_image_count) -%>
-	$("#add_content_<%= @element.id -%>").remove();
-	<% end -%>
-	Alchemy.SortableContents('#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>');
+  <% if @contents_of_this_type.length > 1 -%>
+  $('#element_<%= @element.id -%>_contents .essence_picture_editor').addClass('dragable_picture');
+  <% end -%>
+  <% if !max_image_count.blank? && (@contents_of_this_type.length >= max_image_count) -%>
+  $("#add_content_<%= @element.id -%>").remove();
+  <% end -%>
+  Alchemy.SortableContents('#element_<%= @element.id -%>_contents', '<%= form_authenticity_token -%>');
 
-	<% when "Alchemy::EssenceDate" -%>
+  <% when "Alchemy::EssenceDate" -%>
 
-	Alchemy.Datepicker('#element_<%= @element.id -%> input.date');
+  Alchemy.Datepicker('#element_<%= @element.id -%> input.date');
 
-	<% when "Alchemy::EssenceRichtext" -%>
+  <% when "Alchemy::EssenceRichtext" -%>
 
-	Alchemy.Tinymce.addEditor('contents_content_<%= @content.id -%>_body');
+  Alchemy.Tinymce.addEditor('contents_content_<%= @content.id -%>_body');
 
-	<% end -%>
+  <% end -%>
 
-	Alchemy.reloadPreview();
-	Alchemy.closeCurrentWindow();
-	Alchemy.SelectBox("#element_<%= @element.id %> select.alchemy_selectbox");
-	Alchemy.growl('<%= t("Successfully added content", :content => @content.name) -%>');
+  Alchemy.reloadPreview();
+  Alchemy.closeCurrentWindow();
+  Alchemy.SelectBox("#element_<%= @element.id %> select.alchemy_selectbox");
+  Alchemy.growl('<%= t("Successfully added content", :content => @content.name) -%>');
 })(jQuery);

data/app/views/alchemy/admin/contents/destroy.js.erb

@@ -1,7 +1,7 @@
 (function($) {
-	
-	$('#<%= content_dom_id(@content_dup) %>').remove();
-	Alchemy.growl('<%= escape_javascript(@notice) %>');
-	Alchemy.reloadPreview();
-	
+
+  $('#<%= content_dom_id(@content_dup) %>').remove();
+  Alchemy.growl('<%= escape_javascript(@notice) %>');
+  Alchemy.reloadPreview();
+
 })(jQuery);

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

@@ -1,15 +1,15 @@
 <%= form_for [:admin, @content], :remote => true do |f| %>
-	<%= f.error_messages %>
-	<%= f.hidden_field :element_id %>
-	<table>
-		<tr>
-			<td>
-				<%= f.select 'name', @contents.map { |a| [t("content_names.#{a['name']}"), a['name']] }, {}, {:class => 'alchemy_selectbox'} %>
-				<%= hidden_field_tag('options', @options) %>
-			</td>
-			<td class="submit">
-				<%= f.button t('save'), :class => 'button' %>
-			</td>
-		</tr>
-	</table>
+  <%= f.error_messages %>
+  <%= f.hidden_field :element_id %>
+  <table>
+    <tr>
+      <td>
+        <%= f.select 'name', @contents.map { |a| [t("content_names.#{a['name']}"), a['name']] }, {}, {:class => 'alchemy_selectbox'} %>
+        <%= hidden_field_tag('options', @options) %>
+      </td>
+      <td class="submit">
+        <%= f.button t('save'), :class => 'button' %>
+      </td>
+    </tr>
+  </table>
 <% end %>

data/app/views/alchemy/admin/contents/order.js.erb

@@ -1,6 +1,6 @@
 Alchemy.growl('<%= escape_javascript(@notice) %>');
 Alchemy.SortableContents(
-	'#element_area .picture_gallery_images',
-	'<%= form_authenticity_token %>'
+  '#element_area .picture_gallery_images',
+  '<%= form_authenticity_token %>'
 );
 Alchemy.reloadPreview();

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

@@ -1,101 +1,105 @@
 <div id="dashboard">
-	<div class="with_padding">
-		<h1>
-			<%= t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
-		</h1>
-		<p>
-			<small><%= t('Your last login was on %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></small>
-		</p>
-	</div>
-	<div class="widget">
-		<h2><%= t('Your last updated pages') %>:</h2>
-		<%- if @last_edited_pages.blank? -%>
-		<ul><li class="even"><%= t('no pages') %></li></ul>
-		<%- 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? -%>
-		<ul><li class="even"><%= t('no pages') %></li></ul>
-		<%- 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 => alchemy.admin_dashboard_url)) 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? -%>
-		<ul><li class="even"><%= t('no users') %></li></ul>
-		<%- else -%>
-		<ul>
-			<%- @online_users.each do |user| -%>
-			<li class="<%= cycle('even', 'odd') %>"><%= user.name %> <small>(<%= user.human_role_name %>)</small></li>
-			<%- end -%>
-		</ul>
-		<%- end -%>
-	</div>
+  <div class="with_padding">
+    <h1>
+      <% if @first_time -%>
+      <%= t('Welcome, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+      <% else -%>
+      <%= t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+      <% end -%>
+    </h1>
+    <p>
+      <small><%= t('Your last login was on %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></small>
+    </p>
+  </div>
+  <div class="widget">
+    <h2><%= t('Your last updated pages') %>:</h2>
+    <%- if @last_edited_pages.blank? -%>
+    <ul><li class="even"><%= t('no pages') %></li></ul>
+    <%- 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? -%>
+    <ul><li class="even"><%= t('no pages') %></li></ul>
+    <%- 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 => alchemy.admin_dashboard_url)) 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? -%>
+    <ul><li class="even"><%= t('no users') %></li></ul>
+    <%- else -%>
+    <ul>
+      <%- @online_users.each do |user| -%>
+      <li class="<%= cycle('even', 'odd') %>"><%= user.name %> <small>(<%= user.human_role_name %>)</small></li>
+      <%- end -%>
+    </ul>
+    <%- end -%>
+  </div>
 </div>
 <div id="sideboard">
-	<%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
-	<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>
+  <%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
+  <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);
+  (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/alchemy/admin/elements/_add_content.html.erb

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

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

@@ -5,9 +5,9 @@
       [:admin, element],
       :remote => true,
       :html => {
-				:onsubmit => "Alchemy.saveElement(this)",
-      	:id => "element_#{element.id}_form"
-			}
+        :onsubmit => "Alchemy.saveElement(this)",
+        :id => "element_#{element.id}_form"
+      }
     ) do %>
       <div id="element_<%= element.id %>_errors" class="element_errors" style="display: none"></div>
       <div id="element_<%= element.id %>_content" class="element_content">

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

@@ -1,33 +1,33 @@
 <div class="new_alchemy_element">
 <%- if @elements.blank? -%>
-	<div class="info with_margin">
-		<%= render_icon('info') %>
-		<%= t('no_more_elements_to_add') %>
-	</div>
+  <div class="info with_margin">
+    <%= render_icon('info') %>
+    <%= t('no_more_elements_to_add') %>
+  </div>
 <%- 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 => "alchemy_selectbox" }
-					) -%>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" class="submit">
-					<%= form.hidden_field 'page_id' %>
-					<%= form.button t('add'), :class => 'button' %>
-				</td>
-			</tr>
-		</table>
-	<% end %>
+  <%= 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 => "alchemy_selectbox" }
+          ) -%>
+        </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/alchemy/admin/elements/_picture_editor.html.erb

@@ -1,28 +1,28 @@
 <%- max_image_count = options[:maximum_amount_of_images] || options[:max_images] -%>
 <div class="content_editor">
-	<label><%= t("picture_gallery_editor.#{element.name}", :default => t('picture_gallery_editor')) %></label>
-	<div class="picture_gallery_images" id="element_<%= element.id %>_contents">
-		<%- picture_contents.each do |picture_content| -%>
-			<%= render_essence_editor(picture_content, {
-				:dragable => (picture_contents.size > 1)
-			}.merge(options)) %>
-		<%- end -%>
-		<%- if max_image_count.blank? || picture_contents.length < max_image_count.to_i -%>
-			<%= render(
-				:partial => 'alchemy/admin/elements/add_content',
-				:locals => {
-					:element => element,
-					:essence_type => "Alchemy::EssencePicture",
-					:link_text => t("add_image_to_element"),
-					:options => options,
-					:dragable => (picture_contents.size > 1)
-				}
-			) %>
-		<%- end -%>
-	</div>
+  <label><%= t("picture_gallery_editor.#{element.name}", :default => t('picture_gallery_editor')) %></label>
+  <div class="picture_gallery_images" id="element_<%= element.id %>_contents">
+    <%- picture_contents.each do |picture_content| -%>
+      <%= render_essence_editor(picture_content, {
+        :dragable => (picture_contents.size > 1)
+      }.merge(options)) %>
+    <%- end -%>
+    <%- if max_image_count.blank? || picture_contents.length < max_image_count.to_i -%>
+      <%= render(
+        :partial => 'alchemy/admin/elements/add_content',
+        :locals => {
+          :element => element,
+          :essence_type => "Alchemy::EssencePicture",
+          :link_text => t("add_image_to_element"),
+          :options => options,
+          :dragable => (picture_contents.size > 1)
+        }
+      ) %>
+    <%- end -%>
+  </div>
 </div>
 <%- if picture_contents.size > 1 -%>
 <script type="text/javascript" charset="utf-8">
-	Alchemy.SortableContents('#element_<%= element.id %>_contents', '<%= form_authenticity_token %>');
+  Alchemy.SortableContents('#element_<%= element.id %>_contents', '<%= form_authenticity_token %>');
 </script>
 <%- end -%>