alchemy_cms 2.1.beta1 → 2.1.beta5

data/app/views/{admin → alchemy/admin}/pictures/_filter_and_size_bar.html.erb

@@ -2,7 +2,7 @@
 	<div class="button_with_label">
 		<%= link_to(
 			render_icon('zoom-out'),
-			admin_pictures_path({
+			alchemy.admin_pictures_path({
 				:size => "small",
 				:content_id => @content,
 				:element_id => @element,
@@ -11,12 +11,12 @@
 				:options => @options
 			}),
 			:remote => true,
-			:title => _("small_thumbnails"),
+			:title => t("small_thumbnails"),
 			:class => "icon_button"
 		) %>
 		<%= link_to(
 			render_icon('zoom-equal'),
-			admin_pictures_path({
+			alchemy.admin_pictures_path({
 				:size => "medium",
 				:content_id => @content,
 				:element_id => @element,
@@ -25,12 +25,12 @@
 				:options => @options
 			}),
 			:remote => true,
-			:title => _("medium_thumbnails"),
+			:title => t("medium_thumbnails"),
 			:class => "icon_button"
 		) %>
 		<%= link_to(
 			render_icon('zoom-in'),
-			admin_pictures_path({
+			alchemy.admin_pictures_path({
 				:size => "large",
 				:content_id => @content,
 				:element_id => @element,
@@ -39,17 +39,17 @@
 				:options => @options
 			}),
 			:remote => true,
-			:title => _("big_thumbnails"),
+			:title => t("big_thumbnails"),
 			:class => "icon_button"
-		) %><br />
-		<label class="sup"><%= _('Image size') %></label>
+		) %>
+		<label><%= t('Image size') %></label>
 		<%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
 	</div>
 	<div class="toolbar_spacer"></div>
 	<div class="button_with_label">
 	<%= link_to_overlay_window(
 		render_icon('upload'),
-		new_admin_picture_path(
+		alchemy.new_admin_picture_path(
 			:element_id => @element.blank? ? nil : @element.id,
 			:content_id => @content.blank? ? nil : @content.id,
 			:swap => @swap,
@@ -59,15 +59,15 @@
 			:options => @options
 		),
 		{
-			:size => "540x480",
-			:title => _('upload_image')
+			:size => "540x550",
+			:title => t('upload_image')
 		},
 		{
 			:class => 'icon_button',
-			:title => _('upload_image')
+			:title => t('upload_image')
 		}
-	) %><br />
-	<label><%= _('upload_image') %></label>
+	) %>
+	<label><%= t('upload_image') %></label>
 	</div>
-	<%= render(:partial => 'admin/partials/remote_search_form') %>
+	<%= render(:partial => 'alchemy/admin/partials/remote_search_form') %>
 </div>

data/app/views/{admin → alchemy/admin}/pictures/_picture.html.erb

@@ -1,17 +1,17 @@
 <div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
-	<%- permitted_to?(:destroy, :admin_pictures) do -%>
+	<%- permitted_to?(:destroy, :alchemy_admin_pictures) do -%>
 	<span class="picture_tool_delete">
 		<%= link_to_confirmation_window(
 			"",
-			_("confirm_to_delete_image_from_server"),
-			admin_picture_path(
+			t("confirm_to_delete_image_from_server"),
+			alchemy.admin_picture_path(
 				:id => picture,
 				:query => params[:query],
 				:page => params[:page],
 				:per_page => params[:per_page]
 			),
 			{
-				:title => _('Delete image')
+				:title => t('Delete image')
 			}
 		) -%>
 	</span>
@@ -21,14 +21,14 @@
 	</div>
 	<%= link_to_function(
 		image_tag(
-			thumbnail_path(:id => picture, :size => @size),
+			alchemy.thumbnail_path(:id => picture, :size => @size),
 			:alt => picture.name,
-			:title => _('zoom_image'),
+			:title => t('zoom_image'),
 			: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})",
 		:class => 'thumbnail_background'
 	) %>
-	<span class="picture_name<%= ' rename' if permitted_to?(:edit, :admin_pictures) -%>" title="<%= permitted_to?(:edit, :admin_pictures) ? picture.name + ' (' + _('Click to rename') + ')' : picture.name %>" id="image_<%= dom_id(picture) %>_name"><%= picture.name %></span>
+	<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>
 </div>

data/app/views/{admin → alchemy/admin}/pictures/_picture_to_assign.html.erb

@@ -11,7 +11,7 @@
 	</div>
 	<%= link_to(
 		image_tag(
-			thumbnail_path(
+			alchemy.thumbnail_path(
 				:id => picture_to_assign,
 				:size => size
 			),
@@ -22,7 +22,7 @@
 		action_url,
 		:remote => true,
 		:method => action_method,
-		:title => _("assign_image"),
+		:title => t("assign_image"),
 		:class => 'thumbnail_background'
 	) %>
 	<div class="picture_name" title="<%= picture_to_assign.name %>">

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

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

data/app/views/{admin → alchemy/admin}/pictures/create.js.erb

@@ -2,10 +2,10 @@
 <%- if @while_assigning -%>
 	$('#alchemy_window_body').replaceWith('<%= escape_javascript(render(:partial => "archive_overlay")) -%>');
 <%- else -%>
-	$('#archive_all').html('<%= escape_javascript(render(:partial => "pictures_list")) -%>');
+	$('#picture_archive').html('<%= escape_javascript(render(:partial => "pictures_list")) -%>');
 	Alchemy.inPlaceEditor({
-		save_label: "<%= _('save') -%>",
-		cancel_label: "<%= _('cancel') -%>"
+		save_label: "<%= t('save') -%>",
+		cancel_label: "<%= t('cancel') -%>"
 	});
 <%- end -%>
 	Alchemy.growl('<%= @message -%>');

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

@@ -0,0 +1,83 @@
+<%- content_for(:toolbar) do -%>
+<div id="toolbar_buttons">
+	<%= toolbar_button(
+		:icon => 'upload',
+		:label => t('upload_image'),
+		:url => alchemy.new_admin_picture_path(:size => @size),
+		:overlay_options => {
+			:title => t('upload_image'),
+			:size => '540x550'
+		},
+		:class => 'icon_button',
+		:title => t('upload_image'),
+		:if_permitted_to => [:new, :alchemy_admin_pictures]
+	) %>
+	<div class="toolbar_spacer"></div>
+	<div class="button_with_label">
+		<%= link_to(
+			render_icon('zoom-out'),
+			alchemy.admin_pictures_path({
+				:size => "small",
+				:query => params[:query]
+			}),
+			:title => t("small_thumbnails"),
+			:class => "icon_button please_wait"
+		) %>
+		<%= link_to(
+			render_icon('zoom-equal'),
+			alchemy.admin_pictures_path({
+				:size => "medium",
+				:query => params[:query]
+			}),
+			:title => t("medium_thumbnails"),
+			:class => "icon_button please_wait"
+		) %>
+		<%= link_to(
+			render_icon('zoom-in'),
+			alchemy.admin_pictures_path({
+				:size => "large",
+				:query => params[:query]
+			}),
+			:title => t("big_thumbnails"),
+			:class => "icon_button please_wait"
+		) %>
+		<label><%= t('Image size') %></label>
+		<%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
+	</div>
+
+	<%- permitted_to?(:flush, :alchemy_admin_pictures) do -%>
+	<div class="toolbar_spacer"></div>
+	<%= toolbar_button(
+		:icon => 'flush',
+		:url => alchemy.flush_admin_pictures_path,
+		:overlay => false,
+		:link_options => {
+			:remote => true,
+			:method => :post
+		},
+		:label => t('Flush picture cache'),
+		:class => 'icon_button please_wait',
+		:title => t('Flush picture cache'),
+		:skip_permission_check => true
+	) %>
+	<%- end -%>
+</div>
+<%= render :partial => 'alchemy/admin/partials/search_form' %>
+<%- end -%>
+
+<div id="picture_archive">
+	<%= render :partial => 'pictures_list' %>
+</div>
+
+<%- content_for :javascripts do -%>
+<script type="text/javascript" charset="utf-8">
+
+	jQuery(document).ready(function($) {
+		Alchemy.inPlaceEditor({
+			save_label: "<%= t('save') %>",
+			cancel_label: "<%= t('cancel') %>"
+		});
+	});
+
+</script>
+<%- end -%>

data/app/views/{admin → alchemy/admin}/pictures/new.html.erb

@@ -1,11 +1,11 @@
 <%= form_for([:admin, @picture], :html => {:multipart => true}) do |f| %>
   <%= render(
-    :partial => "admin/partials/upload_form",
+    :partial => "alchemy/admin/partials/upload_form",
     :locals => {
       :file_types => configuration(:uploader)[:allowed_filetypes][:pictures],
-      :file_types_description => _('images'),
+      :file_types_description => t('images'),
       :model_name => 'picture',
-      :item_type => _('images')
+      :item_type => t('images')
     }
   ) %>
 <% end %>

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

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

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

@@ -0,0 +1,20 @@
+<%= form_for [:admin, resource_instance_variable], :remote => true do |f| %>
+	<div id="errors" style="display: none"></div>
+	<table>
+		<%- resource_attributes.each do |attribute| -%>
+		<tr>
+			<td class="label"><%= f.send :label, attribute[:name] %></td>
+			<%- if attribute[:type] == :boolean -%>
+			<td class="checkbox"><%= f.send :check_box, attribute[:name] -%></td>
+			<%- else -%>
+			<td class="input"><%= f.send :text_field, attribute[:name], :class => 'thin_border long' -%></td>
+			<%- end -%>
+		</tr>
+		<%- end -%>
+		<tr>
+			<td class="submit" colspan="2">
+				<%= f.button t('save'), :class => 'button' %>
+			</td>
+		</tr>
+	</table>
+<% end %>

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

@@ -0,0 +1,35 @@
+<tr class="<%= cycle('even', 'odd') %>">
+	<%- resource_attributes.each do |attribute| -%>
+	<%- if attribute[:type] == :boolean -%>
+	<td class="center"><%= render_icon(resource.send(attribute[:name])) -%></td>
+	<%- elsif attribute[:type] == :integer || attribute[:type] == :float || attribute[:type] == :decimal -%>
+	<td class="right"><%= resource.send(attribute[:name]) -%></td>
+	<%- else -%>
+	<td><%= resource.send(attribute[:name]) -%></td>
+	<%- end -%>
+	<%- end -%>
+	<td class="tools">
+		<%- permitted_to?(:destroy, namespaced_resources_name.to_sym) do -%>
+		<%= link_to_confirmation_window(
+			'',
+			t("Are you sure?"),
+			send("admin_#{resource_model_name}_path", resource),
+			:title => t("Delete"),
+			:class => "icon destroy"
+		) -%>
+		<%- end -%>
+		<%- permitted_to?(:edit, namespaced_resources_name.to_sym) do -%>
+		<%= link_to_overlay_window(
+			'',
+			send("edit_admin_#{resource_model_name}_path", resource),
+			{
+				:title => t("Edit")
+			},
+			{
+				:class => "icon edit",
+				:title => t("Edit")
+			}
+		) -%>
+		<%- end -%>
+	</td>
+</tr>

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

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

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

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

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

@@ -0,0 +1,19 @@
+<%- label_title = t("Create #{resource_model_name}", :default => t('Create')) -%>
+
+<%- toolbar(
+	:buttons => [
+		{
+			:icon => 'create',
+			:label => label_title,
+			:url => send("new_admin_#{resource_model_name}_path"),
+			:title => label_title,
+			:overlay_options => {
+				:title => label_title
+			},
+			:if_permitted_to => [:new, namespaced_resources_name.to_sym]
+		}
+	],
+	:search => true
+) -%>
+
+<%= render 'table' %>

data/app/views/{admin → alchemy/admin}/trash/clear.js.erb

@@ -1,3 +1,3 @@
-Alchemy.growl('<%= _("Cleared trash") %>');
+Alchemy.growl('<%= t("Cleared trash") %>');
 Alchemy.refreshTrashWindow(<%= @page.id %>);
 jQuery('#element_trash_button .icon').removeClass('full');

data/app/views/{admin → alchemy/admin}/trash/index.html.erb

@@ -1,19 +1,19 @@
 <div class="with_padding">
 	<%- if @elements.blank? -%>
 	<p id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %>>
-		<%= _('Your trash is empty') %>
+		<%= t('Your trash is empty') %>
 	</p>
 	<%- else -%>
 	<div class="info">
 		<%= render_icon('info') %>
-		<%= _('Drag an element over to the element window to restore it.') %>
+		<%= t('Drag an element over to the element window to restore it.') %>
 	</div>
 	<div id="trash_items">
 		<%- @elements.each do |element| -%>
-		<%= render :partial => 'admin/elements/element', :object => element, :locals => {:draggable => !@allowed_elements.detect { |e| e['name'] == element.name }.nil?} %>
+		<%= 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(_('clear trash'), _('Do you really want to clear the trash?'), clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
+			<%= 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 -%>

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

@@ -0,0 +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 => 'long'} -%></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"><%= f.label 'login' %></td>
+		<td class="input"><%= f.text_field 'login', :class => 'thin_border' -%></td>
+	</tr>
+	<tr>
+		<td class="label"><%= f.label 'email' %></td>
+		<td class="input"><%= f.text_field 'email', :class => 'thin_border' -%></td>
+	</tr>
+	<tr>
+		<td class="label"><%= f.label 'language' %></td>
+		<td class="select"><%= f.select 'language', translations_for_select, {}, :class => 'long' -%></td>
+	</tr>
+	<tr>
+		<td class="label"><%= f.label 'password' %></td>
+		<td class="input"><%= f.password_field 'password', :class => 'thin_border', :autocomplete => "off" -%></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>
+	</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>
+	</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>