alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,47 +1,47 @@
 <tr class="<%= cycle('even', 'odd') %>">
-	<td>
-		<%= language.name %>
-	</td>
-	<td>
-		<%= language.language_code %>
-	</td>
-	<td>
-		<%= language.country_code %>
-	</td>
-	<td>
-		<%= language.frontpage_name %>
-	</td>
-	<td>
-		<%= language.page_layout %>
-	</td>
-	<td class="center">
-		<%= language.public? ? render_icon('true') : '' %>
-	</td>
-	<td class="center">
-		<%= language.default? ? render_icon('true') : '' %>
-	</td>
-	<td class="tools">
-		<%- permitted_to?(:destroy, :alchemy_admin_languages) do -%>
-		<%= link_to_confirmation_window(
-			'',
-			t("Are you sure?"),
-			alchemy.admin_language_path(language),
-			:title => t("Delete"),
-			:class => "icon destroy"
-		) -%>
-		<%- end -%>
-		<%- permitted_to?(:edit, :alchemy_admin_languages) do -%>
-		<%= link_to_overlay_window(
-			'',
-			alchemy.edit_admin_language_path(language),
-			{
-				:title => t("Edit")
-			},
-			{
-				:class => "icon edit",
-				:title => t("Edit")
-			}
-		) -%>
-		<%- end -%>
-	</td>
+  <td>
+    <%= language.name %>
+  </td>
+  <td>
+    <%= language.language_code %>
+  </td>
+  <td>
+    <%= language.country_code %>
+  </td>
+  <td>
+    <%= language.frontpage_name %>
+  </td>
+  <td>
+    <%= language.page_layout %>
+  </td>
+  <td class="center">
+    <%= language.public? ? render_icon('true') : '' %>
+  </td>
+  <td class="center">
+    <%= language.default? ? render_icon('true') : '' %>
+  </td>
+  <td class="tools">
+    <%- permitted_to?(:destroy, :alchemy_admin_languages) do -%>
+    <%= link_to_confirmation_window(
+      '',
+      t("Are you sure?"),
+      alchemy.admin_language_path(language),
+      :title => t("Delete"),
+      :class => "icon destroy"
+    ) -%>
+    <%- end -%>
+    <%- permitted_to?(:edit, :alchemy_admin_languages) do -%>
+    <%= link_to_overlay_window(
+      '',
+      alchemy.edit_admin_language_path(language),
+      {
+        :title => t("Edit")
+      },
+      {
+        :class => "icon edit",
+        :title => t("Edit")
+      }
+    ) -%>
+    <%- end -%>
+  </td>
 </tr>

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

@@ -1,30 +1,30 @@
 <%- if @languages.any? -%>
 <table class="list" id="languages_list">
-	<tr>
-		<th>
-			<%= Alchemy::Language.human_attribute_name(:name) %>
-		</th>
-		<th>
-			<%= Alchemy::Language.human_attribute_name(:language_code) %>
-		</th>
-		<th>
-			<%= Alchemy::Language.human_attribute_name(:country_code) %>
-		</th>
-		<th>
-			<%= Alchemy::Language.human_attribute_name(:frontpage_name) %>
-		</th>
-		<th>
-			<%= Alchemy::Language.human_attribute_name(:page_layout) %>
-		</th>
-		<th class="center">
-			<%= Alchemy::Language.human_attribute_name(:public) %>
-		</th>
-		<th class="center">
-			<%= Alchemy::Language.human_attribute_name(:default) %>
-		</th>
-		<th class="tools"></th>
-	</tr>
-	<%= render_resources %>
+  <tr>
+    <th>
+      <%= Alchemy::Language.human_attribute_name(:name) %>
+    </th>
+    <th>
+      <%= Alchemy::Language.human_attribute_name(:language_code) %>
+    </th>
+    <th>
+      <%= Alchemy::Language.human_attribute_name(:country_code) %>
+    </th>
+    <th>
+      <%= Alchemy::Language.human_attribute_name(:frontpage_name) %>
+    </th>
+    <th>
+      <%= Alchemy::Language.human_attribute_name(:page_layout) %>
+    </th>
+    <th class="center">
+      <%= Alchemy::Language.human_attribute_name(:public) %>
+    </th>
+    <th class="center">
+      <%= Alchemy::Language.human_attribute_name(:default) %>
+    </th>
+    <th class="tools"></th>
+  </tr>
+  <%= render_resources %>
 </table>
 <%- elsif params[:query] -%>
 <p><%= t('Nothing found') %></p>

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

@@ -3,16 +3,16 @@
 <label><%= t('Active Pages') %> &raquo;</label>
 <%- @locked_pages.each do |page| -%>
 <div class="subnavi_tab wide" id="locked_page_<%= page.id %>">
-	<%= link_to alchemy.edit_admin_page_path(page) do %>
-	<span class="page_name" title="<%= page.name %>">
-		<%= truncate page.name, :length => 15 %>
-	</span>
-	<% end %>
-	<%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
-		<button class="icon_button small" title="<%= t('explain_unlocking') %>">
-			<%= render_icon('close small') %>
-		</button>
-	<% end %>
+  <%= link_to alchemy.edit_admin_page_path(page) do %>
+  <span class="page_name" title="<%= page.name %>">
+    <%= truncate page.name, :length => 15 %>
+  </span>
+  <% end %>
+  <%= form_tag(alchemy.unlock_admin_page_path(page), :remote => true) do %>
+    <button class="icon_button small" title="<%= t('explain_unlocking') %>">
+      <%= render_icon('close small') %>
+    </button>
+  <% end %>
 </div>
 <%- end -%>
 <%- end -%>
@@ -20,33 +20,33 @@
 
 <%- content_for :toolbar do -%>
 <div id="toolbar_buttons">
-	<%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
-	<%= toolbar_button(
-		:icon => 'add_page',
-		:url => alchemy.new_admin_page_path(:parent_id => @layout_root.id, :layoutpage => true),
-		:overlay_options => {
-			:title => t('Add global page'),
-			:size => '405x150',
-			:overflow => true
-		},
-		:title => t('Add global page'),
-		:label => t('Add global page'),
-		:if_permitted_to => [:new, :alchemy_admin_pages]
-	) %>
-	<%= toolbar_button(
-		:icon => "clipboard#{clipboard_empty?('pages') ? '' : ' full'}",
-		:url => alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
-		:overlay_options => {
-			:title => t('Clipboard'),
-			:size => '380x270'
-		},
-		:title => t('Show clipboard'),
-		:id => "clipboard_button",
-		:label => t('Show clipboard')
-	) %>
+  <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
+  <%= toolbar_button(
+    :icon => 'add_page',
+    :url => alchemy.new_admin_page_path(:parent_id => @layout_root.id, :layoutpage => true),
+    :overlay_options => {
+      :title => t('Add global page'),
+      :size => '405x150',
+      :overflow => true
+    },
+    :title => t('Add global page'),
+    :label => t('Add global page'),
+    :if_permitted_to => [:new, :alchemy_admin_pages]
+  ) %>
+  <%= toolbar_button(
+    :icon => "clipboard#{clipboard_empty?('pages') ? '' : ' full'}",
+    :url => alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
+    :overlay_options => {
+      :title => t('Clipboard'),
+      :size => '380x270'
+    },
+    :title => t('Show clipboard'),
+    :id => "clipboard_button",
+    :label => t('Show clipboard')
+  ) %>
 </div>
 <%- end -%>
 
 <ul class="list" id="layoutpages">
-	<%= render :partial => "layoutpage", :collection => @layout_root.children %>
+  <%= render :partial => "layoutpage", :collection => @layout_root.children %>
 </ul>

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

@@ -1,51 +1,51 @@
 <div id="create_language_tree_form" style="display: none">
-	<div class="info">
-		<%= render_icon('info') %>
-		<%= t("language_does_not_exist") %>
-	</div>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= t("language_does_not_exist") %>
+  </div>
 <%- if @language -%>
 
-	<%- if @languages_with_page_tree.size >= 1 -%>
-		<%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
-			<h2><%= t('copy_language_tree_heading') %></h2>
-			<p><%= t("want_to_make_copy_of_existing_language") %></p>
-			<table>
-				<tr>
-					<td class="label"><%= label_tag('languages[old_lang_id]', t('Language tree')) %></td>
-					<td class="select">
-						<%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "alchemy_selectbox medium_long") %>
-						<%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
-					</td>
-				</tr>
-				<tr>
-					<td class="submit" colspan="2">
-						<%= hidden_field_tag("layoutpage", params[:action] == "layoutpages") if params[:action] == "layoutpages" %>
-						<%= submit_tag t("copy"), :class => 'button' %>
-					</td>
-				</tr>
-			</table>
-		<% end %>
-	<%- end -%>
-
-	<%- if params[:action] == "index" -%>
-	
-	<%= form_for([:admin, Alchemy::Page.new], :remote => true) do |form| %>
-		<h2><%= t('create_language_tree_heading') %></h2>
-		<p><%= t("want_to_create_new_language") %></p>
-		<%= form.hidden_field :name, :value => @language.frontpage_name %>
-		<%= form.hidden_field :language_id, :value => @language.id %>
-		<%= form.hidden_field :language_code, :value => @language.code %>
-		<%= form.hidden_field :page_layout, :value => @language.page_layout %>
-		<%= form.hidden_field :language_root, :value => true %>
-		<%= form.hidden_field :parent_id, :value => Alchemy::Page.rootpage.id %>
-		<%= form.button t("create_tree_as_new_language", :language => @language.name), :class => 'button' %>
-	<% end %>
-
-	<%- end -%>
+  <%- if @languages_with_page_tree.size >= 1 -%>
+    <%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
+      <h2><%= t('copy_language_tree_heading') %></h2>
+      <p><%= t("want_to_make_copy_of_existing_language") %></p>
+      <table>
+        <tr>
+          <td class="label"><%= label_tag('languages[old_lang_id]', t('Language tree')) %></td>
+          <td class="select">
+            <%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "alchemy_selectbox medium_long") %>
+            <%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
+          </td>
+        </tr>
+        <tr>
+          <td class="submit" colspan="2">
+            <%= hidden_field_tag("layoutpage", params[:action] == "layoutpages") if params[:action] == "layoutpages" %>
+            <%= submit_tag t("copy"), :class => 'button' %>
+          </td>
+        </tr>
+      </table>
+    <% end %>
+  <%- end -%>
+
+  <%- if params[:action] == "index" -%>
+
+  <%= form_for([:admin, Alchemy::Page.new], :remote => true) do |form| %>
+    <h2><%= t('create_language_tree_heading') %></h2>
+    <p><%= t("want_to_create_new_language") %></p>
+    <%= form.hidden_field :name, :value => @language.frontpage_name %>
+    <%= form.hidden_field :language_id, :value => @language.id %>
+    <%= form.hidden_field :language_code, :value => @language.code %>
+    <%= form.hidden_field :page_layout, :value => @language.page_layout %>
+    <%= form.hidden_field :language_root, :value => true %>
+    <%= form.hidden_field :parent_id, :value => Alchemy::Page.rootpage.id %>
+    <%= form.button t("create_tree_as_new_language", :language => @language.name), :class => 'button' %>
+  <% end %>
+
+  <%- end -%>
 
 <%- else -%>
 
-	<p><%= t("Actually this language does not exist. Please create this language first.") %></p>
+  <p><%= t("Actually this language does not exist. Please create this language first.") %></p>
 
 <%- end -%>
 

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

@@ -5,7 +5,7 @@
   <table class="window_form">
     <tr>
       <td class="label long">
-				<%= label_tag 'external_url', 'URL', :for => 'external_url' %>
+        <%= label_tag 'external_url', 'URL', :for => 'external_url' %>
       </td>
       <td class="input">
         <%= text_field_tag 'external_url', '', :class => "thin_border auto_resize" %>

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

@@ -1,29 +1,29 @@
 <%= form_for([:admin, @page], :remote => true, :html => {:id => 'new_page_form'}) do |f| %>
-	<%= f.hidden_field(:parent_id) %>
-	<%= f.hidden_field(:layoutpage) %>
-	<div id="errors" style="display:none"></div>
-	<table id="new_page_form">
-		<tr>
-			<td class="label">
-				<%= f.label :page_layout %>
-			</td>
-			<td class="select">
-				<%= f.select('page_layout', @page_layouts, {}, { :class => 'alchemy_selectbox' }) %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :name %>
-			</td>
-			<td class="input">
-				<%= f.text_field(:name, :class => "thin_border") %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">&nbsp;</td>
-			<td class="submit">
-				<%= f.button t("create"), :class => 'button', :name => nil %>
-			</td>
-		</tr>
-	</table>
+  <%= f.hidden_field(:parent_id) %>
+  <%= f.hidden_field(:layoutpage) %>
+  <div id="errors" style="display:none"></div>
+  <table id="new_page_form">
+    <tr>
+      <td class="label">
+        <%= f.label :page_layout %>
+      </td>
+      <td class="select">
+        <%= f.select('page_layout', @page_layouts, {}, { :class => 'alchemy_selectbox' }) %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :name %>
+      </td>
+      <td class="input">
+        <%= f.text_field(:name, :class => "thin_border") %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">&nbsp;</td>
+      <td class="submit">
+        <%= f.button t("create"), :class => 'button', :name => nil %>
+      </td>
+    </tr>
+  </table>
 <% end %>

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

@@ -1,114 +1,114 @@
 <li id="page_<%= page.id %>" class="page_level_<%= page.level %>">
-	<div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
-		<div class="sitemap_left_images">
-			<%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
-			<span class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %> tooltip"></span>
-			<div class="tooltip_content" style="display: none;">
-				<h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
-				<p>
-					<%= page.humanized_status %>
-				</p>
-				<p>
-					<strong><%= t("created_at") %>:</strong>
-					<%= l(page.created_at) %> von <%= page.creator %>
-				</p>
-				<p>
-					<strong><%= t("updated_at") %>:</strong>
-					<%= l(page.updated_at) %> durch <%= page.updater %>
-				</p>
-				<%- if page.locked? -%>
-				<p>
-					<%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= page.current_editor %></span>
-				</p>
-				<%- end -%>
-			</div>
-		</div>
-		<div class="sitemap_right_tools">
-			<%- unless @sorting -%>
-			<%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
-			<%= link_to_overlay_window(
-				render_icon('configure_page'),
-				alchemy.configure_admin_page_path(page),
-				{
-					:title => t('edit_page_properties'),
-					:size => page.redirects_to_external? ? '410x270' : '410x620'
-				},
-				:class => '',
-				:title => t('edit_page_properties')
-			) -%>
-			<%- end -%>
-			<%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
-			<span class="sitemap_sitetools">
-				<%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
-				<%= link_to(
-					render_icon("copy_page"),
-					alchemy.insert_admin_clipboard_path(
-						:remarkable_type => page.class.name.demodulize.underscore,
-						:remarkable_id => page.id
-					),
-					:remote => true,
-					:method => :post,
-					:class => "",
-					:title => t("copy_page")
-				) %>
-				<%- end -%>
-				<%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
-				<%= link_to_confirmation_window(
-					render_icon('delete_page'),
-					t("confirm_to_delete_page"),
-					url_for(
-						:controller => 'pages',
-						:action => 'destroy',
-						:id => page.id
-					),
-					{
-						:class => "",
-						:title => t("delete_page")
-					}
-				) -%>
-				<%- end -%>
-				<%- permitted_to?(:new, :alchemy_admin_pages) do -%>
-				<%= link_to_overlay_window(
-					render_icon('add_page'),
-					alchemy.new_admin_page_path(:parent_id => page.id),
-					{
-						:title => t('create_page'),
-						:size => '340x150',
-						:overflow => true
-					},
-					:class => '',
-					:title => t('create_page')
-				) -%>
-				<%- end -%>
-			</span>
-			<%- end -%>
-			<%- end -%>
-		</div>
-		<div class="page_infos" id="page_<%= page.id %>_infos">
-			<%= render :partial => 'page_infos', :locals => {:page => page} %>
-		</div>
-		<div class="sitemap_sitename">
-		<%- if page.redirects_to_external? -%>
-			<span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
-			<span class="redirect_url" title="<%= h page.urlname %>">
-				&raquo; <%= t('Redirects to') %>:
-				<%= h page.urlname %>
-			</span>
-		<%- else -%>
-			<%- cycle_class = cycle('even', 'odd') -%>
-			<%= link_to_unless(
-				@sorting,
-				page.name,
-				alchemy.edit_admin_page_path(page),
-				:title => t("edit_page"),
-				:class => "sitemap_pagename_link #{cycle_class}"
-			) { content_tag('span', page.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
-		<%- end -%>
-		</div>
-	</div>
-	<%- if @sorting || (!page.folded?(current_user) && !page.children.empty?) -%>
-	<ul id="page_<%= page.id %>_children" class="level_<%= page.level %>_children">
-		<%= render :partial => 'page', :collection => page.children %>
-	</ul>
-	<%- end -%>
+  <div class="sitemap_page<%= page.locked ? ' locked' : '' %>">
+    <div class="sitemap_left_images">
+      <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
+      <span class="site_status <%= @sorting && page.level > 1 ? 'handle' : nil %> tooltip"></span>
+      <div class="tooltip_content" style="display: none;">
+        <h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
+        <p>
+          <%= page.humanized_status %>
+        </p>
+        <p>
+          <strong><%= t("created_at") %>:</strong>
+          <%= l(page.created_at) %> von <%= page.creator %>
+        </p>
+        <p>
+          <strong><%= t("updated_at") %>:</strong>
+          <%= l(page.updated_at) %> durch <%= page.updater %>
+        </p>
+        <%- if page.locked? -%>
+        <p>
+          <%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= page.current_editor %></span>
+        </p>
+        <%- end -%>
+      </div>
+    </div>
+    <div class="sitemap_right_tools">
+      <%- unless @sorting -%>
+      <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
+      <%= link_to_overlay_window(
+        render_icon('configure_page'),
+        alchemy.configure_admin_page_path(page),
+        {
+          :title => t('edit_page_properties'),
+          :size => page.redirects_to_external? ? '410x270' : '410x620'
+        },
+        :class => '',
+        :title => t('edit_page_properties')
+      ) -%>
+      <%- end -%>
+      <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
+      <span class="sitemap_sitetools">
+        <%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
+        <%= link_to(
+          render_icon("copy_page"),
+          alchemy.insert_admin_clipboard_path(
+            :remarkable_type => page.class.name.demodulize.underscore,
+            :remarkable_id => page.id
+          ),
+          :remote => true,
+          :method => :post,
+          :class => "",
+          :title => t("copy_page")
+        ) %>
+        <%- end -%>
+        <%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
+        <%= link_to_confirmation_window(
+          render_icon('delete_page'),
+          t("confirm_to_delete_page"),
+          url_for(
+            :controller => 'pages',
+            :action => 'destroy',
+            :id => page.id
+          ),
+          {
+            :class => "",
+            :title => t("delete_page")
+          }
+        ) -%>
+        <%- end -%>
+        <%- permitted_to?(:new, :alchemy_admin_pages) do -%>
+        <%= link_to_overlay_window(
+          render_icon('add_page'),
+          alchemy.new_admin_page_path(:parent_id => page.id),
+          {
+            :title => t('create_page'),
+            :size => '340x150',
+            :overflow => true
+          },
+          :class => '',
+          :title => t('create_page')
+        ) -%>
+        <%- end -%>
+      </span>
+      <%- end -%>
+      <%- end -%>
+    </div>
+    <div class="page_infos" id="page_<%= page.id %>_infos">
+      <%= render :partial => 'page_infos', :locals => {:page => page} %>
+    </div>
+    <div class="sitemap_sitename">
+    <%- if page.redirects_to_external? -%>
+      <span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
+      <span class="redirect_url">
+        &raquo; <%= t('Redirects to') %>:
+        <%= h page.urlname %>
+      </span>
+    <%- else -%>
+      <%- cycle_class = cycle('even', 'odd') -%>
+      <%= link_to_unless(
+        @sorting,
+        page.name,
+        alchemy.edit_admin_page_path(page),
+        :title => t("edit_page"),
+        :class => "sitemap_pagename_link #{cycle_class}"
+      ) { content_tag('span', page.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
+    <%- end -%>
+    </div>
+  </div>
+  <%- if @sorting || (!page.folded?(current_user) && !page.children.empty?) -%>
+  <ul id="page_<%= page.id %>_children" class="level_<%= page.level %>_children">
+    <%= render :partial => 'page', :collection => page.children %>
+  </ul>
+  <%- end -%>
 </li>