alchemy_cms 2.1.beta1 → 2.1.beta5

data/app/views/{admin → alchemy/admin}/users/_user.html.erb

@@ -1,34 +1,36 @@
-<tr class="<%= cycle('odd', 'even') %>">
+<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.fullname -%></td>
+	<td class="name"><%= user.firstname -%></td>
+	<td><%= user.lastname -%></td>
 	<td class="email"><%= user.email %></td>
-	<td class="role"><%= I18n.t("alchemy.user_roles.#{user.role}") %></td>
+	<td><%= t(user.language, :scope => 'translations') %></td>
+	<td class="role"><%= t("user_roles.#{user.role}") %></td>
 	<td class="tools">
-		<%- permitted_to?(:destroy, :admin_users) do -%>
+		<%- permitted_to?(:destroy, :alchemy_admin_users) do -%>
 		<%= link_to_confirmation_window(
 			'',
-			_("confirm_to_delete_user"),
-			admin_user_path(user),
-			:title => _('delete_user'),
+			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, :admin_users) do -%>
+		<%- permitted_to?(:edit, :alchemy_admin_users) do -%>
 		<%= link_to_overlay_window(
 			'',
-			edit_admin_user_path(user),
+			alchemy.edit_admin_user_path(user),
 			{
-				:title => _('edit_user'),
-				:size => '380x400',
+				:title => t('edit_user'),
+				:size => '384x400',
 				:overflow => true
 			},
 			{
 				:class => "icon user_edit#{user.gender == 'female' ? ' female' : ' male'}",
-				:title => _('edit_user')
+				:title => t('edit_user')
 			}
 		) -%>
 		<%- end -%>

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

@@ -0,0 +1,41 @@
+<%= 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 => "384x400"
+			},
+			: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 %>
+</table>
+<%= render 'alchemy/admin/partials/pagination_links', :items => @users %>
+
+<%- elsif params[:query] -%>
+
+<div class="info">
+	<%= render_icon('info') %>
+	<%= t('No users found.') %>
+</div>
+
+<%- end -%>

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

@@ -1,5 +1,5 @@
 <div id="user_edit">
-  <% form_for [:admin, @user], :remote => true do |f| %>
+  <%= form_for [:admin, @user], :remote => true do |f| %>
     <div id="errors" style="display: none"></div>
     <%= render :partial => 'table', :locals => {:f => f} %>
   <% end %>

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

@@ -0,0 +1,5 @@
+<h1>Upps!</h1>
+<h2><%= @notice %></h2>
+<pre>
+<%= @trace.join("\n") %>
+</pre>

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

@@ -0,0 +1,2 @@
+Alchemy.growl('<%= escape_javascript(@notice) %>', 'error');
+Alchemy.enableButton('<%= "button.button, a.button, input.button" %>');

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

@@ -0,0 +1,2 @@
+Alchemy.closeCurrentWindow();
+window.location.replace('<%= alchemy.login_path %>');

data/app/views/{elements → alchemy/elements}/_article_view.html.erb

@@ -12,7 +12,7 @@
   </h1>
   <%- end -%>
   <div class="text_bild_container">
-    <%- content = element.contents.find_by_essence_type("EssencePicture") -%>
+    <%- content = element.contents.find_by_essence_type("Alchemy::EssencePicture") -%>
     <%- if content -%>
     <div class="image <%= content.essence.css_class %>">
       <%= render_essence_view(content, :image_size => "450x1000", :crop => true) %>

data/app/views/{elements → alchemy/elements}/_bild_text_view.html.erb

@@ -1,5 +1,5 @@
 <div class="bild_text" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
-  <%- a = element.contents.find_by_essence_type("EssencePicture") -%>
+  <%- a = element.contents.find_by_essence_type("Alchemy::EssencePicture") -%>
   <div class="image <%= a.essence.css_class %>">
     <%= render_essence_view(a, :image_size => "450x1000", :crop => true) %>
   </div>

data/app/views/{elements → alchemy/elements}/_bild_view.html.erb

@@ -1,6 +1,6 @@
 <div class="bild" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
     <div class="bild_images">
-        <%- element.contents.find_all_by_essence_type("EssencePicture").each do |essence| -%>
+        <%- element.contents.find_all_by_essence_type("Alchemy::EssencePicture").each do |essence| -%>
         <div class="bild_image">
             <%= render_essence_view(essence, :image_size => "900x300", :crop => true) %>
         </div>

data/app/views/{elements → alchemy/elements}/_editor_not_found.html.erb

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

data/app/views/{elements → alchemy/elements}/_header_view.html.erb

@@ -1 +1 @@
-<span class="header_image" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>><%= render_essence_view_by_type(element, "EssencePicture", 1, {:image_size => '900x300', :crop => true}) %></span>
+<span class="header_image" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>><%= render_essence_view_by_type(element, "Alchemy::EssencePicture", 1, {:image_size => '900x300', :crop => true}) %></span>

data/app/views/{elements → alchemy/elements}/_image_mosaic_view.html.erb

@@ -1,6 +1,6 @@
 <div class="image_mosaic" id="<%= element_dom_id(element) %>" <%= element_preview_code(element) -%>>
     <div class="image_mosaic_images">
-    <%- element.contents.find_all_by_essence_type("EssencePicture").each do |essence| -%>
+    <%- element.contents.find_all_by_essence_type("Alchemy::EssencePicture").each do |essence| -%>
         <div class="image_mosaic_image">
             <%= render_essence_view(essence, :image_size => '300x200', :crop => true) %>
         </div>

data/app/views/{elements → alchemy/elements}/_intro_image_text_view.html.erb

@@ -3,7 +3,7 @@
         <%= render_essence_view_by_name(element, 'headline') %>
     </h1>
     <div class="text_bild_container">
-        <%- content = element.contents.find_by_essence_type("EssencePicture") -%>
+        <%- content = element.contents.find_by_essence_type("Alchemy::EssencePicture") -%>
         <%- if content -%>
         <div class="image <%= content.essence.css_class %>">
             <%= render_essence_view(content, :image_size => "450x300", :crop => true) %>

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

@@ -0,0 +1 @@
+<p><%= t('This element displays the search and the searchresults.') %></p>

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

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

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

@@ -0,0 +1,3 @@
+<div class="content_editor">
+	<p><%= t('The sitemap is autogenerated.') %></p>
+</div>

data/app/views/{elements → alchemy/elements}/_sitemap_view.html.erb

@@ -26,12 +26,12 @@
             }
         ) %>
     <%- end -%>
-    <%= render(:partial => "elements/sitemap_view", :locals => {:pages => page.children, :element => element}) unless page.children.empty? %>
+    <%= render(:partial => "alchemy/elements/sitemap_view", :locals => {:pages => page.children, :element => element}) unless page.children.empty? %>
     </li>
     <%- else #page not public -%>
     <li>
         <span><%= page.sitemap? ? page.name : "&nbsp;" %></span>
-        <%= render(:partial => "elements/sitemap_view", :locals => {:pages => page.children, :element => element}) unless page.children.empty? %>
+        <%= render(:partial => "alchemy/elements/sitemap_view", :locals => {:pages => page.children, :element => element}) unless page.children.empty? %>
     </li>
     <%- end -%>
 <%- end -%>

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

@@ -0,0 +1,6 @@
+<%= render(
+  :partial => "alchemy/elements/#{@element.name}_view.html.erb",
+  :locals => {
+    :element => @element
+  }
+) -%>

data/app/views/{elements → alchemy/elements}/show.js.erb

@@ -1,7 +1,7 @@
 (function($) {
   
   $('#<%= @container_id -%>').html('<%= escape_javascript(render(
-    :partial => "elements/<%= @element.name -%>_view.html.erb",
+    :partial => "alchemy/elements/<%= @element.name -%>_view.html.erb",
     :locals => {
       :element => @element,
       :options => @options

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

@@ -0,0 +1 @@
+<%= render :partial => "alchemy/essences/essence_file_editor", :locals => {:options => options, :content => content} %>

data/app/views/{essences → alchemy/essences}/_essence_file_editor.html.erb

@@ -6,43 +6,43 @@
 		<div class="file_icon">
 		<%- if content.ingredient.nil? -%>
 			<%= link_to_overlay_window("",
-				admin_attachments_path(
+				alchemy.admin_attachments_path(
 					:content_id => content.id,
 					:only => options[:file_assign_show_only],
 					:except => options[:file_assign_do_not_show],
 					:options => options
 				),
 				{
-					:title => _('assign_file'),
+					:title => t('assign_file'),
 					:size => '520x400',
 					:resizable => 'true'
 				},
 				:class => 'assign_file',
-				:title => _('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;" + _('assign_file_from_archive')).html_safe %>
+			<%= content.ingredient.name rescue ("&#x2190;" + t('assign_file_from_archive')).html_safe %>
 		</div>
 		<%- unless content.ingredient.nil? -%>
 		<div class="essence_file_tools">
 			<%= link_to_overlay_window("",
-				admin_attachments_path(
+				alchemy.admin_attachments_path(
 					:content_id => content.id,
 					:only => options[:file_assign_show_only],
 					:except => options[:file_assign_do_not_show],
 					:options => options
 				),
 				{
-					:title => _('assign_file'),
+					:title => t('assign_file'),
 					:size => '520x400',
 					:resizable => 'true'
 				},
 				:class => 'assign_file',
-				:title => _('assign_file')
+				:title => t('assign_file')
 			) %>
 			<%= link_to_overlay_window("",
 				url_for(
@@ -51,11 +51,11 @@
 					:id => content
 				),
 				{
-					:title => _('edit_file_properties'),
+					:title => t('edit_file_properties'),
 					:size => '400x150'
 				},
 				:class => 'edit_file',
-				:title => _('edit_file_properties')
+				:title => t('edit_file_properties')
 			) %>
 		</div>
 		<%- end -%>

data/app/views/{essences → alchemy/essences}/_essence_file_view.html.erb

@@ -1,6 +1,6 @@
 <%= link_to(
 	h(content.essence.attachment.name),
-	download_attachment_path(:id => content.essence.attachment.id, :name => content.essence.attachment.filename),
+	alchemy.download_attachment_path(:id => content.essence.attachment.id, :name => content.essence.attachment.filename),
 	: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_editor.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "alchemy/essences/essence_file_editor", :locals => {:options => options, :content => content} %>

data/app/views/{essences → alchemy/essences}/_essence_picture_editor.html.erb

@@ -3,13 +3,13 @@
     <span class="picture_tool_delete">
     <%= link_to_confirmation_window(
       "",
-      _("confirm_to_delete_image"),
-      admin_essence_picture_path(
+      t("confirm_to_delete_image"),
+      alchemy.admin_essence_picture_path(
         :id => content,
         :options => options
       ),
       {
-        :title => _("delete_image"),
+        :title => t("delete_image"),
         :class => "picture_delete"
       }
     ) -%>
@@ -18,18 +18,18 @@
     <div class="missing_image">
       <p>
         <%= image_tag('alchemy/placeholder.png') %><br>
-        <%= _('Image missing') %><%= '<span class="validation_indicator">*</span>'.html_safe if content.has_validations? %>
+        <%= t('Image missing') %><%= '<span class="validation_indicator">*</span>'.html_safe if content.has_validations? %>
       </p>
     </div>
     <%- else -%>
-    <div class="picture_handle" title="<%= _('drag_to_sort') if options[:dragable] %>"></div>
+    <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>
     <div class="picture_image">
       <div class="thumbnail_background">
         <%= image_tag(
-          thumbnail_path(
+          alchemy.thumbnail_path(
             :id => content.ingredient,
             :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,
@@ -38,7 +38,7 @@
           ),
           :alt => content.ingredient.name,
           :class => 'img_paddingtop',
-          :title => _("image_name") + ": #{content.ingredient.name}",
+          :title => t("image_name") + ": #{content.ingredient.name}",
           :onload => "Alchemy.fadeImage(this, '##{content_dom_id(content)} .picture_content_spinner');",
           :style => "display: none;"
         ) %>
@@ -53,7 +53,7 @@
     <%- end -%>
     <div class="edit_images_bottom">
       <%= render(
-        :partial => 'essences/essence_picture_tools',
+        :partial => 'alchemy/essences/essence_picture_tools',
         :locals => {
           :content => content,
           :options => options