alchemy_cms 2.1.beta1 → 2.1.beta5

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

@@ -0,0 +1,2 @@
+Alchemy.growl('<%= t("Page cache flushed") -%>');
+Alchemy.pleaseWaitOverlay(false);

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

@@ -0,0 +1,104 @@
+<%- 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_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">
+		<%= 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
+				});
+			),
+			:class => 'short'
+		) %>
+		<label><%= t("Language tree") %></label>
+	</div>
+	<%- 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>
+</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>
+
+<%= render :partial => 'sitemap' %>
+
+<%- else -%>
+
+<%= render :partial => 'create_language_form' %>
+
+<%- end -%>

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

@@ -1,10 +1,10 @@
 <div id="overlay_tabs">
   <ul>
-    <li><a href="#overlay_tab_internal_link"><%= _('link_overlay_tab_label.internal') %></a></li>
-    <li><a href="#overlay_tab_external_link"><%= _('link_overlay_tab_label.external') %></a></li>
-    <li><a href="#overlay_tab_file_link"><%= _('link_overlay_tab_label.file') %></a></li>
+    <li><a href="#overlay_tab_internal_link"><%= t('link_overlay_tab_label.internal') %></a></li>
+    <li><a href="#overlay_tab_external_link"><%= t('link_overlay_tab_label.external') %></a></li>
+    <li><a href="#overlay_tab_file_link"><%= t('link_overlay_tab_label.file') %></a></li>
     <%- if configuration(:mailer)[:contactform_linking] -%>
-    <li><a href="#overlay_tab_contactform_link"><%= _('link_overlay_tab_label.contactform') %></a></li>
+    <li><a href="#overlay_tab_contactform_link"><%= t('link_overlay_tab_label.contactform') %></a></li>
     <%- end -%>
   </ul>
   <div class="with_padding">

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

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

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

@@ -3,8 +3,8 @@
 <%- else -%>
 <div id="overlay_tabs">
 	<ul>
-		<li><a href="#create_page_tab"><%= _('New page') %></a></li>
-		<li><a href="#paste_page_tab"><%= _('Paste from clipboard') %></a></li>
+		<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">
@@ -15,25 +15,25 @@
 			<%= f.hidden_field(:parent_id) %>
 			<table id="new_page_form">
 				<tr>
-					<td class="label very_long">
-						<label for="paste_from_clipboard"><%= _("Page") %></label>
+					<td class="label">
+						<label for="paste_from_clipboard"><%= t("Page") %></label>
 					</td>
-					<td class="input">
+					<td class="select">
 						<%= clipboard_select_tag(@clipboard_items, :class => 'long') %>
 					</td>
 				</tr>
 				<tr>
 					<td class="label">
-						<%= f.label(:name, _("Name")) %>
+						<%= f.label :name %>
 					</td>
 					<td class="input">
-						<%= f.text_field(:name, :size => 15, :class => "thin_border long") %>
+						<%= f.text_field(:name, :size => 15, :class => "thin_border") %>
 					</td>
 				</tr>
 				<tr>
 					<td class="label">&nbsp;</td>
 					<td class="submit">
-						<%= f.button _("paste"), :class => 'button', :name => nil %>
+						<%= f.button t("paste"), :class => 'button', :name => nil %>
 					</td>
 				</tr>
 			</table>

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

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

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

@@ -5,11 +5,11 @@
 	<%- if @while_page_edit -%>
 	
 		Alchemy.reloadPreview();
-		$('#<%= dom_id(@page) -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
+		$('#page_<%= @page.id -%>_status').replaceWith('<%= escape_javascript(render(:partial => "page_status")) -%>');
 	
 	<%- else -%>
-	
-		$('#<%= dom_id(@page) -%> > .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 -%>
 			$('#locked_page_<%= @page.id -%> > a').text('<%= @page.name -%>');
@@ -19,11 +19,11 @@
 		
 		<%- if @page.restricted? -%>
 		
-			$('#<%= dom_id(@page) -%> .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');
 			
 		<%- else -%>
 		
-			$('#<%= dom_id(@page) -%> .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 -%>

data/app/views/{admin → 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 => '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/_main_navigation_entry.html.erb

@@ -0,0 +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>
+<% end %>
+
+<%- end -%>

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

@@ -0,0 +1,5 @@
+<%= will_paginate(
+	items,
+	:previous_label => '&laquo; ' + t('pagination.previous_page'),
+	:next_label => t('pagination.next_page') + ' &raquo;'
+) %>

data/app/views/{admin → alchemy/admin}/partials/_remote_pagination_links.html.erb

@@ -1,8 +1,8 @@
 <%- if items.respond_to?(:total_pages) -%>
   <%= will_paginate(
     items,
-    :previous_label => '&laquo; ' + _('pagination.previous_page'),
-    :next_label => _('pagination.next_page') + ' &raquo;',
+    :previous_label => '&laquo; ' + t('pagination.previous_page'),
+    :next_label => t('pagination.next_page') + ' &raquo;',
     :renderer => 'Alchemy::RemotePaginationLinkRenderer',
     :remote => true
   ) %>

data/app/views/{admin → alchemy/admin}/partials/_remote_search_form.html.erb

@@ -30,9 +30,9 @@
 			:remote => true,
 			:class => "search_field_clear",
 			:id => "search_field_clear",
-			:title => _("click_to_show_all"),
+			:title => t("click_to_show_all"),
 			:style => (params[:query].nil? ? "display: none" : "display: block")
 		) %>
 	</div>
-	<%= submit_tag _('search'), :name => nil, :class => 'button' %>
+	<%= submit_tag t('search'), :name => nil, :class => 'button' %>
 <% end %>

data/app/views/{admin → alchemy/admin}/partials/_search_form.html.erb

@@ -1,17 +1,16 @@
-<%= form_tag({:action => 'index'}, :method => :get) do %>
+<%- url ||= url_for(:action => 'index') -%>
+<%= form_tag(url, :method => :get) do %>
 	<div class="search_field">
 		<%= render_icon('search') %>
 		<%= text_field_tag("query", params['query'], :class => 'thin_border', :id => "search_input_field") %>
 		<%= link_to(
 				"",
-				url_for(
-					:action => :index
-				),
+				url,
 				:class => "search_field_clear",
 				:id => "search_field_clear",
-				:title => _("click_to_show_all"),
+				:title => t("click_to_show_all"),
 				:style => (params[:query].nil? ? "display: none" : "display: block")
 			) %>
-	</div><br />
-	<label><%= _('search') %></label>
+	</div>
+	<label><%= t('search') %></label>
 <% end %>

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

@@ -0,0 +1,8 @@
+<%- entries.each do |entry| -%>
+	<%- entry.stringify_keys! -%>
+	<%- permitted_to?(*navigate_module(entry)) do -%>
+	<div class="subnavi_tab<%= params[:controller] == entry["controller"].gsub(/^\//, '') && params[:action] == entry["action"] ? ' active' : nil %>">
+		<%= link_to t(entry["name"]), url_for_module_sub_navigation(entry) %>
+	<%- end -%>
+	</div>
+<%- end -%>

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

@@ -0,0 +1,129 @@
+<div class="info">
+	<%= render_icon('info') %>
+	<p><%= t('explain_upload.intro', :name => item_type) %>:</p>
+	<ol>
+		<li><%= t('explain_upload.step1', :name => item_type) %></li>
+		<li><%= t('explain_upload.step2', :name => item_type) %>*</li>
+		<li><%= t('explain_upload.step3') %></li>
+	</ol>
+	<small>*<%= t('explain_upload.footnote', :name => item_type) %></small>
+</div>
+<div id="swf_upload_container">
+	<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>
+	<button class="button" onclick="swfu.cancelQueue(); return false" style="display: none">
+		<%= t("swfupload.cancel_uploads") %>
+	</button>
+</div>
+<%- if file_types.first == '*' -%>
+<p><%= t('You may upload any file') %></p>
+<%- else -%>
+<p><%= t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
+<%- end -%>
+<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>
+<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>
+<div id="SWFUploadStatus" style="display: none" class="info">
+	<%= render_icon('info') %>
+</div>
+<div id="uploadProgressContainer"></div>
+
+<%- post_params = {
+	:query => params[:query] || '',
+	:page => 1,
+	:per_page => params[:per_page],
+	:while_assigning => @while_assigning ? "true" : "false",
+	:content_id => @content.blank? ? nil : @content.id,
+	:element_id => @element.blank? ? nil : @element.id,
+	:size => @size,
+	:options => @options.to_param
+}.delete_if { |k,v| v.nil? }.to_json -%>
+
+<script type='text/javascript'>
+	try {
+		var swfu = new SWFUpload({
+			flash_url: "<%= asset_path('swfupload/swfupload.swf') %>",
+			flash9_url: "<%= asset_path('swfupload/swfupload.swf') %>",
+			upload_url: '<%= new_asset_path_with_session_information(model_name) %>',
+			post_params: <%= post_params.html_safe %>,
+			file_size_limit: "<%= configuration(:uploader)[:file_size_limit] || 100 -%> MB",
+			file_types: '<%= file_types.map{ |f| "*.#{f}" }.join(";") %>',
+			file_types_description: "<%= file_types_description %>",
+			file_upload_limit: <%= configuration(:uploader)[:upload_limit] || 50 -%>,
+			file_queue_limit: 0,
+			custom_settings: {
+				language: "<%= ::I18n.locale || 'en' %>"
+			},
+			debug: false,
+			button_image_url: "<%= image_path('alchemy/swfupload/browse_button.png') %>",
+			button_width: "120",
+			button_height: "25",
+			button_placeholder_id: "spanButtonPlaceHolder",
+			button_text: "<span class='swfButtonText'><%= t('browse') %></span>",
+			button_text_style: '.swfButtonText {font-size: 11px; font-family: "Lucida Grande", Arial, sans-serif; text-align: center; color: #333333; height: 25px; padding-left: 8px; padding-right: 8px; padding-bottom: 3px; padding-top: 5px}',
+			button_text_left_padding: 0,
+			button_text_top_padding: 4,
+			swfupload_load_failed_handler: function () {
+				jQuery('#swf_upload_container').hide();
+				jQuery('#choose_alternative_uploader').hide();
+				jQuery('#switch_to_flash_uploader').hide();
+				jQuery('#swfUploadFlashError').show();
+				jQuery('#alternativeUpload').show();
+			},
+			swfupload_loaded_handler : Alchemy.SWFUpload.init,
+			file_queued_handler : Alchemy.SWFUpload.fileQueued,
+			file_queue_error_handler : Alchemy.SWFUpload.fileQueueError,
+			file_dialog_complete_handler : Alchemy.SWFUpload.fileDialogComplete,
+			upload_start_handler : Alchemy.SWFUpload.uploadStart,
+			upload_progress_handler : Alchemy.SWFUpload.uploadProgress,
+			upload_error_handler : Alchemy.SWFUpload.uploadError,
+			upload_success_handler : Alchemy.SWFUpload.uploadSuccess,
+			queue_complete_handler : Alchemy.SWFUpload.queueComplete
+		});
+		swfu.window_mode = "opaque";
+	} catch(err) {
+		Alchemy.debug(err);
+		jQuery('#swf_upload_container').hide();
+		jQuery('#choose_alternative_uploader').hide();
+		jQuery('#alternativeUpload').show();
+		jQuery('#flash_upload_error_explanation').show();
+	};
+	(function($) {
+		$('#uploadswitcher').click(function() {
+			$('#choose_alternative_uploader').hide();
+			$('#alternativeUpload').show();
+			$('object.swfupload').hide();
+		});
+		$('#switch_to_flash_uploader').click(function() {
+			$('#choose_alternative_uploader').show();
+			$('#alternativeUpload').hide();
+			$('object.swfupload').show();
+		});
+	})(jQuery);
+</script>

data/app/views/{admin → alchemy/admin}/pictures/_archive_overlay.html.erb

@@ -4,15 +4,15 @@
 	</div>
 	<div id="assign_image_list" class="with_padding">
 	<%- if @pictures.empty? -%>
-		<p><%= _("no_images_in_archive") %></p>
+		<p><%= t("no_images_in_archive") %></p>
 	<%- else -%>
+		<%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
 		<%= render(
-			:partial => 'admin/partials/remote_pagination_links',
+			:partial => 'alchemy/admin/partials/remote_pagination_links',
 			:locals => {
 				:items => @pictures
 			}
 		) %>
-		<%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
 	<%- end -%>
 	</div>
 </div>