alchemy_cms 2.1 → 2.1.1

data/README.md

@@ -7,8 +7,6 @@ Alchemy CMS
 About
 -----
 
-**CAUTION: This branch is a beta development branch. For productive environments use [master](https://github.com/magiclabs/alchemy_cms) branch.**
-
 Features
 --------
 
@@ -46,14 +44,14 @@ Features
 - Completely free:
   - BSD License
   - No Enterprise Licences, or Community Editions
-- Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy/wiki/Software-Requirements))
+- Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy_cms/wiki/Software-Requirements))
 
 Rails Version
 -------------
 
 This branch of Alchemy runs with Rails 3.1.3.
 
-If you are looking for a Rails 3 compatible version check the master branch.
+If you are looking for a Rails 3 compatible version check the rails-3 branch.
 
 If you are looking for a Rails 2 compatible version check the rails-2 branch.
 
@@ -67,7 +65,7 @@ Installation
 
 Use the installer (recommended):
 
-    gem install alchemy_cms --pre
+    gem install alchemy_cms
     alchemy new my_magicpage
 
 Start the local server:
@@ -95,7 +93,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', '~> 2.1.beta7', :git => 'git://github.com/magiclabs/alchemy_cms.git', :branch => 'next_stable'
+    gem 'alchemy_cms', '~> 2.1'
 
 Run in terminal:
 

data/alchemy_cms.gemspec

@@ -3,34 +3,34 @@ $:.push File.expand_path("../lib", __FILE__)
 require "alchemy/version"
 
 Gem::Specification.new do |s|
-  s.name        = "alchemy_cms"
-  s.version     = Alchemy::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Thomas von Deyen", "Robin Böning", "Carsten Fregin"]
-  s.email       = ["alchemy@magiclabs.de"]
-  s.homepage    = "http://alchemy-cms.com"
-  s.summary     = %q{An extremly flexbile CMS for Rails 3.}
-  s.description = %q{Alchemy is an awesome Rails CMS with an extremely flexible content storing architecture.}
-  s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
-  s.license = 'BSD New'
+	s.name        = "alchemy_cms"
+	s.version     = Alchemy::VERSION
+	s.platform    = Gem::Platform::RUBY
+	s.authors     = ["Thomas von Deyen", "Robin Böning", "Carsten Fregin"]
+	s.email       = ["alchemy@magiclabs.de"]
+	s.homepage    = "http://alchemy-cms.com"
+	s.summary     = %q{An extremly flexbile CMS for Rails 3.1.}
+	s.description = %q{Alchemy is a Rails 3 CMS with a flexible content storing architecture.}
+	s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
+	s.license = 'BSD New'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+	s.files         = `git ls-files`.split("\n")
+	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+	s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+	s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
-  s.add_runtime_dependency(%q<authlogic>)
-  s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
-  s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
-  s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.9"])
-  s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
-  s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
-  s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])
-  s.add_runtime_dependency(%q<magiclabs-userstamp>, ["~> 2.0.2"])
-  s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
-  s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
-  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
+	s.add_runtime_dependency(%q<rails>, ["~> 3.1.3"])
+	s.add_runtime_dependency(%q<authlogic>)
+	s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
+	s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
+	s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.9"])
+	s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
+	s.add_runtime_dependency(%q<acts_as_ferret>, ["~> 0.5"])
+	s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1"])
+	s.add_runtime_dependency(%q<magiclabs-userstamp>, ["~> 2.0.2"])
+	s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
+	s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
+	s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
 
 	s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
 	s.add_development_dependency(%q<sqlite3>)

data/app/assets/stylesheets/alchemy/_defaults.scss

@@ -145,3 +145,11 @@ $default-border: 1px solid #AFAFAF;
 	opacity: $opacity/100;
 	filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{$opacity})");
 }
+
+@mixin disable-user-select {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	-o-user-select: none;
+	user-select: none;
+}

data/app/assets/stylesheets/alchemy/base.css.scss

@@ -466,9 +466,7 @@ h2#sitemap_heading span.page_infos {
 table td.tools .icon, table td.icon .icon {
 	width: 16px;
 	height: 16px;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
+	@include disable-user-select;
 	margin-top: 0;
 	background-repeat: no-repeat;
 	display: inline;

data/app/assets/stylesheets/alchemy/buttons.css.scss

@@ -45,6 +45,7 @@ input.button,
 a.button,
 button.button {
 	@include button-styles;
+	@include disable-user-select;
 }
 
 #new_element button.button {
@@ -200,6 +201,7 @@ div#toolbar label, div#overlay_toolbar label {
 	margin-top: $default-margin;
 	display: block;
 	line-height: 13px;
+	@include disable-user-select;
 }
 
 div.button_with_label:hover label {
@@ -280,9 +282,7 @@ a.icon_button {
 	margin-right: 8px;
 	border: 1px solid #9a9a9a;
 	@include rounded-corner;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
+	@include disable-user-select;
 	overflow: hidden;
 	position: relative;
 	

data/app/assets/stylesheets/alchemy/elements.css.scss

@@ -237,9 +237,7 @@ a.element_move_button {
 	border-top-color: #e3e3e3;
 	height: 20px;
 	background-color: #e5dcca;
-	-moz-user-select: none;
-	-webkit-user-select: none;
-	user-select: none;
+	@include disable-user-select;
 }
 
 form.add_gallery_to_index {
@@ -257,9 +255,7 @@ div.picture_gallery_images {
 }
 
 div.picture_thumbnail div.picture_image img.img_paddingtop {
-	-moz-user-select: none;
-	-webkit-user-select: none;
-	user-select: none;
+	@include disable-user-select;
 }
 
 /* @group add moclecule */
@@ -506,9 +502,7 @@ div.essence_picture_editor:hover .picture_tool_delete {
 	top: 4px;
 	left: 4px;
 	background-color: transparent;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
+	@include disable-user-select;
 }
 
 .dragable_picture .picture_handle {

data/app/assets/stylesheets/alchemy/frame.css.scss

@@ -20,6 +20,7 @@ body#alchemy {
 	left: 65px;
 	z-index: 5;
 	width: 100%;
+	@include disable-user-select;
 }
 
 #left_menu {
@@ -34,15 +35,13 @@ body#alchemy {
 	border-right: $default-border;
 	background: $light-blue;
 	font-size: 10px;
+	@include disable-user-select;
 	
 	label {
 		display: block;
 	}
 	
 	a {
-		-webkit-user-select: none;
-		-moz-user-select: none;
-		user-select: none;
 		text-shadow: #fff 0 0px 4px;
 	}
 }
@@ -191,10 +190,7 @@ div#user_info {
 		padding: 0 8px;
 		background-color: $medium-gray;
 		text-shadow: #fff 0 1px 2px;
-		-webkit-user-select: none;
-		-moz-user-select: none;
-		-o-user-select: none;
-		user-select: none;
+		@include disable-user-select;
 		cursor: default;
 		line-height: 20px;
 		float: left;
@@ -258,10 +254,7 @@ div#user_info {
 			color: $text-color;
 			background-color: $medium-gray;
 			text-shadow: #fff 0 1px 2px;
-			-webkit-user-select: none;
-			-moz-user-select: none;
-			-o-user-select: none;
-			user-select: none;
+			@include disable-user-select;
 			cursor: default;
 			z-index: 10;
 		}

data/app/assets/stylesheets/alchemy/jquery.sb.css.scss

@@ -13,6 +13,7 @@
 	position: relative;
 	zoom: 1;
 	font-size: 11px;
+	@include disable-user-select;
 }
 
 #alchemy .selectbox.full_width .display.full_width {

data/app/assets/stylesheets/alchemy/tables.css.scss

@@ -22,6 +22,7 @@ table tr td.tools {
 	width: 40px;
 	background-color: $light-gray;
 	white-space: nowrap;
+	@include disable-user-select;
 }
 
 td.input, td.label {

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

@@ -41,7 +41,6 @@
 		$('#user_screensize').val(function() {
 			return screen.width+'x'+screen.height;
 		});
-		Alchemy.ButtonObserver('#login .button');
 	});
 </script>
 <%- end -%>

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

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

data/app/views/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/layouts/alchemy/login.html.erb

@@ -27,6 +27,7 @@
 		<script type="text/javascript" charset="utf-8">
 			jQuery(document).ready(function($) {
 				Alchemy.SelectBox('body#alchemy select');
+				Alchemy.ButtonObserver('.button');
 			});
 		</script>
 	</body>

data/bin/alchemy

@@ -25,7 +25,7 @@ class AlchemyInstaller < Thor
 	end
 
 	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 :scm, :type => :string, :aliases => "-s", :desc => "Type of scm (git or svn) 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)
 		@application = project.downcase.strip.gsub(/ /, '_')
@@ -33,7 +33,7 @@ class AlchemyInstaller < Thor
 			
 			say "Generating new Rails App...", :yellow
 			
-			if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT")
+			if system("rails _#{RAILS_VERSION}_ new #{@application} -m #{File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')} -d #{options[:database]} -JT --old-style-hash #{options[:scm].nil? || options[:scm].empty? || options[:scm] == 'svn' ? '--skip-git' : ''}")
 				
 				create_database_yml if options[:database] == 'mysql'
 				

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1"
+	VERSION = "2.1.1"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70285756045860 !ruby/object:Gem::Requirement
+  requirement: &70362121763680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70285756045860
+  version_requirements: *70362121763680
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70285756045440 !ruby/object:Gem::Requirement
+  requirement: &70362121763060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285756045440
+  version_requirements: *70362121763060
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70285756061260 !ruby/object:Gem::Requirement
+  requirement: &70362121762500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285756061260
+  version_requirements: *70362121762500
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70285756060720 !ruby/object:Gem::Requirement
+  requirement: &70362121761980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70285756060720
+  version_requirements: *70362121761980
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70285756060240 !ruby/object:Gem::Requirement
+  requirement: &70362121761320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70285756060240
+  version_requirements: *70362121761320
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70285756059740 !ruby/object:Gem::Requirement
+  requirement: &70362121760820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285756059740
+  version_requirements: *70362121760820
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70285756059240 !ruby/object:Gem::Requirement
+  requirement: &70362121760340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70285756059240
+  version_requirements: *70362121760340
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70285756058760 !ruby/object:Gem::Requirement
+  requirement: &70362121683540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70285756058760
+  version_requirements: *70362121683540
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70285756058280 !ruby/object:Gem::Requirement
+  requirement: &70362121682980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70285756058280
+  version_requirements: *70362121682980
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70285756057800 !ruby/object:Gem::Requirement
+  requirement: &70362121682480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70285756057800
+  version_requirements: *70362121682480
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70285756057320 !ruby/object:Gem::Requirement
+  requirement: &70362121681960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70285756057320
+  version_requirements: *70362121681960
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70285756056840 !ruby/object:Gem::Requirement
+  requirement: &70362121681440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70285756056840
+  version_requirements: *70362121681440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70285756056360 !ruby/object:Gem::Requirement
+  requirement: &70362121680920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70285756056360
+  version_requirements: *70362121680920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70285756055980 !ruby/object:Gem::Requirement
+  requirement: &70362121680540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,9 +166,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285756055980
-description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
-  architecture.
+  version_requirements: *70362121680540
+description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
 executables:
@@ -517,6 +516,8 @@ files:
 - app/views/alchemy/user_sessions/login.html.erb
 - app/views/alchemy/user_sessions/logout.html.erb
 - app/views/alchemy/user_sessions/signup.html.erb
+- app/views/elements/_download_editor.html.erb
+- app/views/elements/_download_view.html.erb
 - app/views/layouts/alchemy/admin.html.erb
 - app/views/layouts/alchemy/login.html.erb
 - app/views/layouts/alchemy/pages.html.erb
@@ -806,7 +807,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2746034174098475999
+      hash: 395153038709539496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -815,14 +816,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2746034174098475999
+      hash: 395153038709539496
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: An extremly flexbile CMS for Rails 3.
+summary: An extremly flexbile CMS for Rails 3.1.
 test_files:
 - spec/alchemy_spec.rb
 - spec/config_spec.rb