alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,4 +1,4 @@
 (function($) {
-	$('#page_<%= @page.id -%>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
-	Alchemy.Tooltips();
+  $('#page_<%= @page.id -%>').replaceWith('<%= escape_javascript(render(:partial => "page", :locals => {:page => @page})) -%>');
+  Alchemy.Tooltips();
 })(jQuery);

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

@@ -3,16 +3,16 @@
 <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_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 %>
+  <%= 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 -%>
@@ -20,66 +20,66 @@
 
 <%- content_for :toolbar do -%>
 <div id="toolbar_buttons">
-	<%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
-	<%- permitted_to?(:flush, :alchemy_admin_pages) do -%>
-	<div class="button_with_label">
-		<%= link_to(
-			render_icon('flush'),
-			alchemy.flush_admin_pages_path,
-			:remote => true,
-			:method => :post,
-			:class => 'icon_button please_wait',
-			:title => t('Flush page cache')
-		) -%>
-		<label><%= t('Flush page cache') %></label>
-	</div>
-	<%- end -%>
-	<%- permitted_to?(:sort, :alchemy_admin_pages) do -%>
-	<div class="button_with_label" id="page_sorting_button">
-		<%= link_to(
-			render_icon('sort'),
-			alchemy.sort_admin_pages_path,
-			:complete => '',
-			:method => :get,
-			:remote => true,
-			:class => 'icon_button please_wait',
-			:title => t('Sort pages')
-		) -%>
-		<label><%= t('Sort pages') %></label>
-	</div>
-	<%- end -%>
-	<div class="button_with_label" id="clipboard_button">
-		<%= link_to_overlay_window(
-			render_icon("clipboard#{clipboard_empty?('pages') ? '' : ' full'}"),
-			alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
-			{
-				:title => t('Clipboard'),
-				:size => '380x270'
-			},
-			:class => 'icon_button',
-			:title => t('Show clipboard')
-		) -%>
-		<label><%= t('Show clipboard') %></label>
-	</div>
+  <%= render :partial => 'alchemy/admin/partials/language_tree_select' %>
+  <%- permitted_to?(:flush, :alchemy_admin_pages) do -%>
+  <div class="button_with_label">
+    <%= link_to(
+      render_icon('flush'),
+      alchemy.flush_admin_pages_path,
+      :remote => true,
+      :method => :post,
+      :class => 'icon_button please_wait',
+      :title => t('Flush page cache')
+    ) -%>
+    <label><%= t('Flush page cache') %></label>
+  </div>
+  <%- end -%>
+  <%- permitted_to?(:sort, :alchemy_admin_pages) do -%>
+  <div class="button_with_label" id="page_sorting_button">
+    <%= link_to(
+      render_icon('sort'),
+      alchemy.sort_admin_pages_path,
+      :complete => '',
+      :method => :get,
+      :remote => true,
+      :class => 'icon_button please_wait',
+      :title => t('Sort pages')
+    ) -%>
+    <label><%= t('Sort pages') %></label>
+  </div>
+  <%- end -%>
+  <div class="button_with_label" id="clipboard_button">
+    <%= link_to_overlay_window(
+      render_icon("clipboard#{clipboard_empty?('pages') ? '' : ' full'}"),
+      alchemy.admin_clipboard_path(:remarkable_type => 'pages'),
+      {
+        :title => t('Clipboard'),
+        :size => '380x270'
+      },
+      :class => 'icon_button',
+      :title => t('Show clipboard')
+    ) -%>
+    <label><%= t('Show clipboard') %></label>
+  </div>
 </div>
 <%- end -%>
 
 <%- if @page_root -%>
 
 <h2 id="sitemap_heading">
-	<span class="page_name"><%= t('Name') %></span>
-	<span class="page_infos"><%= t('Status') %></span>
+  <span class="page_name"><%= t('Name') %></span>
+  <span class="page_infos"><%= t('Status') %></span>
 </h2>
 
 <div id="bottom_panel" style="display: none">
-	<div class="info">
-		<%= render_icon('info') %>
-		<%= t('explain_sitemap_dragndrop_sorting') %>
-	</div>
-	<div id="bottom_buttons">
-		<%= link_to( t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
-		<%= submit_tag( t('save order'), :id => 'save_page_order', :class => 'button' ) %>
-	</div>
+  <div class="info">
+    <%= render_icon('info') %>
+    <%= t('explain_sitemap_dragndrop_sorting') %>
+  </div>
+  <div id="bottom_buttons">
+    <%= link_to( t('cancel'), alchemy.admin_pages_path, :class => 'button' ) %>&nbsp;
+    <%= submit_tag( t('save order'), :id => 'save_page_order', :class => 'button' ) %>
+  </div>
 </div>
 
 <%= render :partial => 'sitemap' %>
@@ -89,11 +89,11 @@
 <%= render :partial => 'create_language_form' %>
 <% content_for(:javascripts) do %>
 <script type="text/javascript">
-	jQuery(document).ready(function($) {
-		$('#create_language_tree_form').dialog({modal: true, width: 360, close: function() {
-			$(this).appendTo('#archive_all').show().removeClass().removeAttr('style');
-		}});
-	});
+  jQuery(document).ready(function($) {
+    $('#create_language_tree_form').dialog({modal: true, width: 360, close: function() {
+      $(this).appendTo('#archive_all').show().removeClass().removeAttr('style');
+    }});
+  });
 </script>
 <%- end -%>
 

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

@@ -1,3 +1,3 @@
 <div>
-	<p><%= t("page_locked") %></p>
+  <p><%= t("page_locked") %></p>
 </div>

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

@@ -2,49 +2,49 @@
 <%= render :partial => 'new_page_form' %>
 <%- else -%>
 <div id="overlay_tabs">
-	<ul>
-		<li><a href="#create_page_tab"><%= t('New page') %></a></li>
-		<li><a href="#paste_page_tab"><%= t('Paste from clipboard') %></a></li>
-	</ul>
-	<div id="errors" style="display:none"></div>
-	<div id="create_page_tab">
-		<%= render :partial => 'new_page_form' %>
-	</div>
-	<div id="paste_page_tab">
-		<%= form_for([:admin, @page], :remote => true, :html => {:id => 'paste_page_form'}) do |f| %>
-			<%= f.hidden_field(:parent_id) %>
-			<table id="new_page_form">
-				<tr>
-					<td class="label">
-						<label for="paste_from_clipboard"><%= t("Page") %></label>
-					</td>
-					<td class="select">
-						<%= clipboard_select_tag(@clipboard_items) %>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<%= f.label :name %>
-					</td>
-					<td class="input">
-						<%= f.text_field(:name, :size => 15, :class => "thin_border") %>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">&nbsp;</td>
-					<td class="submit">
-						<%= f.button t("paste"), :class => 'button', :name => nil %>
-					</td>
-				</tr>
-			</table>
-		<% end %>
-	</div>
+  <ul>
+    <li><a href="#create_page_tab"><%= t('New page') %></a></li>
+    <li><a href="#paste_page_tab"><%= t('Paste from clipboard') %></a></li>
+  </ul>
+  <div id="errors" style="display:none"></div>
+  <div id="create_page_tab">
+    <%= render :partial => 'new_page_form' %>
+  </div>
+  <div id="paste_page_tab">
+    <%= form_for([:admin, @page], :remote => true, :html => {:id => 'paste_page_form'}) do |f| %>
+      <%= f.hidden_field(:parent_id) %>
+      <table id="new_page_form">
+        <tr>
+          <td class="label">
+            <label for="paste_from_clipboard"><%= t("Page") %></label>
+          </td>
+          <td class="select">
+            <%= clipboard_select_tag(@clipboard_items) %>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">
+            <%= f.label :name %>
+          </td>
+          <td class="input">
+            <%= f.text_field(:name, :size => 15, :class => "thin_border") %>
+          </td>
+        </tr>
+        <tr>
+          <td class="label">&nbsp;</td>
+          <td class="submit">
+            <%= f.button t("paste"), :class => 'button', :name => nil %>
+          </td>
+        </tr>
+      </table>
+    <% end %>
+  </div>
 </div>
 <script type="text/javascript" charset="utf-8">
 
-	jQuery(function() {
-		jQuery("#overlay_tabs").tabs();
-	});
+  jQuery(function() {
+    jQuery("#overlay_tabs").tabs();
+  });
 
 </script>
 <%- end -%>

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

@@ -1,6 +1,6 @@
 (function($) {
-	$('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
-	$('#bottom_panel').show();
-	Alchemy.PageSorter.init();
-	Alchemy.pleaseWaitOverlay(false);
+  $('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
+  $('#bottom_panel').show();
+  Alchemy.PageSorter.init();
+  Alchemy.pleaseWaitOverlay(false);
 })(jQuery);

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

@@ -1,8 +1,8 @@
 (function($) {
-	$('#locked_page_<%= @page.id -%>').remove();
-	$('#page_<%= @page.id -%> .sitemap_page').removeClass('locked');
-	<%- if @pages_locked_by_user.blank? -%>
-	$('#subnav_additions label').hide();
-	<%- end -%>
-	Alchemy.growl('<%= flash[:notice] -%>');
+  $('#locked_page_<%= @page.id -%>').remove();
+  $('#page_<%= @page.id -%> .sitemap_page').removeClass('locked');
+  <%- if @pages_locked_by_user.blank? -%>
+  $('#subnav_additions label').hide();
+  <%- end -%>
+  Alchemy.growl('<%= flash[:notice] -%>');
 })(jQuery);

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

@@ -1,40 +1,40 @@
 (function($) {
 
-	Alchemy.closeCurrentWindow();
+  Alchemy.closeCurrentWindow();
 
-	<%- if @while_page_edit -%>
+  <%- if @while_page_edit -%>
 
-		Alchemy.reloadPreview();
-		$('#page_<%= @page.id -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
+    Alchemy.reloadPreview();
+    $('#page_<%= @page.id -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
 
-	<%- else -%>
+  <%- else -%>
 
-		$('#page_<%= @page.id -%> > .sitemap_page > .sitemap_sitename .sitemap_pagename_link').text('<%= @page.name -%>');
+    $('#page_<%= @page.id -%> > .sitemap_page > .sitemap_sitename .sitemap_pagename_link').text('<%= @page.name -%>');
 
-		<%- if @page.locked? && @page.locker == current_user -%>
+    <%- if @page.locked? && @page.locker == current_user -%>
 
-			$('#locked_page_<%= @page.id -%> > a').text('<%= @page.name -%>');
+      $('#locked_page_<%= @page.id -%> > a').text('<%= @page.name -%>');
 
-		<%- end -%>
+    <%- end -%>
 
-		$('#page_<%= @page.id -%>_infos').html('<%= escape_javascript(render(:partial => "page_infos", :locals => {:page => @page})) -%>');
+    $('#page_<%= @page.id -%>_infos').html('<%= escape_javascript(render(:partial => "page_infos", :locals => {:page => @page})) -%>');
 
-		<%- if @page.restricted? -%>
+    <%- if @page.restricted? -%>
 
-			$('#page_<%= @page.id -%> .page_status:nth-child(3)').addClass('restricted', 'not_restricted').removeClass('not_restricted');
+      $('#page_<%= @page.id -%> .page_status:nth-child(3)').addClass('restricted', 'not_restricted').removeClass('not_restricted');
 
-		<%- elsif @page.redirects_to_external? -%>
+    <%- elsif @page.redirects_to_external? -%>
 
-			$('#page_<%= @page.id -%> span.redirect_url').html('&raquo; <%= t("Redirects to") %>: <%= h @page.urlname %>');
+      $('#page_<%= @page.id -%> span.redirect_url').html('&raquo; <%= t("Redirects to") %>: <%= h @page.urlname %>');
 
-		<%- else -%>
+    <%- else -%>
 
-			$('#page_<%= @page.id -%> .page_status:nth-child(3)').addClass('not_restricted').removeClass('restricted');
+      $('#page_<%= @page.id -%> .page_status:nth-child(3)').addClass('not_restricted').removeClass('restricted');
 
-		<%- end -%>
+    <%- end -%>
 
-	<%- end -%>
+  <%- end -%>
 
-	Alchemy.growl("<%= @notice -%>");
+  Alchemy.growl("<%= @notice -%>");
 
 })(jQuery);

data/app/views/alchemy/admin/partials/_flash.html.erb

@@ -1,4 +1,4 @@
 <div class="flash <%= flash_type %>">
-	<%= render_icon(flash_type.to_s == 'notice' ? 'tick' : flash_type.to_s) %>
-	<%= message %>
+  <%= render_icon(flash_type.to_s == 'notice' ? 'tick' : flash_type.to_s) %>
+  <%= message %>
 </div>

data/app/views/alchemy/admin/partials/_flash_notices.html.erb

@@ -1,5 +1,5 @@
 <div id="flash_notices" style="display: <%= flash.keys.blank? ? "none" : "block" %>">
 <%- flash.keys.each do |flash_type| -%>
-	<%= render :partial => 'alchemy/admin/partials/flash', :locals => {:flash_type => flash_type, :message => flash[flash_type.to_sym]} %>
+  <%= render :partial => 'alchemy/admin/partials/flash', :locals => {:flash_type => flash_type, :message => flash[flash_type.to_sym]} %>
 <%- end -%>
 </div>

data/app/views/alchemy/admin/partials/_flash_upload.html.erb

@@ -0,0 +1,38 @@
+<div id="swf_upload_container" style="display: block">
+  <div id="spanButtonPlaceHolder">
+    <p>
+      <%= image_tag('alchemy/ajax_loader.gif', :style => 'width: 16px; height: 16px; top: 3px; position: relative') %>
+      <%= t('Please wait. Flash® is loading...') %>
+    </p>
+  </div>
+  <a href="#" class="button no-spinner" onclick="swfu.cancelQueue(); return false" style="display: none">
+    <%= t("swfupload.cancel_uploads") %>
+  </a>
+  <p style="margin-top: 8px" id="choose_alternative_uploader">
+    <small>
+      <%= raw t('If you have any problems using the Flash uploader you can switch to', :link => t('<a href="#" id="uploadswitcher">%{value}</a>', :value => t('regular method'))) %>
+    </small>
+  </p>
+</div>
+
+<h2 id="swfUploadFlashError" style="display: none"><%= t('Could not load Adobe Flash® Plugin!') %></h2>
+
+<div id="alternativeUpload" style="display: none">
+  <h2 id="flash_upload_error_explanation" style="display: none">
+    <%= t('Error with the Flash® Uploader!') %>
+  </h2>
+  <p><%= t('use_alternative_uploader_instead') %></p>
+  <p>
+    <%= file_field_tag('Filedata') %>
+  </p>
+  <p>
+    <%= submit_tag t('upload'), :class => 'button' %>
+  </p>
+  <p>
+    <small>
+      <a href="#" id="switch_to_flash_uploader" class="underline">
+        <%= t('Switch to Flash® Uploader') %>
+      </a>
+    </small>
+  </p>
+</div>

data/app/views/alchemy/admin/partials/_language_tree_select.html.erb

@@ -1,22 +1,22 @@
 <div class="button_with_label">
-	<%= select_tag(
-		'language', 
-		options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
-		:id => 'language_tree_select',
-		:class => 'alchemy_selectbox short'
-	) %>
-	<label><%= t("Language tree") %></label>
+  <%= select_tag(
+    'language',
+    options_for_select(@languages.map { |l| [l.name, l.id] }, session[:language_id]),
+    :id => 'language_tree_select',
+    :class => 'alchemy_selectbox short'
+  ) %>
+  <label><%= t("Language tree") %></label>
 </div>
 
 <% content_for :javascripts do %>
 <script type="text/javascript" charset="utf-8">
-	(function($) {
-		$('#language_tree_select').on('change', function() {
-			Alchemy.pleaseWaitOverlay();
-			$.get('<%= switch_language_admin_pages_path %>', {
-				language_id: this.value
-			});
-		});
-	})(jQuery);
+  (function($) {
+    $('#language_tree_select').on('change', function() {
+      Alchemy.pleaseWaitOverlay();
+      $.get('<%= switch_language_admin_pages_path %>', {
+        language_id: this.value
+      });
+    });
+  })(jQuery);
 </script>
 <% end %>

data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb

@@ -1,14 +1,14 @@
 <%- permitted_to? *navigate_module(navigation) do -%>
 
 <%= link_to url_for_module(alchemy_module), :class => main_navigation_css_classes(navigation) do %>
-	<%- if navigation["image"] -%>
-	<%= image_tag(navigation["image"]) %>
-	<%- elsif navigation["icon"] -%>
-	<span class="module icon <%= navigation["icon"] %>"></span>
-	<%- else -%>
-	<span class="module icon"></span>
-	<%- end -%>
-	<label><%= truncate t(navigation["name"]), :length => 10 -%></label>
+  <%- if navigation["image"] -%>
+  <%= image_tag(navigation["image"]) %>
+  <%- elsif navigation["icon"] -%>
+  <span class="module icon <%= navigation["icon"] %>"></span>
+  <%- else -%>
+  <span class="module icon"></span>
+  <%- end -%>
+  <label><%= truncate t(navigation["name"]), :length => 10 -%></label>
 <% end %>
 
 <%- end -%>