alchemy_cms 2.1.beta1 → 2.1.beta5

data/app/views/{admin → alchemy/admin}/pages/_page_for_links.html.erb

@@ -6,20 +6,20 @@
     <div class="sitemap_right_tools">
       <%= link_to(
         "&nbsp;",
-        list_admin_elements_path(:page_id => page_for_links.id),
+        alchemy.list_admin_elements_path(:page_id => page_for_links.id),
         :remote => true,
         :onclick => "Alchemy.LinkOverlay.selectPage('#{page_for_links.id}', '#{@url_prefix + page_for_links.urlname}'); Alchemy.LinkOverlay.showElementsSelect(#{page_for_links.id});",
         :class => "show_elements_to_link",
-        :title => _('show_elements_from_page')
+        :title => t('show_elements_from_page')
       ) %>
       <div id="elements_for_page_<%= page_for_links.id %>" style="display: none" class="elements_for_page">
         <%= image_tag("alchemy/ajax_loader.gif", :alt => '') %>
       </div>
     </div>
     <div class="page_infos">
-      <span class="page_status <%= page_for_links.public ? 'public' : 'not_public' %>" title="<%= page_for_links.public ? _('Page public') : _('Page not public') %>"></span>
-      <span class="page_status <%= page_for_links.visible ? 'visible' : 'not_visible' %>" title="<%= page_for_links.visible ? _('Page visible') : _('Page not visible') %>"></span>
-      <span class="page_status <%= page_for_links.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page_for_links.restricted ? _('Page restricted') : _('Page not restricted') %>"></span>
+      <span class="page_status <%= page_for_links.public ? 'public' : 'not_public' %>" title="<%= page_for_links.public ? t('Page public') : t('Page not public') %>"></span>
+      <span class="page_status <%= page_for_links.visible ? 'visible' : 'not_visible' %>" title="<%= page_for_links.visible ? t('Page visible') : t('Page not visible') %>"></span>
+      <span class="page_status <%= page_for_links.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page_for_links.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>
     </div>
     <div class="sitemap_sitename" id="sitemap_sitename_<%= page_for_links.id %>" name="<%= parse_sitemap_name(page_for_links) %>">
       <%= link_to_function(
@@ -30,7 +30,7 @@
             '#{@url_prefix + page_for_links.urlname}'
           );
         ),
-        :title => (_('page_for_links.choose_page %{name}') % {:name => page_for_links.name}),
+        :title => t('page_for_links.choose_page', :name => page_for_links.name),
         :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
       ) %>
     </div>

data/app/views/{admin → alchemy/admin}/pages/_page_infos.html.erb

@@ -1,3 +1,3 @@
-<span class="page_status <%= page.public ? 'public' : 'not_public' %>" title="<%= page.public ? _('Page public') : _('Page not public') %>"></span>
-<span class="page_status <%= page.visible ? 'visible' : 'not_visible' %>" title="<%= page.visible ? _('Page visible') : _('Page not visible') %>"></span>
-<span class="page_status <%= page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page.restricted ? _('Page restricted') : _('Page not restricted') %>"></span>
+<span class="page_status <%= page.public ? 'public' : 'not_public' %>" title="<%= page.public ? t('Page public') : t('Page not public') %>"></span>
+<span class="page_status <%= page.visible ? 'visible' : 'not_visible' %>" title="<%= page.visible ? t('Page visible') : t('Page not visible') %>"></span>
+<span class="page_status <%= page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= page.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>

data/app/views/{admin → alchemy/admin}/pages/_page_status.html.erb

@@ -1,9 +1,9 @@
-<span class="page_status_and_name" id="<%= dom_id(@page) %>_status">
+<span class="page_status_and_name" id="page_<%= @page.id %>_status">
     <span class="page_name"><%= @page.name %></span>
     <%- if multi_language? && !@layoutpage -%>
     <span class="flag <%= @page.language_code %>"></span>
     <%- end -%>
-    <span class="page_status <%= @page.public ? 'public' : 'not_public' %>" title="<%= @page.public ? _('Page public') : _('Page not public') %>"></span>
-    <span class="page_status <%= @page.visible ? 'visible' : 'not_visible' %>" title="<%= @page.visible ? _('Page visible') : _('Page not visible') %>"></span>
-    <span class="page_status <%= @page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= @page.restricted ? _('Page restricted') : _('Page not restricted') %>"></span>
+    <span class="page_status <%= @page.public ? 'public' : 'not_public' %>" title="<%= @page.public ? t('Page public') : t('Page not public') %>"></span>
+    <span class="page_status <%= @page.visible ? 'visible' : 'not_visible' %>" title="<%= @page.visible ? t('Page visible') : t('Page not visible') %>"></span>
+    <span class="page_status <%= @page.restricted ? 'restricted' : 'not_restricted' %>" title="<%= @page.restricted ? t('Page restricted') : t('Page not restricted') %>"></span>
 </span>

data/app/views/{admin → alchemy/admin}/pages/_sitemap.html.erb

@@ -4,46 +4,46 @@
 			<div class="sitemap_left_images">
 				<span class="site_status tooltip"></span>
 				<div class="tooltip_content" style="display: none;">
-					<h1><%= _("page_type") %>: <%= @page_root.layout_display_name %></h1>
+					<h1><%= t("page_type") %>: <%= @page_root.layout_display_name %></h1>
 					<p>
 						<%= @page_root.humanized_status %>
 					</p>
 					<p>
-						<strong><%= _("created_at") %>:</strong><br />
+						<strong><%= t("created_at") %>:</strong>
 						<%= l(@page_root.created_at) %> von <%= @page_root.creator %>
 					</p>
 					<p>
-						<strong><%= _("updated_at") %>:</strong><br />
+						<strong><%= t("updated_at") %>:</strong>
 						<%= l(@page_root.updated_at) %> durch <%= @page_root.updater %>
 					</p>
 					<%- if @page_root.locked? -%>
 					<p>
-						<%= _("currently_edited_by") %>: <span style="font-weight: bold;"><%= @page_root.current_editor %></span>
+						<%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= @page_root.current_editor %></span>
 					</p>
 					<%- end -%>
 				</div>
 			</div>
 			<div class="sitemap_right_tools">
 				<%- unless @sorting -%>
-				<%- permitted_to?(:configure, :admin_pages) do -%>
+				<%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
 				<%= link_to_overlay_window(
 					render_icon('configure_page'),
-					configure_admin_page_path(@page_root),
+					alchemy.configure_admin_page_path(@page_root),
 					{
-						:title => _('edit_page_properties'),
-						:size => @page_root.redirects_to_external? ? '390x270' : '390x580'
+						:title => t('edit_page_properties'),
+						:size => @page_root.redirects_to_external? ? '410x270' : '410x620'
 					},
 					:class => '',
-					:title => _('edit_page_properties')
+					:title => t('edit_page_properties')
 				) -%>
 				<%- end -%>
-				<%- permitted_to?([:new, :destroy], :admin_pages) do -%>
+				<%- permitted_to?([:new, :destroy], :alchemy_admin_pages) do -%>
 				<span class="sitemap_sitetools">
 					<%= render_icon('blank') %>
-					<%- permitted_to?(:destroy, :admin_pages) do -%>
+					<%- permitted_to?(:destroy, :alchemy_admin_pages) do -%>
 					<%= link_to_confirmation_window(
 						render_icon('delete_page'),
-						_("confirm_to_delete_page"),
+						t("confirm_to_delete_page"),
 						url_for(
 							:controller => 'pages',
 							:action => 'destroy',
@@ -51,21 +51,21 @@
 						),
 						{
 							:class => "",
-							:title => _("delete_page")
+							:title => t("delete_page")
 						}
 					) -%>
 					<%- end -%>
-					<%- permitted_to?(:new, :admin_pages) do -%>
+					<%- permitted_to?(:new, :alchemy_admin_pages) do -%>
 					<%= link_to_overlay_window(
 						render_icon('add_page'),
-						new_admin_page_path(:parent_id => @page_root.id),
+						alchemy.new_admin_page_path(:parent_id => @page_root.id),
 						{
-							:title => _('create_page'),
-							:size => '405x150',
+							:title => t('create_page'),
+							:size => '340x150',
 							:overflow => true
 						},
 						:class => '',
-						:title => _('create_page')
+						:title => t('create_page')
 					) -%>
 					<%- end -%>
 				</span>
@@ -79,7 +79,7 @@
 				<%- if @page_root.redirects_to_external? -%>
 				<span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= @page_root.name %></span>
 				<span class="redirect_url">
-					&raquo; <%= _('Redirects to') %>:
+					&raquo; <%= t('Redirects to') %>:
 					<%= h @page_root.urlname %>
 				</span>
 				<%- else -%>
@@ -87,8 +87,8 @@
 				<%= link_to_unless(
 					@sorting,
 					@page_root.name,
-					edit_admin_page_path(@page_root),
-					:title => _("edit_page"),
+					alchemy.edit_admin_page_path(@page_root),
+					:title => t("edit_page"),
 					:class => "sitemap_pagename_link #{cycle_class}"
 				) { content_tag('span', @page_root.name, :class => "sitemap_pagename_link #{cycle_class}") } -%>
 				<%- end -%>

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

@@ -0,0 +1,71 @@
+<%= form_for([:admin, @page], :remote => true) do |f| %>
+	<div id="errors" style="display: none"></div>
+	<table id="page_names">
+		<tr>
+			<td class="label"><%= t("page_type") %>: </td>
+			<td class="value"><%= @page.layout_display_name %></td>
+		</tr>
+		<%- unless @page.layoutpage -%>
+		<tr>
+			<td class="label"><%= t("page_status") %>: </td>
+			<td class="checkbox">
+				<%= f.check_box :public -%>
+				<%= f.label :public %><br/>
+				<%= f.check_box :visible -%>
+				<%= f.label :visible %><br/>
+				<%= f.check_box :restricted -%>
+				<%= f.label :restricted %>
+				<%- if configuration(:sitemap)[:show_flag] -%><br/>
+				<%= f.check_box :sitemap -%>
+				<%= f.label :sitemap %>
+				<%- end -%>
+			</td>
+		</tr>
+		<%- end -%>
+		<%- unless @page.layoutpage -%>
+		<tr>
+			<td colspan="2" class="heading"><%= t("names") %></td>
+		</tr>
+		<%- end -%>
+		<tr>
+			<td class="label"><%= f.label "name" %>: </td>
+			<td class="input"><%= f.text_field "name", :size => 31, :class => "thin_border long" %></td>
+		</tr>
+		<%- unless @page.layoutpage -%>
+		<tr>
+			<td class="label"><%= f.label "urlname" %>: </td>
+			<td class="input"><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label "title" %>: </td>
+			<td class="input"><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
+		</tr>
+		<tr>
+			<td colspan="2" class="heading"><%= t("meta_data") %></td>
+		</tr>
+		<tr>
+			<td class="label"><%= t("search_engines") %>: </td>
+			<td class="checkbox">
+				<%= f.check_box "robot_index" %>
+				<%= f.label "robot_index" %><br/>
+				<%= f.check_box "robot_follow" %>
+				<%= f.label "robot_follow" %><br/>
+			</td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label "meta_description" %>:&nbsp;</td>
+			<td class="input"><%= f.text_area "meta_description", :class => "thin_border long" %></td>
+		</tr>
+		<tr>
+			<td class="label"><%= f.label "meta_keywords" %>*:&nbsp;</td>
+			<td class="input">
+			  <%= f.text_area "meta_keywords", :class => "thin_border long" %><br/>
+			  <span style="font-size:10px">*<%= t('pages.update.comma_seperated') %></span>
+			</td>
+		</tr>
+		<%- end -%>
+		<tr>
+			<td colspan="2" align="right"><%= f.button t("save"), :class => 'button' %></td>
+		</tr>
+	</table>
+<% end %>

data/app/views/{admin → alchemy/admin}/pages/configure_external.html.erb

@@ -2,39 +2,39 @@
 	<div id="errors" style="display:none"></div>
 	<table id="page_names">
 		<tr>
-			<td><%= _("page_type") %>: </td>
+			<td><%= t("page_type") %>: </td>
 			<td>
 			  <%= @page.layout_display_name %>
 			</td>
 		</tr>
 		<tr>
-			<td><%= _("page_status") %>: </td>
+			<td><%= t("page_status") %>: </td>
 			<td>
 				<%= f.check_box :visible -%>
-				<%= f.label :visible, _('page_visible_in_navigation') %><br/>
+				<%= f.label :visible %><br/>
 				<%- if configuration(:sitemap)[:show_flag] -%><br/>
 					<%= f.check_box :sitemap -%>
-					<%= f.label :sitemap, _('show_page_in_sitemap') %>
+					<%= f.label :sitemap %>
 				<%- end -%>
 			</td>
 		</tr>
 		<tr>
-			<td colspan="2"><strong><%= _("names") %></strong></td>
+			<td colspan="2"><strong><%= t("names") %></strong></td>
 		</tr>
 		<tr>
-			<td><%= f.label( "name", _("navigation_name")) %>:&nbsp;</td>
+			<td><%= f.label "name" %>:&nbsp;</td>
 			<td><%= f.text_field( "name", :size => 31, :class => "thin_border long") %></td>
 		</tr>
 		<tr>
-			<td><%= f.label( "urlname", _("URL")) %>: </td>
+			<td><%= f.label "urlname" %>: </td>
 			<td><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
 		</tr>
 		<tr>
-			<td><%= f.label( "title", _("page_title")) %>: </td>
+			<td><%= f.label "title" %>: </td>
 			<td><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
 		</tr>
 		<tr>
-			<td colspan="2" align="right"><%= f.button _("save"), :class => 'button' %></td>
+			<td colspan="2" align="right"><%= f.button t("save"), :class => 'button' %></td>
 		</tr>
 	</table>
 <% end %>

data/app/views/{admin → alchemy/admin}/pages/destroy.js.erb

@@ -1,12 +1,12 @@
 (function($) {
 	$('#locked_page_<%= @page_id -%>').remove();
 	<%- if @layoutpage -%>
-	window.location.replace('<%= admin_layoutpages_path -%>')
+	window.location.replace('<%= alchemy.admin_layoutpages_path -%>')
 	<%- elsif @page_root -%>
 	$('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
 	Alchemy.growl('<%= @message -%>');
 	Alchemy.Tooltips();
 	<%- else -%>
-	window.location.replace('<%= admin_pages_path -%>');
+	window.location.replace('<%= alchemy.admin_pages_path -%>');
 	<%- end -%>
 })(jQuery);

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

@@ -0,0 +1,181 @@
+<%- content_for(:subnav_additions) do -%>
+	<%- @locked_pages.each do |page| -%>
+	<%- if @page == page -%>
+	<%= render :partial => 'page_status' %>
+	<%- else -%>
+	<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 %>
+	</div>
+	<%- end -%>
+	<%- end -%>
+<%- end -%>
+
+<%- content_for(:toolbar) do -%>
+<div id="toolbar_buttons">
+	<div class="button_with_label">
+		<%= form_tag alchemy.unlock_admin_page_path(@page, :redirect_to => @layoutpage ? alchemy.admin_layoutpages_path : alchemy.admin_pages_path), :id => 'unlock_page_form' do %>
+			<button class="icon_button" title="<%= t('explain_unlocking') %>">
+				<%= render_icon('close') %>
+			</button>
+			<label><%= t("unlock_page") %></label>
+		<% end %>
+	</div>
+	<%- unless @page.layoutpage? -%>
+	<div class="button_with_label">
+		<%= form_tag alchemy.visit_admin_page_path(@page), :id => 'visit_page_form' do %>
+			<button class="icon_button" title="<%= t('Visit page') %>">
+				<%= render_icon('visit_page') %>
+			</button>
+			<label><%= t("Visit page") %></label>
+		<% end %>
+	</div>
+	<%- end -%>
+	<div class="button_with_label">
+		<%= link_to_overlay_window(
+			render_icon('settings'),
+			alchemy.configure_admin_page_path(@page),
+			{
+				:title => t('edit_page_properties'),
+				:size => @page.layoutpage? ? '340x150' : '410x620'
+			},
+			:class => 'icon_button',
+			:title => t('edit_page_properties')
+		) -%>
+		<label><%= t('page_properties') %></label>
+	</div>
+	<%- if configuration(:cache_pages) && !@page.layoutpage? -%>
+	<div class="button_with_label">
+		<%= form_tag alchemy.publish_admin_page_path(@page), :id => 'publish_page_form' do -%>
+			<button class="icon_button" title="<%= t('explain_publishing') %>">
+				<%= render_icon('publish') %>
+			</button>
+			<label><%= t("Publish page") %></label>
+		<% end -%>
+	</div>
+	<%- end -%>
+</div>
+<div id="toolbar_buttons_right">
+	<div class="button_with_label" id="show_preview_window">
+		<%= link_to_function(
+			render_icon('preview_window'),
+			"openPreviewWindow()",
+			{
+				:title => t('Show Preview Window'),
+				:class => 'icon_button'
+			}
+		) %>
+		<label><%= t('Show Preview Window') %></label>
+	</div>
+	<div class="button_with_label" id="show_element_window">
+		<%= link_to_function(
+			render_icon('element_window'),
+			"openElementsWindow()",
+			{
+				:title => t('Show Elements Window'),
+				:class => 'icon_button'
+			}
+		) %>
+		<label><%= t('Show Elements Window') %></label>
+	</div>
+</div>
+<%- end -%>
+
+<%- content_for :javascripts do -%>
+<%= tinymce_javascript_tags %>
+<script type="text/javascript" charset="utf-8">
+
+	function openPreviewWindow() {
+		Alchemy.openPreviewWindow('<%= admin_page_url(@page) %>', '<%= t("Page Preview") -%>');
+	}
+
+	function openElementsWindow() {
+		Alchemy.openElementsWindow('<%= alchemy.admin_elements_path(:page_id => @page.id) -%>', {
+			texts: {
+				title: '<%= t("Elements") -%>',
+				dirtyTitle: '<%= t("Warning!") -%>',
+				dirtyMessage: '<%= t("You have unsaved elements. Do you really want to close the elements window?") -%>',
+				okLabel: '<%= t("Yes") -%>',
+				cancelLabel: '<%= t("No") -%>'
+			},
+			toolbarButtons: [
+				{
+					title: '<%= t("New Element") -%>',
+					label: '<%= t("New Element") -%>',
+					iconClass: 'new_element',
+					onClick: function() {
+						Alchemy.openWindow(
+							'<%= alchemy.new_admin_element_path(:page_id => @page.id) -%>',
+							'<%= t("New Element") -%>',
+							'320',
+							'120',
+							false,
+							true,
+							true
+						);
+					}
+				},
+				{
+					title: '<%= t("Clipboard") -%>',
+					label: '<%= t("Show clipboard") -%>',
+					iconClass: 'clipboard<%= clipboard_empty?("elements") ? "" : " full" -%>',
+					buttonId: 'clipboard_button',
+					onClick: function() {
+						Alchemy.openWindow(
+							'<%= alchemy.admin_clipboard_path(:remarkable_type => "elements") -%>',
+							'<%= t("Clipboard") -%>',
+							'380',
+							'270',
+							false,
+							true,
+							true
+						);
+					}
+				},
+				{
+					title: '<%= t("Show trash") -%>',
+					label: '<%= t("Show trash") -%>',
+					iconClass: 'trash<%= trash_empty?("elements") ? "" : " full" -%>',
+					buttonId: 'element_trash_button',
+					onClick: function() {
+						Alchemy.openTrashWindow(<%= @page.id %>, '<%= t("Trash") -%>');
+					}
+				}
+			]
+		}, function() {
+			Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
+			Alchemy.ElementEditorSelector.init();
+			Alchemy.SelectBox('.element_editor select');
+			Alchemy.Tinymce.init(function() {
+				Alchemy.ElementDirtyObserver('#element_area');
+			});
+			jQuery('#cells').tabs();
+			jQuery('#cells').tabs('paging', { follow: true, followOnSelect: true } );
+		});
+	}
+
+	jQuery(document).ready(function($) {
+		var texts = {
+			title: '<%= t("Warning!") %>',
+			message: '<%= t("You have unsaved elements on this page. Do you really want to continue?") %>',
+			okLabel: '<%= t("Yes") %>',
+			cancelLabel: '<%= t("No") %>'
+		};
+		$('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
+			return Alchemy.checkPageDirtyness(this, texts);
+		});
+		Alchemy.PageLeaveObserver(texts);
+		openElementsWindow();
+		openPreviewWindow();
+	});
+
+</script>
+<%- end -%>