alchemy_cms 2.1.beta6 → 2.1.rc2

data/app/views/alchemy/admin/users/_user.html.erb

@@ -25,7 +25,7 @@
 			alchemy.edit_admin_user_path(user),
 			{
 				:title => t('edit_user'),
-				:size => '384x400',
+				:size => '384x450',
 				:overflow => true
 			},
 			{

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

@@ -7,7 +7,7 @@
 			:title => t('create_user'),
 			:overlay_options => {
 				:title => t('create_user'),
-				:size => "384x400"
+				:size => "384x450"
 			},
 			:if_permitted_to => [:new, :alchemy_admin_users]
 		}
@@ -35,7 +35,7 @@
 
 <div class="info">
 	<%= render_icon('info') %>
-	<%= t('No users found.') %>
+	<%= t('No users found') %>
 </div>
 
 <%- end -%>

data/app/views/alchemy/elements/_contactform_view.html.erb

@@ -1,79 +1,79 @@
-<%= form_for(@message ||= Message.new, :html => {:id => "contact", "data-alchemy-element" => (@preview_mode ? element.id : nil)}) do |f| %>
-    <%= f.error_messages %>
-    <%= f.hidden_field "contact_form_id", :value => element.id %>
-    <%= hidden_field_tag "mail_to", params[:mail_to] %>
-    <table class="contactform">
-    	<tr>
-    		<td class="label">
-					<%= f.label :salutation, t('alchemy.contactform.labels.salutation') %>
-    		</td>
-    		<td class="field">
-    			<%= f.select(
-    				:salutation,
-    				[
-    					[t('alchemy.contactform.labels.mr')],
-    					[t('alchemy.contactform.labels.mrs')]
-    				],
-    				:prompt => t('alchemy.contactform.labels.choose'),
-    				:class => "select"
-    			) %>
-    		</td>
-    	</tr>
-    	<tr>
-    		<td class="label">
-					<%= f.label :firstname, t('alchemy.contactform.labels.firstname') %>
-    		</td>
-    		<td class="field">
-    			<%= f.text_field(:firstname, :class => "field") %>
-    		</td>
-    	</tr>
-    	<tr>
-    		<td class="label">
-					<%= f.label :lastname, (t('alchemy.contactform.labels.lastname') + '<small>*</small>').html_safe %>
-    		</td>
-    		<td class="field">
-    			<%= f.text_field(:lastname, :class => "field") %>
-    		</td>
-    	</tr>
-    	<tr>
-    		<td class="label">
-					<%= f.label :address, t('alchemy.contactform.labels.address') %>
-    		</td>
-    		<td class="field">
-    			<%= f.text_field :address, :class => 'field' %>
-    		</td>
-    	</tr>
-    	<tr>
-    		<td class="label">
-					<%= f.label :zip, t('alchemy.contactform.labels.zip') %>
-    		</td>
-    		<td class="field">
-    			<%= f.text_field :zip, :class => 'field short' %>
-    			<%= f.text_field :city, :class => 'field medium' %>
-    		</td>
-    	</tr>
-    	<tr>
-    		<td class="label">
-					<%= f.label :phone, t('alchemy.contactform.labels.phone') %>
-    		</td>
-    		<td class="field">
-    			<%= f.text_field :phone, :class => 'field' %>
-    		</td>
-    	</tr>
-    	<tr>
-    		<td class="label">
-					<%= f.label :email, (t('alchemy.contactform.labels.email') + '<small>*</small>').html_safe %>
-    		</td>
-    		<td class="field">
-    			<%= f.text_field :email, :class => 'field' %>
-    		</td>
-    	</tr>
-    </table>
-    <div id="message">
-			<%= f.text_area :message %>
-    </div>
-		<p class="foot_notice">*) <%= t('alchemy.contactform.labels.mandatory_fields') %></p>
-    <p class="right">
-    	<%= f.button t('alchemy.contactform.labels.send'), :name => nil, :class => 'button' %>
-    </p>
+<%= form_for(@message ||= Alchemy::Message.new, :html => {:id => "contact", "data-alchemy-element" => (@preview_mode ? element.id : nil)}) do |f| %>
+	<%= f.error_messages %>
+	<%= f.hidden_field "contact_form_id", :value => element.id %>
+	<%= hidden_field_tag "mail_to", params[:mail_to] %>
+	<table class="contactform">
+		<tr>
+			<td class="label">
+				<%= f.label :salutation, t('contactform.labels.salutation') %>
+			</td>
+			<td class="field">
+				<%= f.select(
+					:salutation,
+					[
+						[t('contactform.labels.mr')],
+						[t('contactform.labels.mrs')]
+					],
+					:prompt => t('contactform.labels.choose'),
+					:class => "select"
+				) %>
+			</td>
+		</tr>
+		<tr>
+			<td class="label">
+				<%= f.label :firstname, t('contactform.labels.firstname') %>
+			</td>
+			<td class="field">
+				<%= f.text_field(:firstname, :class => "field") %>
+			</td>
+		</tr>
+		<tr>
+			<td class="label">
+				<%= f.label :lastname, (t('contactform.labels.lastname') + '<small>*</small>').html_safe %>
+			</td>
+			<td class="field">
+				<%= f.text_field(:lastname, :class => "field") %>
+			</td>
+		</tr>
+		<tr>
+			<td class="label">
+				<%= f.label :address, t('contactform.labels.address') %>
+			</td>
+			<td class="field">
+				<%= f.text_field :address, :class => 'field' %>
+			</td>
+		</tr>
+		<tr>
+			<td class="label">
+				<%= f.label :zip, t('contactform.labels.zip') %>
+			</td>
+			<td class="field">
+				<%= f.text_field :zip, :class => 'field short' %>
+				<%= f.text_field :city, :class => 'field medium' %>
+			</td>
+		</tr>
+		<tr>
+			<td class="label">
+				<%= f.label :phone, t('contactform.labels.phone') %>
+			</td>
+			<td class="field">
+				<%= f.text_field :phone, :class => 'field' %>
+			</td>
+		</tr>
+		<tr>
+			<td class="label">
+				<%= f.label :email, (t('contactform.labels.email') + '<small>*</small>').html_safe %>
+			</td>
+			<td class="field">
+				<%= f.text_field :email, :class => 'field' %>
+			</td>
+		</tr>
+	</table>
+	<div id="message">
+		<%= f.text_area :message %>
+	</div>
+	<p class="foot_notice">*) <%= t('contactform.labels.mandatory_fields') %></p>
+	<p class="right">
+		<%= f.button t('contactform.labels.send'), :name => nil, :class => 'button' %>
+	</p>
 <% end %>

data/app/views/alchemy/elements/_download_editor.html.erb

@@ -0,0 +1 @@
+<%= render_essence_editor_by_name(element, 'file') %>

data/app/views/alchemy/elements/_download_view.html.erb

@@ -0,0 +1,3 @@
+<div class="download" <%= element_preview_code(element) -%>>
+	<%= render_essence_view_by_name(element, 'file') %>
+</div>

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

@@ -1,7 +1,7 @@
 <div class="content_editor" id="<%= content_dom_id(content) %>">
 	<label><%= render_content_name(content) %></label>
 	<%= datetime_select(
-		content.form_field_name,
+		"contents[content_#{content.id}]",
 		:date,
 		:default => content.ingredient || Date.today,
 		:start_year => options[:start_year],

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

@@ -28,6 +28,7 @@
 			<%= content.ingredient.name rescue ("&#x2190;" + t('assign_file_from_archive')).html_safe %>
 		</div>
 		<%- unless content.ingredient.nil? -%>
+		<%= hidden_field_tag content.form_field_name(:attachment_id), content.ingredient.id %>
 		<div class="essence_file_tools">
 			<%= link_to_overlay_window("",
 				alchemy.admin_attachments_path(

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

@@ -1,6 +1,10 @@
 <%= link_to(
 	h(content.essence.attachment.name),
-	alchemy.download_attachment_path(:id => content.essence.attachment.id, :name => content.essence.attachment.filename),
+	alchemy.download_attachment_path(
+		:id => content.essence.attachment.id,
+		:name => content.essence.attachment.urlname,
+		:format => content.essence.attachment.suffix
+	),
 	:class => "file_link #{content.essence.css_class.blank? ? "" : content.essence.css_class}",
 	:title => "#{content.essence.title.blank? ? content.essence.attachment.filename : content.essence.title}"
-) if content.essence.attachment %>
+) if content.essence.attachment %>

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

@@ -30,11 +30,12 @@
       <div class="thumbnail_background">
         <%= image_tag(
           alchemy.thumbnail_path(
-            :id => content.ingredient,
+            :id => content.ingredient.id,
             :size => content.ingredient.cropped_thumbnail_size(content.essence.render_size.blank? ? options[:image_size] : content.essence.render_size),
             :crop_from => content.essence.crop_from.blank? ? nil : content.essence.crop_from,
             :crop_size => content.essence.crop_size.blank? ? nil : content.essence.crop_size,
-            :crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil
+            :crop => content.essence.crop_size.blank? && content.essence.crop_from.blank? ? 'crop' : nil,
+			:name => content.ingredient.urlname
           ),
           :alt => content.ingredient.name,
           :class => 'img_paddingtop',

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

@@ -10,7 +10,7 @@
 			:crop_size => options[:crop] && !content.essence.crop_size.blank? ? content.essence.crop_size : nil,
 			:upsample  => options[:upsample],
 			:padding => options[:padding],
-			:format => (options[:format].blank? ? configuration(:image_output_format) : options[:format]),
+			:format => options[:format],
 			:effects => options[:effects].blank? ? nil : options[:effects]
 		),
 		{

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

@@ -6,10 +6,9 @@
 	:target => '_blank'
 ) -%>
 <%- else -%>
-<%- 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,
+	@preview_mode ? 'javascript:void(0)' : show_alchemy_page_path(page),
 	{
 		:class => (page_active?(page) ? 'active' : nil),
 		:title => (options[:show_title] ? page.title : nil),

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

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

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

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

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

@@ -1,38 +1,37 @@
-<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 id="login_box">
+	<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>
 </div>
 
 <%- content_for :javascripts do -%>

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

@@ -8,12 +8,9 @@
 		<%= stylesheet_link_tag('alchemy/print', :media => 'print') %>
 		<%= javascript_include_tag('alchemy/alchemy') %>
 	</head>
-	<body id="alchemy">
+	<body id="alchemy" class="login">
 		<div id="main_menu">
-			<div id="main_navi">
-				<%= yield(:navigation) %>
-				<%= admin_main_navigation %>
-			</div>
+			<div id="main_navi"></div>
 			<div id="main_menu_background"></div>
 			<div id="logout">
 				<%= link_to(alchemy.root_path) do %>
@@ -28,9 +25,7 @@
 		<%= yield(:javascripts) %>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(document).ready(function($) {
-				if (typeof($().sb) === 'function') {
-					Alchemy.SelectBox('body#alchemy select');
-				}
+				Alchemy.SelectBox('body#alchemy select');
 			});
 		</script>
 	</body>

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

@@ -25,5 +25,6 @@
 			</div>
 		</div>
 		<%= alchemy_preview_mode_code %>
+		<%= alchemy_menu_bar %>
 	</body>
 </html>

data/bin/alchemy

@@ -1,12 +1,15 @@
+# encoding: UTF-8
+
 #!/usr/bin/env ruby
 begin
 	require "rubygems"
-	require "thor"
-	require 'alchemy/version'
-	require 'rails'
-	if Rails.version >= "3.1" || Rails.version < "3.0"
-		raise LoadError, "Wrong rails version installed. Please run gem install rails -v'~>3.0.10'"
+	require 'rails/version'
+	RAILS_VERSION = Rails::VERSION::STRING
+	if RAILS_VERSION < "3.1"
+		raise LoadError, "Wrong rails version installed. Please run gem install rails -v'~>3.1'"
 	end
+	require "thor"
+	require File.join(File.dirname(__FILE__), '..', 'lib/alchemy/version')
 end
 
 class AlchemyInstaller < Thor
@@ -16,39 +19,42 @@ class AlchemyInstaller < Thor
   map "-v" => :version
 	map "--version" => :version
 
-	desc "version", "Prints current Alchemy version", :hide => true
+	desc "version", "Prints current Alchemy CMS version", :hide => true
   def version
   	puts Alchemy::VERSION
   end
 
-  desc "new PROJECT", "Creates a new Alchemy project."
+  desc "new PROJECT", "Creates a new Alchemy CMS project."
   method_option :scm, :type => :string, :aliases => "-s", :desc => "Type of scm to use for this project. Leave blank for none."
 	method_option :database, :type => :string, :default => 'mysql', :aliases => "-d", :desc => "Type of database to use for this project. Default mysql."
   def new(project)
-    project = project.downcase.strip.gsub(/ /, '_')
-    if yes?("Install Alchemy into ./#{project}? (y/N)")
+    @application = project.downcase.strip.gsub(/ /, '_')
+    if yes?("Install Alchemy CMS into ./#{@application}? (y/N)")
       
       say "Generating new Rails App...", :yellow
       
-      if system("rails _#{Rails.version}_ new #{project} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
-        
-        @application = project
+      if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
         
         create_database_yml if options[:database] == 'mysql'
         
-        with_standard_set = yes?("\nDo you want to install Alchemys Standardset files into your App? (y/N)")
+        with_standard_set = yes?("\nDo you want to copy the files of Alchemy´s Standardset into your App? (y/N)")
         
         %x[
-          cd ./#{project}
+          cd ./#{@application}
           rails g alchemy:scaffold#{' --with-standard-set' if with_standard_set}
           rm ./public/index.html
-          rm ./public/images/rails.png
+          rm ./app/assets/images/rails.png
         ]
+
+				mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
+				mountpoint = "/" if mountpoint.empty?
+				sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+				inject_into_file "#{@application}/config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
         
         if options[:scm]
           
           %x[
-            cd ./#{project}
+            cd ./#{@application}
             rm -rf ./tmp/*
             rm -rf ./log/*
             mkdir -p ./index
@@ -59,26 +65,27 @@ class AlchemyInstaller < Thor
             when 'svn'
               server = ask("\nURL of your svn server? (http://svn.magiclabs.de/customers)")
               server = "http://svn.magiclabs.de/customers" if server.empty?
-              repository = ask("\nName of the repository? (#{project})")
-              repository = project if repository.empty?
+              repository = ask("\nName of the repository? (#{@application})")
+              repository = @application if repository.empty?
               
-              say "\nImporting #{project} into #{server}/#{repository} ...", :yellow
-              output = %x[svn import ./#{project} #{server}/#{repository} -m 'initial import by Alchemy installer']; imported = $?.success?
+              say "\nImporting #{@application} into #{server}/#{repository} ...", :yellow
+              output = %x[svn import ./#{@application} #{server}/#{repository} -m 'initial import by Alchemy installer']; imported = $?.success?
               
               if imported
                 
                 say "Removing and checking out again...", :yellow
                 %x[
-                  rm -rf ./#{project}
+                  rm -rf ./#{@application}
                   svn co #{server}/#{repository}
                 ]
                 
                 say "Committing ignores...", :yellow
                 %x[
-                  cd ./#{project}
+                  cd ./#{@application}
                   svn propset svn:ignore '*' tmp/ log/ index/ uploads/
                   svn propset svn:ignore 'alchemy' ./public/images ./public/stylesheets ./public/javascripts
                   svn propset svn:ignore 'pictures' ./public
+                  svn propset svn:ignore 'assets' ./public
                   svn propset svn:ignore 'database.yml' ./config
                   svn commit -m 'set ignores'
                 ]
@@ -125,7 +132,7 @@ class AlchemyInstaller < Thor
                   say "\nCapifying...", :yellow
                   
                   %x[
-                    cd #{project}
+                    cd #{@application}
                     capify .
                     svn add ./config/deploy.rb ./Capfile
                     svn commit -m 'capified'
@@ -146,11 +153,12 @@ class AlchemyInstaller < Thor
                 index/*
                 public/**/alchemy
                 public/pictures
+                public/assets
                 config/database.yml
               GIT
               %x[
-                cd #{project}
-                echo #{gitignore} > #{project}/.gitignore
+                cd #{@application}
+                echo #{gitignore} > #{@application}/.gitignore
                 touch ./index/.gitkeep
                 touch ./uploads/.gitkeep
                 git init .
@@ -161,18 +169,18 @@ class AlchemyInstaller < Thor
         end
         
         %x[
-          cd ./#{project}
-          rake alchemy:prepare db:create db:migrate db:seed
+          cd ./#{@application}
+          rake db:create alchemy:install:migrations db:migrate alchemy:db:seed
         ]
         
         readme = <<-EOF
-\nSuccessfully installed Alchemy into ./#{project}
+\nSuccessfully installed Alchemy CMS into ./#{@application}
 
 Next steps:
 
 1. Go into your projects folder:
 
-  cd ./#{project}
+  cd ./#{@application}
 
 2. Start your local Rails server:
 
@@ -184,7 +192,8 @@ Next steps:
 
 4. Follow the instructions to complete the installation!
 
-Thank you for using Alchemy!
+Thank you for using Alchemy CMS!
+http://alchemy-cms.com
 
 EOF
         say readme, :green
@@ -258,13 +267,6 @@ set :password, "#{@ssh_password}"
 set :port, #{@ssh_port}
 set :use_sudo, false
 
-# database
-set :database_user, "#{@db_user}"
-set :database_password, "#{@db_password}"
-set :database_name, "#{@db_name}"
-set :database_host, "#{@db_host}"
-set :database_socket, "#{@db_socket}"
-
 # domain names
 role :app, "#{@server}"
 role :web, "#{@server}"
@@ -279,17 +281,13 @@ set :scm_password, "#{@scm_password}"
 
 set :repository, Proc.new{ "--username \#{scm_user} --password \#{scm_password} \#{repository_url}" }
 
-after "deploy:setup", "alchemy:shared_folders:create"
 after "deploy:setup", "alchemy:database_yml:create"
 
-after "deploy:symlink", "alchemy:shared_folders:symlink"
+before "deploy:start", "deploy:seed"
+
 after "deploy:symlink", "alchemy:database_yml:symlink"
 
 before "deploy:restart", "deploy:migrate"
-before "deploy:restart", "alchemy:db:migrate"
-
-before "deploy:restart", "deploy:seed"
-before "deploy:restart", "alchemy:assets:copy"
 
 after "deploy", "deploy:cleanup"
 
@@ -305,39 +303,9 @@ namespace :logs do
   end
 end
 
-namespace :alchemy do
-
-  namespace :database_yml do
-
-    desc "Creates the database.yml file for server database"
-    task :create, :roles => :app do
-      db_config = ERB.new <<-EOF
-      production:
-        adapter: mysql2
-        encoding: utf8
-        database: \#{database_name}
-        username: \#{database_user}
-        password: \#{database_password}
-        host: \#{database_host}
-        socket: \#{database_socket}
-      EOF
-      run "mkdir -p \#{shared_path}/config" 
-      put db_config.result, "\#{shared_path}/config/database.yml"
-    end
-
-    desc ""
-    task :symlink do
-      run "ln -nfs \#{shared_path}/config/database.yml \#{current_path}/config/"
-    end
-
-  end
-
-end
-
 namespace :deploy do
   desc "Overwrite for the internal Capistrano deploy:start task."
   task :start, :roles => :app do
-    run "echo 'Nothing to start'"
   end
 
   desc "Restart the server"
@@ -346,8 +314,8 @@ namespace :deploy do
   end
 
   desc 'Seeds the database'
-    task :seed, :roles => :app, :except => { :no_release => true } do
-      run "cd \#{current_path} && RAILS_ENV=production rake db:seed"
+  task :seed, :roles => :app, :except => { :no_release => true } do
+    run "cd \#{current_path} && RAILS_ENV=production rake db:seed"
   end
 end
 DEPLOY