alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,3 +1,3 @@
 <ul id="sitemap" class="list">
-	<%= render :partial => 'page', :object => @page_root %>
+  <%= render :partial => 'page', :object => @page_root %>
 </ul>

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

@@ -1,71 +1,73 @@
 <%= 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>
+  <div id="errors" style="display: none"></div>
+  <table id="page_names">
+    <tr>
+      <td class="label"><%= t("page_type") %>: </td>
+      <td class="value long"><p><%= @page.layout_display_name %></p></td>
+    </tr>
+    <%- unless @page.layoutpage -%>
+    <tr>
+      <td class="label"><%= t("page_status") %>: </td>
+      <td class="checkbox long">
+        <%= 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 long">
+        <%= 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/>
+      </td>
+    </tr>
+    <%- end -%>
+    <tr>
+      <td colspan="2" align="right"><%= f.button t("save"), :class => 'button' %></td>
+    </tr>
+  </table>
+  <p class="foot_note">
+    *<%= t('pages.update.comma_seperated') %>
+  </p>
 <% end %>

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

@@ -1,40 +1,40 @@
 <%= form_for([:admin, @page], :remote => true) do |f| %>
-	<div id="errors" style="display:none"></div>
-	<table id="page_names">
-		<tr>
-			<td><%= t("page_type") %>: </td>
-			<td>
-			  <%= @page.layout_display_name %>
-			</td>
-		</tr>
-		<tr>
-			<td><%= t("page_status") %>: </td>
-			<td>
-				<%= f.check_box :visible -%>
-				<%= f.label :visible %><br/>
-				<%- if configuration(:sitemap)[:show_flag] -%><br/>
-					<%= f.check_box :sitemap -%>
-					<%= f.label :sitemap %>
-				<%- end -%>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2"><strong><%= t("names") %></strong></td>
-		</tr>
-		<tr>
-			<td><%= f.label "name" %>:&nbsp;</td>
-			<td><%= f.text_field( "name", :size => 31, :class => "thin_border long") %></td>
-		</tr>
-		<tr>
-			<td><%= f.label "urlname" %>: </td>
-			<td><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
-		</tr>
-		<tr>
-			<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 t("save"), :class => 'button' %></td>
-		</tr>
-	</table>
+  <div id="errors" style="display:none"></div>
+  <table id="page_names">
+    <tr>
+      <td><%= t("page_type") %>: </td>
+      <td>
+        <%= @page.layout_display_name %>
+      </td>
+    </tr>
+    <tr>
+      <td><%= t("page_status") %>: </td>
+      <td>
+        <%= f.check_box :visible -%>
+        <%= f.label :visible %><br/>
+        <%- if configuration(:sitemap)[:show_flag] -%><br/>
+          <%= f.check_box :sitemap -%>
+          <%= f.label :sitemap %>
+        <%- end -%>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2"><strong><%= t("names") %></strong></td>
+    </tr>
+    <tr>
+      <td><%= f.label "name" %>:&nbsp;</td>
+      <td><%= f.text_field( "name", :size => 31, :class => "thin_border long") %></td>
+    </tr>
+    <tr>
+      <td><%= f.label "urlname" %>: </td>
+      <td><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
+    </tr>
+    <tr>
+      <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 t("save"), :class => 'button' %></td>
+    </tr>
+  </table>
 <% end %>

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

@@ -1,12 +1,12 @@
 (function($) {
-	$('#locked_page_<%= @page_id -%>').remove();
-	<%- if @layoutpage -%>
-	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('<%= alchemy.admin_pages_path -%>');
-	<%- end -%>
+  $('#locked_page_<%= @page_id -%>').remove();
+  <%- if @layoutpage -%>
+  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('<%= alchemy.admin_pages_path -%>');
+  <%- end -%>
 })(jQuery);

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

@@ -1,94 +1,94 @@
 <% content_for(:title) { @page.name } -%>
 
 <%- content_for(:subnav_additions) do -%>
-	<label><%= t('Active Pages') %> &raquo;</label>
-	<%- @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 -%>
+  <label><%= t('Active Pages') %> &raquo;</label>
+  <%- @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 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'),
-			"Alchemy.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'),
-			"Alchemy.openElementsWindow()",
-			{
-				:title => t('Show Elements Window'),
-				:class => 'icon_button'
-			}
-		) %>
-		<label><%= t('Show Elements Window') %></label>
-	</div>
+  <div class="button_with_label" id="show_preview_window">
+    <%= link_to_function(
+      render_icon('preview_window'),
+      "Alchemy.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'),
+      "Alchemy.openElementsWindow()",
+      {
+        :title => t('Show Elements Window'),
+        :class => 'icon_button'
+      }
+    ) %>
+    <label><%= t('Show Elements Window') %></label>
+  </div>
 </div>
 <%- end -%>
 
@@ -96,91 +96,91 @@
 <%= tinymce_javascript_tags %>
 <script type="text/javascript" charset="utf-8">
 
-	Alchemy.openPreviewWindow = function() {
-		Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= t("Page Preview") -%>');
-	}
+  Alchemy.openPreviewWindow = function() {
+    Alchemy.PreviewWindow.init('<%= admin_page_url(@page) %>', '<%= t("Page Preview") -%>');
+  }
 
-	Alchemy.openElementsWindow = function() {
-		Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(:page_id => @page.id) -%>', {
-			texts: {
-				title: '<%= t("Elements") -%>',
-				dirtyTitle: '<%= t("Warning!") -%>',
-				dirtyMessage: '<%= t(:element_dirty_close_window_notice) -%>',
-				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 } );
-		});
-	}
+  Alchemy.openElementsWindow = function() {
+    Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(:page_id => @page.id) -%>', {
+      texts: {
+        title: '<%= t("Elements") -%>',
+        dirtyTitle: '<%= t("Warning!") -%>',
+        dirtyMessage: '<%= t(:element_dirty_close_window_notice) -%>',
+        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(:element_dirty_page_leave_warning) %>',
-			okLabel: '<%= t("Yes") %>',
-			cancelLabel: '<%= t("No") %>'
-		};
-		$('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
-			var not_dirty = Alchemy.checkPageDirtyness(this, texts);
-			if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
-			return not_dirty;
-		});
-		Alchemy.PageLeaveObserver(texts);
-		Alchemy.openElementsWindow();
-		Alchemy.openPreviewWindow();
-	});
+  jQuery(document).ready(function($) {
+    var texts = {
+      title: '<%= t("Warning!") %>',
+      message: '<%= t(:element_dirty_page_leave_warning) %>',
+      okLabel: '<%= t("Yes") %>',
+      cancelLabel: '<%= t("No") %>'
+    };
+    $('#unlock_page_form, #visit_page_form, #publish_page_form').on('submit', function(event) {
+      var not_dirty = Alchemy.checkPageDirtyness(this, texts);
+      if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
+      return not_dirty;
+    });
+    Alchemy.PageLeaveObserver(texts);
+    Alchemy.openElementsWindow();
+    Alchemy.openPreviewWindow();
+  });
 
 </script>
 <%- end -%>