alchemy_cms 2.1.beta1 → 2.1.beta5

data/app/views/{essences → alchemy/essences}/_essence_picture_tools.html.erb

@@ -1,37 +1,37 @@
 <%= link_to_overlay_window(
   render_icon('crop'),
-  crop_admin_essence_picture_path(content.essence, :options => options),
+  alchemy.crop_admin_essence_picture_path(content.essence, :options => options),
   {
     :size => "fullscreen",
-    :title => _('Edit Picturemask')
+    :title => t('Edit Picturemask')
   },
   {
     :class => necessary_options_for_cropping_provided?(options) && content.ingredient ? nil : 'disabled',
-    :title => _('Edit Picturemask')
+    :title => t('Edit Picturemask')
   }
 ) %>
 
 <%= link_to_overlay_window(
   render_icon('swap_picture'),
-  admin_pictures_path(
+  alchemy.admin_pictures_path(
     :element_id => content.element,
     :content_id => content,
     :swap => true,
     :options => options
   ),
   {
-    :title => _('swap_image'),
+    :title => t('swap_image'),
     :size => '720x580',
     :resizable => "true"
   },
-  :title => _('swap_image')
+  :title => t('swap_image')
 ) %>
 
 <%= link_to_function(
   render_icon('link'),
   "Alchemy.LinkOverlay.open(this, 420)",
   :class => content.linked? ? 'linked' : nil,
-  :title => _('link_image'),
+  :title => t('link_image'),
   :name => "essence_picture_#{content.id}",
   :id => "edit_link_#{content.id}"
 ) %>
@@ -40,19 +40,19 @@
   render_icon('unlink'),
   "Alchemy.LinkOverlay.removeLink(this, #{content.id})",
   :class => content.linked? ? 'linked' : 'disabled',
-  :title => _('unlink')
+  :title => t('unlink')
 ) %>
 
 <%= link_to_overlay_window(
   render_icon('edit'),
-  edit_admin_essence_picture_path(
+  alchemy.edit_admin_essence_picture_path(
     :id => content.essence.id,
     :content_id => content.id,
     :options => options
   ),
   {
-    :title => _('edit_image_properties'),
+    :title => t('edit_image_properties'),
     :size => (options[:caption_as_textarea] ? (options[:manual_image_size] ? '380x230' : '380x210') : (options[:manual_image_size] ? '380x190' : '380x180'))
   },
-  :title => _('edit_image_properties')
+  :title => t('edit_image_properties')
 ) %>

data/app/views/{essences → alchemy/essences}/_essence_picture_view.html.erb

@@ -1,9 +1,7 @@
 <%- unless content.essence.picture.nil? -%>
 	<%- image_size = options[:image_size] -%>
 	<%- img_tag = image_tag(
-		url_for(
-		  :controller => '/pictures',
-		  :action => 'show',
+		alchemy.show_picture_path(
 			:id => content.essence.picture.id,
 			:name => content.essence.picture.urlname,
 			:size => image_size,
@@ -21,7 +19,7 @@
 			:id => dom_id(content.essence.picture)
 		}.merge(html_options)
 	) -%>
-	
+
 	<%- caption = (content_tag("div", content.essence.caption, :id => "#{dom_id(content.essence.picture)}_caption", :class => "image_caption") unless (options[:show_caption] == false)) -%>
 
 	<%- if content.essence.link.blank? || options[:disable_link] -%>

data/app/views/alchemy/essences/_essence_richtext_editor.html.erb

@@ -0,0 +1,11 @@
+<%- cache(content) do -%>
+<div class="content_editor content_rtf_editor" id="<%= content_dom_id(content) %>">
+	<label><%= render_content_name(content) %></label>
+	<div style="position: relative">
+		<div class="essence_richtext_loader">
+			<%= image_tag('alchemy/ajax_loader.gif') %>
+		</div>
+		<%= tinymce_tag(content.form_field_name, content.ingredient) %>
+	</div>
+</div>
+<%- end -%>

data/app/views/{essences → alchemy/essences}/_essence_text_editor.html.erb

@@ -47,16 +47,16 @@
     <%= render_content_name(content) %>
     <%= link_to_confirmation_window(
       render_icon('delete-small'),
-      _('Do you really want to delete this content?'),
-      content_path(content),
+      t('Do you really want to delete this content?'),
+      alchemy.content_path(content),
       :class => 'icon_button small',
-      :title => _('Remove this content')
+      :title => t('Remove this content')
     ) if content.settings[:deletable] %>
   </label>
   <%= text_field_tag(
     content.form_field_name,
     content.ingredient,
-    :class => "thin_border auto_resize#{content.settings[:linkable] ? ' text_with_icon' : ''}"
+    :class => "thin_border #{content.settings[:linkable] ? ' text_with_icon' : ''}"
   ) %>
   
   <%- if content.settings[:linkable] -%>
@@ -66,11 +66,11 @@
   <%= hidden_field_tag content.form_field_name(:link_class_name), content.essence.link_class_name %>
   <%= hidden_field_tag content.form_field_name(:link_target), content.essence.link_target %>
   
-  <a href="#" onclick="Alchemy.LinkOverlay.open(this, 420); return false;" title="<%= _('place_link') -%>" class="icon_button <%= content.linked? ? ' linked' : '' -%>" name="essence_text_<%= content.id -%>" id="edit_link_<%= content.id -%>">
+  <a href="#" onclick="Alchemy.LinkOverlay.open(this, 420); return false;" title="<%= t('place_link') -%>" class="icon_button <%= content.linked? ? ' linked' : '' -%>" name="essence_text_<%= content.id -%>" id="edit_link_<%= content.id -%>">
     <span class="icon link"></span>
   </a>
   
-  <a href="#" onclick="Alchemy.LinkOverlay.removeLink(this, <%= content.id -%>); return false;" title="<%= _('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
+  <a href="#" onclick="Alchemy.LinkOverlay.removeLink(this, <%= content.id -%>); return false;" title="<%= t('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
     <span class="icon unlink"></span>
   </a>
   

data/app/views/alchemy/essences/_essence_video_editor.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "alchemy/essences/essence_file_editor", :locals => {:options => options, :content => content} %>

data/app/views/{essences → alchemy/essences}/_essence_video_view.html.erb

@@ -3,7 +3,7 @@
 <%- width = content.essence.width.blank? ? (options[:player_size].split('x')[0] rescue 480) : content.essence.width -%>
 <%- height = content.essence.height.blank? ? (options[:player_size].split('x')[1] rescue 320) : content.essence.height -%>
 
-<a  href="<%= show_attachment_path(content.essence.attachment) %>" 
+<a  href="<%= alchemy.show_attachment_path(content.essence.attachment) %>" 
     id="player_<%= content.id %>" 
     style="width: <%= width %>px; height: <%= height %>px; display: block">
 </a>

data/app/views/{navigation → alchemy/navigation}/_link.html.erb

@@ -6,7 +6,7 @@
 	:target => '_blank'
 ) -%>
 <%- else -%>
-<%- link_path = @preview_mode ? 'javascript:void(0)' : show_page_path(:urlname => page.urlname, :lang => multi_language? ? page.language.code : nil) -%>
+<%- link_path = @preview_mode ? 'javascript:void(0)' : alchemy.show_page_path(:urlname => page.urlname, :lang => multi_language? ? page.language.code : nil) -%>
 <%= link_to(
 	h(page.name),
 	link_path,

data/app/views/alchemy/notifications/admin_user_created.text.erb

@@ -0,0 +1,13 @@
+<%= t('Welcome to Alchemy') %>
+
+<%= t('To manage your website open a browser and go to') %>:
+
+<%= @url %>
+
+<%= t('Your credentials are') %>:
+----------------------
+<%= t('Username') %>: <%= @user.login %>
+<%= t('Password') %>: <%= @user.password %>
+
+
+<%= t('Have much fun with Alchemy!') %>

data/app/views/alchemy/notifications/registered_user_created.text.erb

@@ -0,0 +1,10 @@
+<%= Alchemy::I18n.t('alchemy.mailer.new_user_mail.welcome') %>!
+
+<%= Alchemy::I18n.t('alchemy.mailer.new_user_mail.login_url_explanation') %>:
+
+<%= @url %>
+
+<%= Alchemy::I18n.t('alchemy.mailer.new_user_mail.username') %>: <%= @user.login %>
+<%= Alchemy::I18n.t('alchemy.mailer.new_user_mail.password') %>: <%= @user.password %>
+
+<%= Alchemy::I18n.t('alchemy.mailer.new_user_mail.greeting') %>

data/app/views/alchemy/search/_result.html.erb

@@ -0,0 +1,9 @@
+<li class="search_result">
+	<h3><%= t('Page') %>:
+		<%= link_to page.name, show_alchemy_page_path(page, {:query => 'test'}) %>
+		<%= content_tag(:span, page.language_code.upcase, :class => 'language_code') if multi_language? && options[:show_language] %>
+	</h3>
+	<%- result.each do |highlight| -%>
+		<p><%= sanitize highlight %></p>
+	<%- end -%>
+</li>

data/app/views/alchemy/user_sessions/leave.html.erb

@@ -0,0 +1,11 @@
+<div class="with_padding">
+	<h2><%= t("You are about to leave Alchemy") %>.</h2>
+	<p style="line-height: 24px">
+		<%= t("Do you want to") %>
+		<%= link_to t('stay logged in'), alchemy.root_path, :class => 'button' %>
+	</p>
+	<p style="line-height: 24px">
+		<%= t('or to completly') %>
+		<%= link_to t('logout'), alchemy.logout_path, :class => 'button' %>
+	</p>
+</div>

data/app/views/alchemy/user_sessions/login.html.erb

@@ -0,0 +1,47 @@
+<div id="alchemy_greeting">
+	<%= image_tag("alchemy/alchemy-logo.png") %>
+	<h1>
+		<%= flash[:info] %>
+	</h1>
+</div>
+
+<div class="login_signup_box">
+	<%= form_for @user_session, :url => {:action => 'login'}, :html => { :id => "login" } do |f| %>
+		<%= f.error_messages %>
+		<table>
+			<tr>
+				<td class="label">
+					<%= f.label :login %>
+				</td>
+				<td class="input">
+					<%= f.text_field :login, :class => 'thin_border' %>
+				</td>
+			</tr>
+			<tr>
+				<td class="label">
+					<%= f.label :password %>
+				</td>
+				<td class="input">
+					<%= f.password_field :password, :class => 'thin_border' %>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2" class="submit">
+					<%= hidden_field_tag 'user_screensize' %>
+					<%= f.button t('login'), :class => 'button', :name => nil %>
+				</td>
+			</tr>
+		</table>
+	<% end %>
+</div>
+
+<%- content_for :javascripts do -%>
+<script type="text/javascript" charset="utf-8">
+	jQuery(function($) {
+		$('#alchemy_user_session_login').focus();
+		$('#user_screensize').val(function() {
+			return screen.width+'x'+screen.height;
+		});
+	});
+</script>
+<%- end -%>

data/app/views/alchemy/user_sessions/logout.html.erb

@@ -0,0 +1,3 @@
+<div id="login">
+	&nbsp;
+</div>

data/app/views/alchemy/user_sessions/signup.html.erb

@@ -0,0 +1,14 @@
+<div id="alchemy_greeting">
+  <%= image_tag("alchemy/alchemy-logo.png") %>
+  <h1><%= t('Welcome to Alchemy') %></h1>
+  <p>
+    <%= t("Please Signup") %>
+  </p>
+</div>
+
+<div id="user_signup" class="login_signup_box">
+  <%= form_for @user, :url => alchemy.signup_path do |f| %>
+    <%= f.error_messages %>
+    <%= render :partial => 'alchemy/admin/users/table', :locals => {:f => f} %>
+  <% end %>
+</div>

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

@@ -1,34 +1,36 @@
-<!DOCTYPE>
+<!DOCTYPE html>
 <html>
 	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<meta http-equiv="content-language" content="<%= current_user.language.blank? ? 'de' : current_user.language rescue 'de' %>">
+		<meta charset="UTF-8">
 		<title><%= render_alchemy_title %></title>
 		<%= csrf_meta_tag %>
+		<%= stylesheet_link_tag('alchemy/alchemy', :media => 'screen') %>
+		<%= stylesheet_link_tag('alchemy/print', :media => 'print') %>
 		<%= yield :stylesheets %>
-		<%= yield :javascript_includes %>
 		<script type="text/javascript" charset="utf-8">
-			if (typeof(jQuery) === 'function') {
-				jQuery.noConflict();
-			}
+			var tinyMCEPreInit = {
+				base: '<%= Rails.application.config.assets.prefix %>/tiny_mce',
+				suffix: ''
+			};
 		</script>
+		<%= javascript_include_tag('alchemy/alchemy') %>
+		<%= yield :javascript_includes %>
 	</head>
-
 	<body id="alchemy">
 		<div id="overlay">
 			<div id="overlay_text_box">
 				<%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
-				<span id="overlay_text"><%= _("please_wait") %></span>
+				<span id="overlay_text"><%= t("please_wait") %></span>
 			</div>
 		</div>
 		<div id="main_menu">
 			<div id="main_navi">
-				<%= yield(:navigation) %>
 				<%= admin_main_navigation %>
+				<%= yield(:alchemy_main_navigation) %>
 			</div>
 			<div id="main_menu_background"></div>
 			<div id="logout">
-				<%= link_to_overlay_window("<span class='module icon exit'></span><br /> #{_('leave')}".html_safe, leave_admin_path, {:size => "300x140", :title => _("Leave Alchemy")}) %>
+				<%= link_to_overlay_window("<span class='module icon exit'></span><label>#{t('leave')}</label>".html_safe, alchemy.leave_admin_path, {:size => "300x140", :title => t("Leave Alchemy")}) %>
 			</div>
 		</div>
 		<div id="top_menu">
@@ -38,20 +40,24 @@
 					<%= yield(:subnav_additions) %>
 				</div>
 			</div>
-			<%= yield(:toolbar) %>
+			<div id="toolbar">
+				<%= yield(:toolbar) %>
+			</div>
 			<%- if current_user -%>
 			<div id="user_info">
-				<%= _('Logged in as') %> <%= current_user.name %>
+				<%= t('Logged in as') %> <%= current_user.name %>
 			</div>
 			<%- end -%>
 		</div>
-		<%= render :partial => 'admin/partials/flash_notices' %>
+		<%= render :partial => 'alchemy/admin/partials/flash_notices' %>
 		<div id="main_content">
-			<%= yield %>
+			<div id="archive_all">
+				<%= yield %>
+			</div>
 		</div>
 		<%= yield(:javascripts) %>
 		<script type="text/javascript" charset="utf-8">
-			jQuery(document).ready(function ($) {
+			jQuery(function($) {
 				Alchemy.resizeFrame();
 				Alchemy.Tooltips();
 				if (typeof(jQuery().sb) === 'function') {
@@ -60,7 +66,7 @@
 				if ($('#flash_notices').length > 0) {
 					Alchemy.Growler.fade();
 				}
-				$('#alchemy a.icon_button.please_wait_overlay').click(function() {
+				$('#toolbar a.please_wait, #toolbar form .button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a').click(function() {
 					Alchemy.pleaseWaitOverlay();
 				});
 			});

data/app/views/layouts/alchemy/login.html.erb

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title><%= render_alchemy_title %></title>
+		<%= csrf_meta_tag %>
+		<%= stylesheet_link_tag('alchemy/alchemy', :media => 'screen') %>
+		<%= stylesheet_link_tag('alchemy/print', :media => 'print') %>
+		<%= javascript_include_tag('alchemy/alchemy') %>
+	</head>
+	<body id="alchemy">
+		<div id="main_menu">
+			<div id="main_navi">
+				<%= yield(:navigation) %>
+				<%= admin_main_navigation %>
+			</div>
+			<div id="main_menu_background"></div>
+			<div id="logout">
+				<%= link_to(alchemy.root_path) do %>
+					<span class="module icon exit"></span>
+					<label><%= t('leave') %></label>
+				<% end %>
+			</div>
+		</div>
+		<div id="main_content">
+			<%= yield %>
+		</div>
+		<%= yield(:javascripts) %>
+		<script type="text/javascript" charset="utf-8">
+			jQuery(document).ready(function($) {
+				if (typeof($().sb) === 'function') {
+					Alchemy.SelectBox('body#alchemy select');
+				}
+			});
+		</script>
+	</body>
+</html>