alchemy_cms 2.1.12 → 2.2.rc1

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

@@ -1,11 +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>
+  <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/alchemy/essences/_essence_text_editor.html.erb

@@ -71,14 +71,14 @@
   <%= 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 %>
   
-	<span class="linkable_text_essence_tools">
-		<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="<%= t('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
-			<span class="icon unlink"></span>
-		</a>
-	</span>
+  <span class="linkable_text_essence_tools">
+    <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="<%= t('unlink') %>" class="icon_button unlink<%= content.linked? ? ' linked' : ' disabled' -%>" name="essence_text_<%= content.id -%>">
+      <span class="icon unlink"></span>
+    </a>
+  </span>
   
   <%- end -%>
   

data/app/views/alchemy/navigation/_image_link.html.erb

@@ -1,14 +1,14 @@
 <%= link_to(
-	"",
-	{
-		:urlname => navigation_image_link.urlname
-	}.merge(
-		{
-			:controller => 'pages',
-			:action => 'show'
-		}
-	),
-	{
-		:class => page_active?(navigation_image_link) ? "active #{navigation_image_link.urlname}" : navigation_image_link.urlname
-	}
+  "",
+  {
+    :urlname => navigation_image_link.urlname
+  }.merge(
+    {
+      :controller => 'pages',
+      :action => 'show'
+    }
+  ),
+  {
+    :class => page_active?(navigation_image_link) ? "active #{navigation_image_link.urlname}" : navigation_image_link.urlname
+  }
 )%>

data/app/views/alchemy/navigation/_link.html.erb

@@ -1,20 +1,20 @@
 <%- if page.redirects_to_external? -%>
 <%= link_to(
-	h(page.name),
-	page.urlname,
-	:title => (options[:show_title] == true ? page.title : nil),
-	:target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil,
-	:class => external_page_css_class(page)
+  h(page.name),
+  page.urlname,
+  :title => (options[:show_title] == true ? page.title : nil),
+  :target => configuration(:open_external_links_in_new_tab) ? '_blank' : nil
 ) -%>
+  Alchemy::Page.find_
 <%- else -%>
 <%= link_to(
-	h(page.name),
-	@preview_mode ? 'javascript:void(0)' : show_alchemy_page_path(page),
-	{
-		:class => (page_active?(page) ? 'active' : nil),
-		:title => (options[:show_title] ? page.title : nil),
-		:lang => page.language_code,
-		'data-page-id' => page.id
-	}
+  h(page.name),
+  @preview_mode ? 'javascript:void(0)' : show_alchemy_page_path(page),
+  {
+    :class => (page_active?(page) ? 'active' : nil),
+    :title => (options[:show_title] ? page.title : nil),
+    :lang => page.language_code,
+    'data-page-id' => page.id
+  }
 ) -%>
 <%- end -%>

data/app/views/alchemy/navigation/_renderer.html.erb

@@ -1,23 +1,23 @@
 <%- unless pages.blank? -%>
 <ul class="navigation_level_<%= pages.first.level - 1 %>">
 <%- pages.each do |page| -%>
-	<%- position = 'first' if page == pages.to_a.first -%>
-	<%- position = 'last' if page == pages.to_a.last -%>
-	<li class="<%= page.urlname -%> <%= position -%><%= " active" if page_active?(page) %>">
-		<%= render :partial => options[:navigation_link_partial], :object => page, :locals => {:page => page, :options => options} -%>
-		<%- options[:from_page] = page -%>
-		<%- if options[:reverse_children] -%>
-			<%- options[:reverse] = true -%>
-		<%- end -%>		
-		<%- if options[:show_nonactive] -%>
-		<%= render_navigation(options) if (options[:submenu]) -%>
-		<%- else -%>
-		<%= render_navigation(options) if ((options[:submenu] && page_active?(page)) || options[:all_sub_menues]) -%>
-		<%- end -%>
-	</li>
-	<%- unless options[:spacer].empty? -%>
-	<%= raw "<li class=\"navigation_spacer\">#{options[:spacer]}</li>" unless page == pages.to_a.last -%>
-	<%- end -%>
+  <%- position = 'first' if page == pages.to_a.first -%>
+  <%- position = 'last' if page == pages.to_a.last -%>
+  <li class="<%= page.urlname -%> <%= position -%><%= " active" if page_active?(page) %>">
+    <%= render :partial => options[:navigation_link_partial], :object => page, :locals => {:page => page, :options => options} -%>
+    <%- options[:from_page] = page -%>
+    <%- if options[:reverse_children] -%>
+      <%- options[:reverse] = true -%>
+    <%- end -%>
+    <%- if options[:show_nonactive] -%>
+    <%= render_navigation(options) if (options[:submenu]) -%>
+    <%- else -%>
+    <%= render_navigation(options) if ((options[:submenu] && page_active?(page)) || options[:all_sub_menues]) -%>
+    <%- end -%>
+  </li>
+  <%- unless options[:spacer].empty? -%>
+  <%= raw "<li class=\"navigation_spacer\">#{options[:spacer]}</li>" unless page == pages.to_a.last -%>
+  <%- end -%>
 <%- end -%>
 </ul>
 <%- end -%>

data/app/views/alchemy/page_layouts/_layout_footer.html.erb

@@ -10,5 +10,5 @@
   <%- end -%>
 </div>
 <div id="content">
-	
+
 </div>

data/app/views/alchemy/page_layouts/_layout_header.html.erb

@@ -10,5 +10,5 @@
   <%- end -%>
 </div>
 <div id="content">
-	
+
 </div>

data/app/views/alchemy/pages/show.rss.builder

@@ -1,22 +1,22 @@
 xml.instruct! :xml, :version => "1.0"
 xml.rss :version => "2.0" do
 
-	xml.channel do
+  xml.channel do
 
-		xml.title @page.title
-		xml.description @page.meta_description
-		xml.link show_page_url(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
+    xml.title @page.title
+    xml.description @page.meta_description
+    xml.link show_page_url(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
 
-		@page.feed_elements.each do |element|
-			xml.item do
-				xml.title element.content_for_rss_title.ingredient
-				xml.description element.content_for_rss_description.ingredient
-				xml.pubDate element.ingredient('date').to_s(:rfc822) if element.has_ingredient?('date')
-				xml.link show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
-				xml.guid show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
-			end
-		end
+    @page.feed_elements.each do |element|
+      xml.item do
+        xml.title element.content_for_rss_title.ingredient
+        xml.description element.content_for_rss_description.ingredient
+        xml.pubDate element.ingredient('date').to_s(:rfc822) if element.has_ingredient?('date')
+        xml.link show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
+        xml.guid show_page_url(:urlname => @page.urlname, :anchor => element_dom_id(element), :lang => multi_language? ? @page.language_code : nil)
+      end
+    end
 
-	end
+  end
 
 end

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

@@ -1,9 +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 -%>
+  <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

@@ -1,11 +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>
+  <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

@@ -1,46 +1,46 @@
 <div id="login_box">
-	<div id="alchemy_greeting">
-		<%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
-		<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>
+  <div id="alchemy_greeting">
+    <%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
+    <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>
 </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;
-		});
-	});
+  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

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

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

@@ -1,84 +1,84 @@
 <!DOCTYPE html>
 <html class="no-js">
-	<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') %>
-		<%= yield :stylesheets %>
-		<script type="text/javascript" charset="utf-8">
-			var tinyMCEPreInit = {
-				base: '<%= Rails.application.config.assets.prefix %>/tiny_mce',
-				suffix: ''
-			};
-		</script>
-		<%= javascript_include_tag('alchemy/alchemy') %>
-		<%= yield :javascript_includes %>
-	</head>
-	<body id="alchemy">
-		<noscript>
-			<h1><%= t(:javascript_disabled_headline) %></h1>
-			<p><%= t(:javascript_disabled_text) %></p>
-		</noscript>
-		<div id="overlay">
-			<div id="overlay_text_box">
-				<%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
-				<span id="overlay_text"><%= t("please_wait") %></span>
-			</div>
-		</div>
-		<div id="left_menu">
-			<div id="main_navi">
-				<%= admin_main_navigation %>
-				<%= yield(:alchemy_main_navigation) %>
-			</div>
-			<div id="logout">
-				<%= link_to_overlay_window("<span class='module icon exit'></span><label>#{t('leave')}</label>".html_safe, alchemy.leave_admin_path, {:size => "300x105", :title => t("Leave Alchemy")}) %>
-			</div>
-		</div>
-		<div id="top_menu">
-			<div id="sub_navigation">
-				<%= admin_subnavigation %>
-				<div id="subnav_additions">
-					<%= yield(:subnav_additions) %>
-				</div>
-			</div>
-			<div id="toolbar">
-				<%= yield(:toolbar) %>
-			</div>
-			<%- if current_user -%>
-			<div id="user_info">
-				<%= t('Logged in as') %> <%= current_user.name %>
-			</div>
-			<%- end -%>
-		</div>
-		<%= render :partial => 'alchemy/admin/partials/flash_notices' %>
-		<div id="main_content">
-			<div id="archive_all">
-				<%= yield %>
-			</div>
-		</div>
-		<%= yield(:javascripts) %>
-		<script type="text/javascript" charset="utf-8">
-			jQuery(function($) {
-				$('html').removeClass('no-js');
-				Alchemy.locale = '<%= ::I18n.locale %>';
-				Alchemy.resizeFrame();
-				Alchemy.Tooltips();
-				if (typeof(jQuery().sb) === 'function') {
-					Alchemy.SelectBox('body#alchemy select.alchemy_selectbox');
-				}
-				Alchemy.Datepicker();
-				if ($('#flash_notices').length > 0) {
-					Alchemy.Growler.fade();
-				}
-				$('a.please_wait, form .button, form .icon_button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a, .pagination a').not('#subnav_additions .subnavi_tab button').click(function() {
-					Alchemy.pleaseWaitOverlay();
-				});
-			});
-			jQuery(window).resize(function() {
-				Alchemy.resizeFrame();
-			});
-		</script>
-	</body>
+  <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') %>
+    <%= yield :stylesheets %>
+    <script type="text/javascript" charset="utf-8">
+      var tinyMCEPreInit = {
+        base: '<%= Rails.application.config.assets.prefix %>/tiny_mce',
+        suffix: ''
+      };
+    </script>
+    <%= javascript_include_tag('alchemy/alchemy') %>
+    <%= yield :javascript_includes %>
+  </head>
+  <body id="alchemy">
+    <noscript>
+      <h1><%= t(:javascript_disabled_headline) %></h1>
+      <p><%= t(:javascript_disabled_text) %></p>
+    </noscript>
+    <div id="overlay">
+      <div id="overlay_text_box">
+        <%= image_tag('alchemy/ajax_loader.gif', :id => 'ajax_loader') %>
+        <span id="overlay_text"><%= t("please_wait") %></span>
+      </div>
+    </div>
+    <div id="left_menu">
+      <div id="main_navi">
+        <%= admin_main_navigation %>
+        <%= yield(:alchemy_main_navigation) %>
+      </div>
+      <div id="logout">
+        <%= link_to_overlay_window("<span class='module icon exit'></span><label>#{t('leave')}</label>".html_safe, alchemy.leave_admin_path, {:size => "300x105", :title => t("Leave Alchemy")}) %>
+      </div>
+    </div>
+    <div id="top_menu">
+      <div id="sub_navigation">
+        <%= admin_subnavigation %>
+        <div id="subnav_additions">
+          <%= yield(:subnav_additions) %>
+        </div>
+      </div>
+      <div id="toolbar">
+        <%= yield(:toolbar) %>
+      </div>
+      <%- if current_user -%>
+      <div id="user_info">
+        <%= t('Logged in as') %> <%= current_user.name %>
+      </div>
+      <%- end -%>
+    </div>
+    <%= render :partial => 'alchemy/admin/partials/flash_notices' %>
+    <div id="main_content">
+      <div id="archive_all">
+        <%= yield %>
+      </div>
+    </div>
+    <%= yield(:javascripts) %>
+    <script type="text/javascript" charset="utf-8">
+      jQuery(function($) {
+        $('html').removeClass('no-js');
+        Alchemy.locale = '<%= ::I18n.locale %>';
+        Alchemy.resizeFrame();
+        Alchemy.Tooltips();
+        if (typeof(jQuery().sb) === 'function') {
+          Alchemy.SelectBox('body#alchemy select.alchemy_selectbox');
+        }
+        Alchemy.Datepicker();
+        if ($('#flash_notices').length > 0) {
+          Alchemy.Growler.fade();
+        }
+        $('a.please_wait, form .button, form .icon_button, #main_navi a.main_navi_entry, #sub_navigation .subnavi_tab a, .pagination a').not('#subnav_additions .subnavi_tab button').click(function() {
+          Alchemy.pleaseWaitOverlay();
+        });
+      });
+      jQuery(window).resize(function() {
+        Alchemy.resizeFrame();
+      });
+    </script>
+  </body>
 </html>