alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,23 +1,23 @@
 <%- if resources_instance_variable.any? -%>
-<table class="list" id="<%= resources_name %>_list">
-	<tr>
-		<%- resource_attributes.each do |attribute| -%>
-		<%- if attribute[:type] == :boolean -%>
-		<th class="center">
-		<%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
-		<th class="right">
-		<%- else -%>
-		<th>
-		<%- end -%>
-			<%= resource_model.human_attribute_name(attribute[:name]) %>
-		</th>
-		<%- end -%>
-		<th class="tools"></th>
-	</tr>
-	<%= render_resources %>
+<table class="list" id="<%= resource_handler.resources_name %>_list">
+  <tr>
+    <%- resource_handler.attributes.each do |attribute| -%>
+    <%- if attribute[:type] == :boolean -%>
+    <th class="center">
+    <%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
+    <th class="right">
+    <%- else -%>
+    <th>
+    <%- end -%>
+      <%= resource_handler.model.human_attribute_name(attribute[:name]) %>
+    </th>
+    <%- end -%>
+    <th class="tools"></th>
+  </tr>
+  <%= render_resources %>
 </table>
 <%- elsif params[:query] -%>
 <p><%= t('Nothing found') %></p>
 <%- end -%>
 
-<%= render 'alchemy/admin/partials/pagination_links', :items => resources_instance_variable, :scope => resource_url_scope %>
+<%= render 'alchemy/admin/partials/pagination_links', :items => resources_instance_variable, :scope => resource_url_proxy %>

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

@@ -1 +1 @@
-window.location.replace('<%= resource_url_scope.url_for({:action => :index}) %>');
+window.location.replace('<%= resource_url_proxy.url_for({:action => :index}) %>');

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

@@ -1,20 +1,20 @@
 <%- label_title = t("Create #{resource_model_name}", :default => t('Create')) -%>
 
 <%- toolbar(
-	:buttons => [
-		{
-			:icon => 'create',
-			:label => label_title,
-			:url => resource_url_scope.send("new_admin_#{resource_model_name}_path"),
-			:title => label_title,
-			:overlay_options => {
-				:title => label_title
-			},
-			:if_permitted_to => [:new, resources_permission]
-		}
-	],
-	:search => true,
-	:search_url => resource_url_scope.send("admin_#{resources_name}_path")
+  :buttons => [
+    {
+      :icon => 'create',
+      :label => label_title,
+      :url => new_resource_path,
+      :title => label_title,
+      :overlay_options => {
+        :title => label_title
+      },
+      :if_permitted_to => [:new, resource_permission_scope]
+    }
+  ],
+  :search => true,
+  :search_url => resources_path
 ) -%>
 
 <%= render 'table' %>

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

@@ -1,24 +1,24 @@
 <div class="with_padding">
-	<%- if @elements.blank? -%>
-	<div id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %> class="info">
-		<%= render_icon('info') %>
-		<%= t('Your trash is empty') %>
-	</div>
-	<%- else -%>
-	<div class="info">
-		<%= render_icon('info') %>
-		<%= t('Drag an element over to the element window to restore it') %>
-	</div>
-	<div id="trash_items">
-		<%- @elements.each do |element| -%>
-		<%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil? } %>
-		<%- end -%>
-	</div>
-	<p>
-		<%= link_to_confirmation_window(t('clear trash'), t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
-	</p>
-	<%- end -%>
+  <%- if @elements.blank? -%>
+  <div id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %> class="info">
+    <%= render_icon('info') %>
+    <%= t('Your trash is empty') %>
+  </div>
+  <%- else -%>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= t('Drag an element over to the element window to restore it') %>
+  </div>
+  <div id="trash_items">
+    <%- @elements.each do |element| -%>
+    <%= render :partial => 'alchemy/admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil?} %>
+    <%- end -%>
+    <p>
+      <%= link_to_confirmation_window(t('clear trash'), t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
+    </p>
+  </div>
+  <%- end -%>
 </div>
 <script type="text/javascript" charset="utf-8">
-	Alchemy.DraggableTrashItems(<%= @draggable_trash_items.to_json.html_safe %>);
+  Alchemy.DraggableTrashItems(<%= @draggable_trash_items.to_json.html_safe %>);
 </script>

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

@@ -1,54 +1,54 @@
 <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 => 'alchemy_selectbox' -%></td>
-	</tr>
-	<tr>
-		<td class="label"><%= f.label 'firstname' %></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>
-	</tr>
-	<tr>
-		<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 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 => 'alchemy_selectbox'} %></td>
-	</tr>
-	<tr>
-		<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 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 => 'alchemy_selectbox'} %></td>
-	</tr>
-	<%- else -%>
-	<%= f.hidden_field :role %>
-	<%- end -%>
-	<tr>
-		<td>&nbsp;</td>
-		<td class="checkbox">
-			<%= check_box_tag('send_credentials', true, @user.new_record?) %>
-			<%= label_tag('send_credentials', t('Send email with credentials')) %>
-		</td>
-	</tr>
-	<tr>
-		<td class="submit" colspan="2">
-			<%= f.button t('save'), :class => 'button' %>
-		</td>
-	</tr>
+  <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 => 'alchemy_selectbox' -%></td>
+  </tr>
+  <tr>
+    <td class="label"><%= f.label 'firstname' %></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>
+  </tr>
+  <tr>
+    <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 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 => 'alchemy_selectbox'} %></td>
+  </tr>
+  <tr>
+    <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 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 => 'alchemy_selectbox'} %></td>
+  </tr>
+  <%- else -%>
+  <%= f.hidden_field :role %>
+  <%- end -%>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="checkbox">
+      <%= check_box_tag('send_credentials', true, @user.new_record?) %>
+      <%= label_tag('send_credentials', t('Send email with credentials')) %>
+    </td>
+  </tr>
+  <tr>
+    <td class="submit" colspan="2">
+      <%= f.button t('save'), :class => 'button' %>
+    </td>
+  </tr>
 </table>

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

@@ -1,38 +1,37 @@
 <tr class="<%= cycle('even', 'odd') %>">
-	<td class="icon"><%= content_tag 'span', '', :class => "icon user#{user.gender == 'female' ? ' female' : ' male'}" -%></td>
-	<td>
-		<%= render_icon(user.logged_in? ? 'online' : 'offline') %>
-	</td>
-	<td class="login"><%= user.login %></td>
-	<td class="name"><%= user.firstname -%></td>
-	<td><%= user.lastname -%></td>
-	<td class="email"><%= user.email %></td>
-	<td><%= t(user.language, :scope => 'translations') %></td>
-	<td class="role"><%= user.human_role_name %></td>
-	<td class="tools">
-		<%- permitted_to?(:destroy, :alchemy_admin_users) do -%>
-		<%= link_to_confirmation_window(
-			'',
-			t("confirm_to_delete_user"),
-			alchemy.admin_user_path(user),
-			:title => t('delete_user'),
-			:class => "icon user_delete#{user.gender == 'female' ? ' female' : ' male'}"
-		) -%>
-		<%- end -%>
-		<%- permitted_to?(:edit, :alchemy_admin_users) do -%>
-		<%= link_to_overlay_window(
-			'',
-			alchemy.edit_admin_user_path(user),
-			{
-				:title => t('edit_user'),
-				:size => '384x450',
-				:overflow => true
-			},
-			{
-				:class => "icon user_edit#{user.gender == 'female' ? ' female' : ' male'}",
-				:title => t('edit_user')
-			}
-		) -%>
-		<%- end -%>
-	</td>
+  <td class="icon"><%= content_tag 'span', '', :class => "icon user#{user.gender == 'female' ? ' female' : ' male'}" -%></td>
+  <td>
+    <%= render_icon(user.logged_in? ? 'online' : 'offline') %>
+  </td>
+  <td class="login"><%= user.login %></td>
+  <td class="name"><%= user.firstname -%></td>
+  <td><%= user.lastname -%></td>
+  <td class="email"><%= user.email %></td>
+  <td><%= t(user.language, :scope => 'translations') %></td>
+  <td class="role"><%= user.human_role_name %></td>
+  <td class="tools">
+    <%- permitted_to?(:destroy, :alchemy_admin_users) do -%>
+    <%= link_to_confirmation_window(
+      '',
+      t("confirm_to_delete_user"),
+      alchemy.admin_user_path(user),
+      :title => t('delete_user'),
+      :class => "icon user_delete#{user.gender == 'female' ? ' female' : ' male'}"
+    ) -%>
+    <%- end -%>
+    <%- permitted_to?(:edit, :alchemy_admin_users) do -%>
+    <%= link_to_overlay_window(
+      '',
+      alchemy.edit_admin_user_path(user),
+      {
+        :title => t('edit_user'),
+        :overflow => true
+      },
+      {
+        :class => "icon user_edit#{user.gender == 'female' ? ' female' : ' male'}",
+        :title => t('edit_user')
+      }
+    ) -%>
+    <%- end -%>
+  </td>
 </tr>

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

@@ -1,41 +1,40 @@
 <%= toolbar(
-	:buttons => [
-		{
-			:icon => 'user_add',
-			:label => t('create_user'),
-			:url => alchemy.new_admin_user_path,
-			:title => t('create_user'),
-			:overlay_options => {
-				:title => t('create_user'),
-				:size => "384x450"
-			},
-			:if_permitted_to => [:new, :alchemy_admin_users]
-		}
-	]
+  :buttons => [
+    {
+      :icon => 'user_add',
+      :label => t('create_user'),
+      :url => alchemy.new_admin_user_path,
+      :title => t('create_user'),
+      :overlay_options => {
+        :title => t('create_user')
+      },
+      :if_permitted_to => [:new, :alchemy_admin_users]
+    }
+  ]
 ) %>
 
 <%- if @users.any? -%>
 <table class="list" id="user_list">
-	<tr>
-		<th class="icon"></th>
-		<th class="login_status"></th>
-		<th class="login"><%= Alchemy::User.human_attribute_name('login') %></th>
-		<th class="name"><%= Alchemy::User.human_attribute_name('firstname') %></th>
-		<th><%= Alchemy::User.human_attribute_name('lastname') %></th>
-		<th class="email"><%= Alchemy::User.human_attribute_name('email') %></th>
-		<th><%= Alchemy::User.human_attribute_name('language') %></th>
-		<th class="role"><%= Alchemy::User.human_attribute_name('role') %></th>
-		<th class="tools"></th>
-	</tr>
-	<%= render @users %>
+  <tr>
+    <th class="icon"></th>
+    <th class="login_status"></th>
+    <th class="login"><%= Alchemy::User.human_attribute_name('login') %></th>
+    <th class="name"><%= Alchemy::User.human_attribute_name('firstname') %></th>
+    <th><%= Alchemy::User.human_attribute_name('lastname') %></th>
+    <th class="email"><%= Alchemy::User.human_attribute_name('email') %></th>
+    <th><%= Alchemy::User.human_attribute_name('language') %></th>
+    <th class="role"><%= Alchemy::User.human_attribute_name('role') %></th>
+    <th class="tools"></th>
+  </tr>
+  <%= render :partial => 'alchemy/admin/users/user', :collection => @users %>
 </table>
 <%= paginate @users %>
 
 <%- elsif params[:query] -%>
 
 <div class="info">
-	<%= render_icon('info') %>
-	<%= t('No users found') %>
+  <%= render_icon('info') %>
+  <%= t('No users found') %>
 </div>
 
 <%- end -%>

data/app/views/alchemy/base/error_notice.html.erb

@@ -1,4 +1,4 @@
 <div class="flash error">
-	<%= render_icon(:error) %>
-	<%= @notice %>
+  <%= render_icon(:error) %>
+  <%= @notice %>
 </div>

data/app/views/alchemy/base/update.js.erb

@@ -1,5 +1,5 @@
 Alchemy.closeCurrentWindow();
 <%- unless flash[:notice].blank? -%>
-	Alchemy.growl('<%= flash[:notice] -%>');
+  Alchemy.growl('<%= flash[:notice] -%>');
 <%- end -%>
 Alchemy.reloadPreview();

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

@@ -1,78 +1,78 @@
 <%= form_for(@message ||= Alchemy::Message.new, :html => {:id => "contact", "data-alchemy-element" => (@preview_mode ? element.id : nil)}) do |f| %>
-	<%= f.error_messages %>
-	<%= f.hidden_field "contact_form_id", :value => element.id %>
-	<table class="contactform">
-		<tr>
-			<td class="label">
-				<%= f.label :salutation, t('contactform.labels.salutation') %>
-			</td>
-			<td class="field">
-				<%= f.select(
-					:salutation,
-					[
-						[t('contactform.labels.mr')],
-						[t('contactform.labels.mrs')]
-					],
-					:prompt => t('contactform.labels.choose'),
-					:class => "select"
-				) %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :firstname, t('contactform.labels.firstname') %>
-			</td>
-			<td class="field">
-				<%= f.text_field(:firstname, :class => "field") %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :lastname, t('contactform.labels.lastname') + '*' %>
-			</td>
-			<td class="field">
-				<%= f.text_field(:lastname, :class => "field", :required => true) %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :address, t('contactform.labels.address') %>
-			</td>
-			<td class="field">
-				<%= f.text_field :address, :class => 'field' %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :zip, t('contactform.labels.zip') %>
-			</td>
-			<td class="field">
-				<%= f.text_field :zip, :class => 'field short' %>
-				<%= f.text_field :city, :class => 'field medium' %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :phone, t('contactform.labels.phone') %>
-			</td>
-			<td class="field">
-				<%= f.text_field :phone, :class => 'field' %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :email, t('contactform.labels.email') + '*' %>
-			</td>
-			<td class="field">
-				<%= f.email_field :email, :class => 'field', :required => true %>
-			</td>
-		</tr>
-	</table>
-	<div id="message">
-		<%= f.text_area :message %>
-	</div>
-	<p class="foot_notice">*) <%= t('contactform.labels.mandatory_fields') %></p>
-	<p class="right">
-		<%= f.button t('contactform.labels.send'), :name => nil, :class => 'button' %>
-	</p>
+  <%= f.error_messages %>
+  <%= f.hidden_field "contact_form_id", :value => element.id %>
+  <table class="contactform">
+    <tr>
+      <td class="label">
+        <%= f.label :salutation, t('contactform.labels.salutation') %>
+      </td>
+      <td class="field">
+        <%= f.select(
+          :salutation,
+          [
+            [t('contactform.labels.mr')],
+            [t('contactform.labels.mrs')]
+          ],
+          :prompt => t('contactform.labels.choose'),
+          :class => "select"
+        ) %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :firstname, t('contactform.labels.firstname') %>
+      </td>
+      <td class="field">
+        <%= f.text_field(:firstname, :class => "field") %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :lastname, t('contactform.labels.lastname') + '*' %>
+      </td>
+      <td class="field">
+        <%= f.text_field(:lastname, :class => "field", :required => true) %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :address, t('contactform.labels.address') %>
+      </td>
+      <td class="field">
+        <%= f.text_field :address, :class => 'field' %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :zip, t('contactform.labels.zip') %>
+      </td>
+      <td class="field">
+        <%= f.text_field :zip, :class => 'field short' %>
+        <%= f.text_field :city, :class => 'field medium' %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :phone, t('contactform.labels.phone') %>
+      </td>
+      <td class="field">
+        <%= f.text_field :phone, :class => 'field' %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :email, t('contactform.labels.email') + '*' %>
+      </td>
+      <td class="field">
+        <%= f.email_field :email, :class => 'field', :required => true %>
+      </td>
+    </tr>
+  </table>
+  <div id="message">
+    <%= f.text_area :message %>
+  </div>
+  <p class="foot_notice">*) <%= t('contactform.labels.mandatory_fields') %></p>
+  <p class="right">
+    <%= f.button t('contactform.labels.send'), :name => nil, :class => 'button' %>
+  </p>
 <% end %>