alchemy_cms 2.1.beta1 → 2.1.beta5

data/app/views/{admin → alchemy/admin}/layoutpages/_layoutpage.html.erb

@@ -3,57 +3,57 @@
     <div class="sitemap_left_images">
       <span class="site_status <%= layoutpage.level > 1 ? 'handle' : nil %> tooltip html_tooltip_<%= layoutpage.id %><%= layoutpage.locked ? ' locked' : '' %>" ></span>
       <div id="tooltip_<%= layoutpage.id %>" style="display: none;">
-        <h1><%= _("page_type") %>: <%= layoutpage.layout_display_name %></h1>
+        <h1><%= t("page_type") %>: <%= layoutpage.layout_display_name %></h1>
         <p>
           <%= layoutpage.humanized_status %>
         </p>
         <p>
-          <strong><%= _("created_at") %>:</strong><br />
+          <strong><%= t("created_at") %>:</strong>
           <%= l(layoutpage.created_at) %> von <%= layoutpage.creator %>
         </p>
         <p>
-          <strong><%= _("updated_at") %>:</strong><br />
+          <strong><%= t("updated_at") %>:</strong>
           <%= l(layoutpage.updated_at) %> durch <%= layoutpage.updater %>
         </p>
         <%- if layoutpage.locked? -%>
         <p>
-          <%= _("currently_edited_by") %>: <span style="font-weight: bold;"><%= layoutpage.current_editor %></span>
+          <%= t("currently_edited_by") %>: <span style="font-weight: bold;"><%= layoutpage.current_editor %></span>
         </p>
         <%- end -%>
       </div>
     </div>
     <div class="sitemap_right_tools">
-      <%- 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(layoutpage),
+        alchemy.configure_admin_page_path(layoutpage),
         {
-          :title => _('edit_page_properties'),
+          :title => t('edit_page_properties'),
           :size => '340x150'
         },
         :class => '',
-        :title => _('edit_page_properties')
+        :title => t('edit_page_properties')
       ) -%>
       <%- end -%>
-      <%- permitted_to?([:new, :destroy, :copy], :admin_pages) do -%>
+      <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
       <span class="sitemap_sitetools">
-        <%- permitted_to?(:copy, :admin_pages) do -%>
+        <%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
         <%= link_to(
           render_icon("copy_page"),
-          insert_admin_clipboard_path(
-            :remarkable_type => layoutpage.class.to_s,
+          alchemy.insert_admin_clipboard_path(
+            :remarkable_type => layoutpage.class.name.demodulize.underscore,
             :remarkable_id => layoutpage.id
           ),
           :remote => true,
           :method => :post,
           :class => "",
-          :title => _("copy_page")
+          :title => t("copy_page")
         ) %>
         <%- end -%>
-        <%- 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',
@@ -61,7 +61,7 @@
           ),
           {
             :class => "",
-            :title => _("delete_page")
+            :title => t("delete_page")
           }
         ) -%>
         <%- end -%>
@@ -71,8 +71,8 @@
     <div class="sitemap_sitename">
       <%= link_to(
         layoutpage.name,
-        edit_admin_page_path(layoutpage),
-        :title => _("edit_page"),
+        alchemy.edit_admin_page_path(layoutpage),
+        :title => t("edit_page"),
         :class => "sitemap_pagename_link #{cycle('even', 'odd')}"
       ) -%>
     </div>

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

@@ -0,0 +1,65 @@
+<%- content_for(:subnav_additions) do -%>
+<%- unless @locked_pages.blank? -%>
+<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_for(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">
+		<%= select_tag(
+			'language', 
+			options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
+			:onchange => %(
+				Alchemy.pleaseWaitOverlay();
+				jQuery.get('/admin/pages/switch_language', {
+					language_id: this.value,
+					layoutpages: true
+				});
+			)
+		) %>
+		<label><%= t("Language tree") %></label>
+	</div>
+	<%= 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 %>
+</ul>

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

@@ -1,6 +1,6 @@
 <div id="overlay_tab_contactform_link">
   <h2>
-    <%= _("please enter subject and mail address") %>
+    <%= t("please enter subject and mail address") %>
   </h2>
   <table class="window_form">
     <%= hidden_field_tag(
@@ -12,7 +12,7 @@
     ) %>
     <tr>
       <td class="label">
-        <label for="contactform_subject" class="medium"><%= _("subject") %></label>
+        <label for="contactform_subject" class="medium"><%= t("subject") %></label>
       </td>
       <td class="input">
         <%= text_field_tag "contactform_subject", {}, :class => "thin_border auto_resize" %>
@@ -20,7 +20,7 @@
     </tr>
     <tr>
       <td class="label">
-        <label for="contactform_mailto" class="medium"><%= _("mail_to") %></label>
+        <label for="contactform_mailto" class="medium"><%= t("mail_to") %></label>
       </td>
       <td class="input">
         <%= select_tag(
@@ -33,7 +33,7 @@
     <tr>
       <td class="label">
         <label for="contactform_body" class="medium">
-          <%= _("contactform_body") %>
+          <%= t("contactform_body") %>
         </label>
       </td>
       <td class="input">
@@ -43,7 +43,7 @@
     <tr>
       <td class="label">
         <label for="contactform_link_title" class="medium">
-          <%= _("link_title") %>
+          <%= t("link_title") %>
         </label>
       </td>
       <td class="input">
@@ -53,7 +53,7 @@
   </table>
   <p>
     <%= link_to_function(
-      _("apply"),
+      t("apply"),
       "Alchemy.LinkOverlay.createLink(
         'contact',
         jQuery('#contactform_url').val() + '?subject=' + encodeURIComponent(jQuery('#contactform_subject').val()) + '&mail_to=' + encodeURIComponent(jQuery('#contactform_mailto').val()) + '&body=' + encodeURIComponent(jQuery('#contactform_body').val()),

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

@@ -0,0 +1,38 @@
+<h1><%= t("language_does_not_exist") %></h1>
+<%- if @language -%>
+<%- if @languages_with_page_tree.size >= 1 -%>
+	<p><%= t("want_to_make_copy_of_existing_language") %></p>
+	<%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
+		<table style="width: 135px;">
+			<tr>
+				<td>
+					<%= select_tag("languages[old_lang_id]", options_for_select(@languages_with_page_tree.map{ |l| [l.name, l.id] }), :class => "medium_long") %>
+					<%= hidden_field_tag("languages[new_lang_id]", @language.id) %>
+				</td>
+				<td>
+					<%= 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" -%>
+<%- if @languages_with_page_tree.size >= 1 -%>
+<p>
+	<%= t("want_to_create_new_language") %>
+</p>
+<%- end -%>
+<%= form_for([:admin, Alchemy::Page.new], :remote => true) do |form| %>
+	<%= 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.submit 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>
+<%- end -%>

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

@@ -1,6 +1,6 @@
 <div id="overlay_tab_external_link">
   <h2>
-    <%= _("enter_external_link") %>
+    <%= t("enter_external_link") %>
   </h2>
   <table class="window_form">
     <tr>
@@ -18,27 +18,27 @@
         ) %>
       </td>
       <td class="input">
-        <%= text_field_tag 'external_url', {}, :class => "thin_border auto_resize" %>
+        <%= text_field_tag 'external_url', '', :class => "thin_border auto_resize" %>
       </td>
     </tr>
     <tr>
-      <td class="label">
-        <label for="extern_link_title" class="medium"><%= _("link_title") %></label>
+      <td class="label long">
+        <label for="extern_link_title"><%= t("link_title") %></label>
       </td>
-      <td class="input"><%= text_field_tag "extern_link_title", {}, :class => 'thin_border auto_resize link_title' %></td>
+      <td class="input"><%= text_field_tag "extern_link_title", '', :class => 'thin_border auto_resize link_title' %></td>
     </tr>
     <tr>
-      <td class="label">
-        <label for="link_target" class="very_long"><%= _("Open Link in") %>:</label>
+      <td class="label long">
+        <label for="link_target"><%= t("Open Link in") %>:</label>
       </td>
       <td>
-        <%= select_tag 'link_target', options_for_select(Page.link_target_options), :class => 'link_target' %>
+        <%= select_tag 'link_target', options_for_select(@link_target_options), :class => 'link_target medium' %>
       </td>
     </tr>
   </table>
   <p>
     <%= link_to_function(
-      _('apply'),
+      t('apply'),
       %(
         Alchemy.LinkOverlay.createLink(
           'external',

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

@@ -1,42 +1,42 @@
 <div id="overlay_tab_file_link">
   <h2>
-    <%= _("choose_file_to_link") %>
+    <%= t("choose_file_to_link") %>
   </h2>
   <table class="window_form">
     <tr>
-      <td class="label">
-        <label for="public_filename" class="medium"><%= _("file") %></label>
+      <td class="label long">
+        <label for="public_filename"><%= t("file") %></label>
       </td>
       <td class="select">
         <%= select_tag(
           "public_filename",
-          options_for_select(Attachment.all.collect{ |f| [f.name, download_attachment_path(:id => f.id, :name => f.name)] }),
-          :class => "very_long"
+          options_for_select(@attachments),
+          :class => "full_width"
         ) %>
       </td>
     </tr>
     <tr>
-      <td class="label">
-        <label for="file_link_title" class="medium">
-          <%= _("link_title") %>
+      <td class="label long">
+        <label for="file_link_title">
+          <%= t("link_title") %>
         </label>
       </td>
       <td class="input">
-        <%= text_field_tag "file_link_title", {}, :class => 'thin_border auto_resize link_title' %>
+        <%= text_field_tag "file_link_title", '', :class => 'thin_border auto_resize link_title' %>
       </td>
     </tr>
     <tr>
-      <td class="label">
-        <label for="file_link_target" class="very_long"><%= _("Open Link in") %>:</label>
+      <td class="label long">
+        <label for="file_link_target"><%= t("Open Link in") %>:</label>
       </td>
       <td>
-        <%= select_tag 'file_link_target', options_for_select(Page.link_target_options), :class => 'link_target' %>
+        <%= select_tag 'file_link_target', options_for_select(@link_target_options), :class => 'link_target medium' %>
       </td>
     </tr>
   </table>
   <p>
     <%= link_to_function(
-      _("apply"),
+      t("apply"),
       %(
         Alchemy.LinkOverlay.createLink(
           'file',

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

@@ -1,5 +1,5 @@
 <div id="overlay_tab_internal_link">
-  <h2><%= _("internal_link_headline") %></h2>
+  <h2><%= t("internal_link_headline") %></h2>
   <table class="window_form">
     <tr>
       <td colspan="2">
@@ -11,19 +11,19 @@
       </td>
     </tr>
     <tr>
-      <td class="label">
-        <label for="internal_link_title" class="medium"><%= _('Title') %>:</label>
+      <td class="label long">
+        <label for="internal_link_title"><%= t('Title') %>:</label>
       </td>
       <td class="input">
-        <%= text_field_tag "internal_link_title", {}, :class => 'thin_border auto_resize link_title' %>
+        <%= text_field_tag "internal_link_title", '', :class => 'thin_border auto_resize link_title' %>
       </td>
     </tr>
     <tr>
-      <td class="label">
-        <label for="internal_link_target" class="very_long"><%= _("Open Link in") %>:</label>
+      <td class="label long">
+        <label for="internal_link_target"><%= t("Open Link in") %>:</label>
       </td>
       <td>
-        <%= select_tag 'internal_link_target', options_for_select(Page.link_target_options), :class => 'link_target' %>
+        <%= select_tag 'internal_link_target', options_for_select(@link_target_options), :class => 'link_target medium' %>
       </td>
     </tr>
   </table>
@@ -31,7 +31,7 @@
     <%= hidden_field_tag( "internal_urlname" ) %>
     <%= hidden_field_tag( "page_anchor" ) %>
     <%= link_to_function(
-      _("apply"),
+      t("apply"),
       %(
         Alchemy.LinkOverlay.createLink(
           'internal',

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

@@ -4,25 +4,25 @@
 	<div id="errors" style="display:none"></div>
 	<table id="new_page_form">
 		<tr>
-			<td class="label very_long">
-				<%= f.label(:page_layout, _("Page|Page layout")) %>
+			<td class="label">
+				<%= f.label :page_layout %>
 			</td>
-			<td class="input">
+			<td class="select">
 				<%= f.select('page_layout', @page_layouts, {}, :class => 'long') %>
 			</td>
 		</tr>
 		<tr>
 			<td class="label">
-				<%= f.label(:name, _("Page|Name")) %>
+				<%= f.label :name %>
 			</td>
 			<td class="input">
-				<%= f.text_field(:name, :class => "thin_border long") %>
+				<%= f.text_field(:name, :class => "thin_border") %>
 			</td>
 		</tr>
 		<tr>
 			<td class="label">&nbsp;</td>
 			<td class="submit">
-				<%= f.button _("create"), :class => 'button', :name => nil %>
+				<%= f.button t("create"), :class => 'button', :name => nil %>
 			</td>
 		</tr>
 	</table>

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

@@ -4,58 +4,58 @@
       <%= sitemapFolderLink(page) unless page.children.blank? || @sorting %>
       <span class="site_status <%= @sorting ? 'handle' : nil %> tooltip"></span>
       <div class="tooltip_content" style="display: none;">
-        <h1><%= _("page_type") %>: <%= page.layout_display_name %></h1>
+        <h1><%= t("page_type") %>: <%= page.layout_display_name %></h1>
         <p>
           <%= page.humanized_status %>
         </p>
         <p>
-          <strong><%= _("created_at") %>:</strong><br />
+          <strong><%= t("created_at") %>:</strong>
           <%= l(page.created_at) %> von <%= page.creator %>
         </p>
         <p>
-          <strong><%= _("updated_at") %>:</strong><br />
+          <strong><%= t("updated_at") %>:</strong>
           <%= l(page.updated_at) %> durch <%= page.updater %>
         </p>
         <%- if page.locked? -%>
         <p>
-          <%= _("currently_edited_by") %>: <span style="font-weight: bold;"><%= page.current_editor %></span>
+          <%= 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, :admin_pages) do -%>
+      <%- permitted_to?(:configure, :alchemy_admin_pages) do -%>
       <%= link_to_overlay_window(
         render_icon('configure_page'),
-        configure_admin_page_path(page),
+        alchemy.configure_admin_page_path(page),
         {
-          :title => _('edit_page_properties'),
-          :size => page.redirects_to_external? ? '390x270' : '390x580'
+          :title => t('edit_page_properties'),
+          :size => page.redirects_to_external? ? '410x270' : '410x620'
         },
         :class => '',
-        :title => _('edit_page_properties')
+        :title => t('edit_page_properties')
       ) -%>
       <%- end -%>
-      <%- permitted_to?([:new, :destroy, :copy], :admin_pages) do -%>
+      <%- permitted_to?([:new, :destroy, :copy], :alchemy_admin_pages) do -%>
       <span class="sitemap_sitetools">
-        <%- permitted_to?(:copy, :admin_pages) do -%>
+        <%- permitted_to?(:copy, :alchemy_admin_pages) do -%>
         <%= link_to(
           render_icon("copy_page"),
-          insert_admin_clipboard_path(
-            :remarkable_type => page.class.to_s,
+          alchemy.insert_admin_clipboard_path(
+            :remarkable_type => page.class.name.demodulize.underscore,
             :remarkable_id => page.id
           ),
           :remote => true,
           :method => :post,
           :class => "",
-          :title => _("copy_page")
+          :title => t("copy_page")
         ) %>
         <%- end -%>
-        <%- 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',
@@ -63,21 +63,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.id),
+          alchemy.new_admin_page_path(:parent_id => page.id),
           {
-            :title => _('create_page'),
-            :size => '405x150',
+            :title => t('create_page'),
+            :size => '340x150',
             :overflow => true
           },
           :class => '',
-          :title => _('create_page')
+          :title => t('create_page')
         ) -%>
         <%- end -%>
       </span>
@@ -91,7 +91,7 @@
     <%- if page.redirects_to_external? -%>
       <span class="sitemap_pagename_link <%= cycle('even', 'odd') %> inactive"><%= page.name %></span>
       <span class="redirect_url">
-        &raquo; <%= _('Redirects to') %>:
+        &raquo; <%= t('Redirects to') %>:
         <%= h page.urlname %>
       </span>
     <%- else -%>
@@ -99,8 +99,8 @@
       <%= link_to_unless(
         @sorting,
         page.name,
-        edit_admin_page_path(page),
-        :title => _("edit_page"),
+        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 -%>