alchemy_cms 2.1.12 → 2.2.rc1

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
   - ree
 branches:
   only:
-    - 2.1-stable
+    - master
 before_script:
   #- "mysql -e 'create database alchemy_cms_test;'"
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:schema:load'"

data/Gemfile

@@ -2,26 +2,30 @@ source "http://rubygems.org"
 
 gemspec
 
+#For some strange reason it's only loaded outside any group
+gem 'jasmine'
+gem 'jasminerice'
+
 group :test do
-	gem 'rspec-rails'
-	gem 'sqlite3'
-	gem 'factory_girl_rails', '1.4.0'
-	gem "capybara"
-	gem 'capybara-webkit', '~>0.8.0'
-	gem "launchy"
-	gem "database_cleaner"
-	gem "fuubar"
+  gem 'rspec-rails'
+  gem 'sqlite3'
+  gem 'factory_girl_rails', '1.4.0'
+  gem "capybara"
+  gem 'capybara-webkit', '~>0.8.0'
+  gem "launchy"
+  gem "database_cleaner"
+  gem "fuubar"
 end
 
 group :assets do
-	gem 'uglifier', '>= 1.0.3'
+  gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
 end
 
 group :development do
-	if !ENV["CI"]
-		gem 'debugger', :platform => :ruby_19
-		gem 'ruby-debug', :platform => :ruby_18
-		gem 'guard-spork'
-		gem 'yard'
-	end
-end
+  gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
+  gem 'ruby-debug', :platform => :ruby_18
+  gem 'guard-spork'
+  gem 'yard'
+end

data/README.md

@@ -1,8 +1,8 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.1-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
-[![Development Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=next_stable)](http://travis-ci.org/magiclabs/alchemy_cms)
+![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
 
 About
 -----
@@ -33,7 +33,11 @@ Features
 Rails Version
 -------------
 
-This branch of Alchemy runs with Rails 3.1.
+This branch of Alchemy runs with Rails 3.2.
+
+**This branch is a beta development branch. For productive environments use the current rubygems version, or the latest stable tag.**
+
+If you are looking for a Rails 3.1 compatible version check the 2.1-stable branch.
 
 If you are looking for a Rails 3.0 compatible version check the 2.0-stable branch.
 
@@ -49,7 +53,7 @@ Installation
 
 Use the installer (recommended):
 
-    gem install alchemy_cms
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
 
 Start the local server:
@@ -77,7 +81,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms'
+    gem 'alchemy_cms', :git => 'git://github.com/magiclabs/alchemy_cms.git', :branch => 'next_stable'
 
 Run in terminal:
 
@@ -99,14 +103,14 @@ Tipps
 
 3. You can easily create your element files (for view and editor) depending on the `elements.yml` with this generator:
 
-        rails generate elements
+        rails generate alchemy:elements --skip
 
 Resources
 ---------
 
 * Homepage: <http://alchemy-cms.com>
 * Live-Demo: <http://demo.alchemy-cms.com> (user: demo, password: demo)
-* Guidelines: <http://guides.alchemy-cms.com>
+* Wiki: <http://wiki.alchemy-cms.com>
 * API Documentation: <http://api.alchemy-cms.com>
 * Issue-Tracker: <http://issues.alchemy-cms.com>
 * Sourcecode: <http://source.alchemy-cms.com>

data/alchemy_cms.gemspec

@@ -3,36 +3,38 @@ $:.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.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.name        = "alchemy_cms"
+  s.version     = Alchemy::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Thomas von Deyen", "Robin Böning", "Marc Schettke", "Carsten Fregin"]
+  s.email       = ["alchemy@magiclabs.de"]
+  s.homepage    = "http://alchemy-cms.com"
+  s.summary     = %q{An extremly flexbile CMS for Rails 3.2}
+  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.6"])
-	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.2.0"])
-	s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.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<sass-rails>, ['~> 3.1.4'])
+  s.add_runtime_dependency(%q<rails>, ["~> 3.2.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.1.0"])
+  s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.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>, ["~> 2.0.0"])
+  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
+  s.add_runtime_dependency('sass-rails', ['~> 3.2.3'])
+
+  s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
+  s.add_development_dependency(%q<sqlite3>)
+  s.add_development_dependency(%q<jasminerice>)
 
-	s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
-	s.add_development_dependency(%q<sqlite3>)
 end

data/app/assets/javascripts/alchemy/alchemy.base.js

@@ -1,238 +1,239 @@
 if (typeof(Alchemy) === 'undefined') {
-	var Alchemy = {};
+  var Alchemy = {};
 }
 
 (function ($) {
-	
-	// Setting jQueryUIs global animation duration
-	$.fx.speeds._default = 400;
-	
-	// The Alchemy JavaScript Object contains all Functions
-	$.extend(Alchemy, {
-		
-		inPlaceEditor : function (options) {
-			var defaults = {
-				save_label: 'save', 
-				cancel_label: 'cancel'
-			};
-			var settings = jQuery.extend({}, defaults, options);
-			var cancel_handler = function(element) {
-				jQuery(element).css({overflow: 'hidden'});
-				return true;
-			};
-			var submit_handler = function(element, id, value) {
-				$(element).css({overflow: 'hidden'});
-				id = id.match(/\d+/)[0];
-				$.ajax({
-					url: Alchemy.routes.admin_picture_path(id),
-					type: 'PUT',
-					data: {
-						name: value,
-						size: Alchemy.getUrlParam('size')
-					}
-				});
-				return false;
-			};
-			
-			$('#alchemy .rename').click(function () {
-				$(this).css({overflow: 'visible'});
-			});
-			
-			$('#alchemy .rename').inPlaceEdit({
-				submit : submit_handler,
-				cancel : cancel_handler,
-				html : ' \
-			          <div class="inplace-edit"> \
-			            <input type="text" value="" class="thin_border field" /> \
-			            <div class="buttons"> \
-			              <input type="button" value="'+settings.save_label+'" class="save-button button" /> \
-			              <input type="button" value="'+settings.cancel_label+'" class="cancel-button button" /> \
-			            </div> \
-			          </div>'
-			});
-			
-		},
-		
-		pleaseWaitOverlay : function(show) {
-			if (typeof(show) == 'undefined') {
-				show = true;
-			}
-			var $overlay = $('#overlay');
-			$overlay.css("visibility", show ? 'visible': 'hidden');
-		},
-		
-		toggleElement : function (id, url, token, text) {
-			var toggle = function() {
-				$('#element_'+id+'_folder').hide();
-				$('#element_'+id+'_folder_spinner').show();
-				$.post(url, {
-					authenticity_token: encodeURIComponent(token)
-				}, function(request) {
-					$('#element_'+id+'_folder').show();
-					$('#element_'+id+'_folder_spinner').hide();
-				});
-			}
-			if (Alchemy.isPageDirty()) {
-				Alchemy.openConfirmWindow({
-					title: text.title,
-					message: text.message,
-					okLabel: text.okLabel,
-					cancelLabel: text.cancelLabel,
-					okCallback: toggle
-				});
-				return false;
-			} else {
-				toggle();
-			}
-		},
-		
-		ListFilter : function(selector) {
-			var text = $('#search_field').val().toLowerCase();
-			var $boxes = $(selector);
-			$boxes.map(function() {
-				$this = $(this);
-				$this.css({
-					display: $this.attr('name').toLowerCase().indexOf(text) != -1 ? '' : 'none'
-				});
-			});
-		},
-		
-		fadeImage : function(image, spinner_selector) {
-			try {
-				$(spinner_selector).hide();
-				$(image).fadeIn(600);
-			} catch(e) {
-				Alchemy.debug(e);
-			};
-		},
-		
-		removePicture : function(selector) {
-			var $form_field = $(selector);
-			var $element = $form_field.parents('.element_editor');
-			if ($form_field) {
-				$form_field.val('');
-				$form_field.prev().remove();
-				$form_field.parent().addClass('missing');
-				Alchemy.setElementDirty($element);
-			}
-		},
-		
-		saveElement : function(form) {
-			// disabled for now. I think we don't need this.
-			return true;
-			// remove this comment if you have problems with saving tinymce content
-			// var $rtf_contents = $(form).find('div.content_rtf_editor');
-			// if ($rtf_contents.size() > 0) {
-			// 	$rtf_contents.each(function() {
-			// 		var id = $(this).children('textarea.tinymce').attr('id');
-			// 		tinymce.get(id).save();
-			// 	});
-			// }
-		},
-		
-		setElementSaved : function(selector) {
-			var $element = $(selector);
-			Alchemy.setElementClean(selector);
-			Alchemy.enableButton('button.button', $element);
-		},
-		
-		resizeFrame : function() {
-			var options = {
-				left: 65,
-				right: 0
-			};
-			var $mainFrame = $('#main_content');
-			var $topFrame = $('#top_menu');
-			var view_height = $(window).height();
-			var view_width = $(window).width();
-			var topFrameHeight = $topFrame.height();
-			var mainFrameHeight = view_height - topFrameHeight;
-			var width = view_width - options.left - options.right;
-			if ($mainFrame.length > 0) {
-				$mainFrame.css({
-					top: topFrameHeight,
-					width: width,
-					height: mainFrameHeight
-				});
-			}
-			if ($topFrame.length > 0) {
-				$topFrame.css({
-					width: width,
-					height: topFrameHeight
-				});
-			}
-		},
-		
-		Tooltips : function() {
-			var xOffset = 10;
-			var yOffset = 20;		
-			$(".tooltip").hover(function(e) {
-				this.original_title = this.title;
-				if (this.original_title == '') {
-					this.tooltip_content = $(this).next('.tooltip_content').html();
-				} else {
-					this.tooltip_content = this.original_title;
-				}
-				if (this.tooltip_content != null) {
-					this.title = "";
-					$("body").append("<div id='tooltip'>"+ this.tooltip_content +"</div>");
-					$("#tooltip")
-					.css("top",(e.pageY - xOffset) + "px")
-					.css("left",(e.pageX + yOffset) + "px")
-					.fadeIn(400);
-				}
-			},
-			function() {
-				this.title = this.original_title;
-				$("#tooltip").remove();
-			});
-			$(".tooltip").mousemove(function(e) {
-				$("#tooltip")
-				.css("top",(e.pageY - xOffset) + "px")
-				.css("left",(e.pageX + yOffset) + "px");
-			});
-		},
-		
-		SelectBox : function(selector) {
-			$(selector).sb({animDuration: 0, fixedWidth: true});
-		},
-		
-		Buttons : function(options) {
-			$("button, input:submit, a.button").button(options);
-		},
-
-		handleEssenceCheckbox: function (checkbox) {
-			var $checkbox = $(checkbox);
-			if (checkbox.checked) {
-				$('#' + checkbox.id + '_hidden').remove();
-			} else {
-				$checkbox.after('<input type="hidden" value="0" name="'+checkbox.name+'" id="'+checkbox.id+'_hidden">');
-			}
-		},
-		
-		selectOrCreateCellTab: function (cell_name, label) {
-			if ($('#cell_'+cell_name).size() === 0) {
-				$('#cells').tabs('add', '#cell_'+cell_name, label);
-				$('#cell_'+cell_name).addClass('sortable_cell');
-			}
-			$('#cells').tabs('select', 'cell_'+cell_name);
-		},
-
-		debug : function(e) {
-			if (window['console']) {
-				console.debug(e);
-				console.trace();
-			}
-		},
-
-		getUrlParam : function(name){
-			var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
-			if (results)
-				return results[1] || 0;
-		},
-
-		locale : 'en'
-
-	});
-	
+
+  // Setting jQueryUIs global animation duration
+  $.fx.speeds._default = 400;
+
+  // The Alchemy JavaScript Object contains all Functions
+  $.extend(Alchemy, {
+
+    inPlaceEditor:function (options) {
+      var defaults = {
+        save_label:'save',
+        cancel_label:'cancel'
+      };
+      var settings = jQuery.extend({}, defaults, options);
+      var cancel_handler = function (element) {
+        jQuery(element).css({overflow:'hidden'});
+        return true;
+      };
+      var submit_handler = function (element, id, value) {
+        $(element).css({overflow:'hidden'});
+        id = id.match(/\d+/)[0];
+        $.ajax({
+          url:Alchemy.routes.admin_picture_path(id),
+          type:'PUT',
+          data:{
+            name:value,
+            size:Alchemy.getUrlParam('size')
+          }
+        });
+        return false;
+      };
+
+      $('#alchemy .rename').click(function () {
+        $(this).css({overflow:'visible'});
+      });
+
+      $('#alchemy .rename').inPlaceEdit({
+        submit:submit_handler,
+        cancel:cancel_handler,
+        html:' \
+                <div class="inplace-edit"> \
+                  <input type="text" value="" class="thin_border field" /> \
+                  <div class="buttons"> \
+                    <input type="button" value="' + settings.save_label + '" class="save-button button" /> \
+                    <input type="button" value="' + settings.cancel_label + '" class="cancel-button button" /> \
+                  </div> \
+                </div>'
+      });
+
+    },
+
+    pleaseWaitOverlay:function (show) {
+      if (typeof(show) == 'undefined') {
+        show = true;
+      }
+      var $overlay = $('#overlay');
+      $overlay.css("visibility", show ? 'visible' : 'hidden');
+    },
+
+    toggleElement:function (id, url, token, text) {
+      var toggle = function () {
+        $('#element_' + id + '_folder').hide();
+        $('#element_' + id + '_folder_spinner').show();
+        $.post(url, {
+          authenticity_token:encodeURIComponent(token)
+        }, function (request) {
+          $('#element_' + id + '_folder').show();
+          $('#element_' + id + '_folder_spinner').hide();
+        });
+      }
+      if (Alchemy.isPageDirty()) {
+        Alchemy.openConfirmWindow({
+          title:text.title,
+          message:text.message,
+          okLabel:text.okLabel,
+          cancelLabel:text.cancelLabel,
+          okCallback:toggle
+        });
+        return false;
+      } else {
+        toggle();
+      }
+    },
+
+    ListFilter:function (selector) {
+      var text = $('#search_field').val().toLowerCase();
+      var $boxes = $(selector);
+      $boxes.map(function () {
+        $this = $(this);
+        $this.css({
+          display:$this.attr('name').toLowerCase().indexOf(text) != -1 ? '' : 'none'
+        });
+      });
+    },
+
+    fadeImage:function (image, spinner_selector) {
+      try {
+        $(spinner_selector).hide();
+        $(image).fadeIn(600);
+      } catch (e) {
+        Alchemy.debug(e);
+      }
+      ;
+    },
+
+    removePicture:function (selector) {
+      var $form_field = $(selector);
+      var $element = $form_field.parents('.element_editor');
+      if ($form_field) {
+        $form_field.val('');
+        $form_field.prev().remove();
+        $form_field.parent().addClass('missing');
+        Alchemy.setElementDirty($element);
+      }
+    },
+
+    saveElement:function (form) {
+      // disabled for now. I think we don't need this.
+      return true;
+      // remove this comment if you have problems with saving tinymce content
+      // var $rtf_contents = $(form).find('div.content_rtf_editor');
+      // if ($rtf_contents.size() > 0) {
+      //   $rtf_contents.each(function() {
+      //     var id = $(this).children('textarea.tinymce').attr('id');
+      //     tinymce.get(id).save();
+      //   });
+      // }
+    },
+
+    setElementSaved:function (selector) {
+      var $element = $(selector);
+      Alchemy.setElementClean(selector);
+      Alchemy.enableButton('button.button', $element);
+    },
+
+    resizeFrame:function () {
+      var options = {
+        left:65,
+        right:0
+      };
+      var $mainFrame = $('#main_content');
+      var $topFrame = $('#top_menu');
+      var view_height = $(window).height();
+      var view_width = $(window).width();
+      var topFrameHeight = $topFrame.height();
+      var mainFrameHeight = view_height - topFrameHeight;
+      var width = view_width - options.left - options.right;
+      if ($mainFrame.length > 0) {
+        $mainFrame.css({
+          top:topFrameHeight,
+          width:width,
+          height:mainFrameHeight
+        });
+      }
+      if ($topFrame.length > 0) {
+        $topFrame.css({
+          width:width,
+          height:topFrameHeight
+        });
+      }
+    },
+
+    Tooltips:function () {
+      var xOffset = 10;
+      var yOffset = 20;
+      $(".tooltip").hover(function (e) {
+          this.original_title = this.title;
+          if (this.original_title == '') {
+            this.tooltip_content = $(this).next('.tooltip_content').html();
+          } else {
+            this.tooltip_content = this.original_title;
+          }
+          if (this.tooltip_content != null) {
+            this.title = "";
+            $("body").append("<div id='tooltip'>" + this.tooltip_content + "</div>");
+            $("#tooltip")
+              .css("top", (e.pageY - xOffset) + "px")
+              .css("left", (e.pageX + yOffset) + "px")
+              .fadeIn(400);
+          }
+        },
+        function () {
+          this.title = this.original_title;
+          $("#tooltip").remove();
+        });
+      $(".tooltip").mousemove(function (e) {
+        $("#tooltip")
+          .css("top", (e.pageY - xOffset) + "px")
+          .css("left", (e.pageX + yOffset) + "px");
+      });
+    },
+
+    SelectBox:function (selector) {
+      $(selector).sb({animDuration:0, fixedWidth:true});
+    },
+
+    Buttons:function (options) {
+      $("button, input:submit, a.button").button(options);
+    },
+
+    handleEssenceCheckbox:function (checkbox) {
+      var $checkbox = $(checkbox);
+      if (checkbox.checked) {
+        $('#' + checkbox.id + '_hidden').remove();
+      } else {
+        $checkbox.after('<input type="hidden" value="0" name="' + checkbox.name + '" id="' + checkbox.id + '_hidden">');
+      }
+    },
+
+    selectOrCreateCellTab:function (cell_name, label) {
+      if ($('#cell_' + cell_name).size() === 0) {
+        $('#cells').tabs('add', '#cell_' + cell_name, label);
+        $('#cell_' + cell_name).addClass('sortable_cell');
+      }
+      $('#cells').tabs('select', 'cell_' + cell_name);
+    },
+
+    debug:function (e) {
+      if (window['console']) {
+        console.debug(e);
+        console.trace();
+      }
+    },
+
+    getUrlParam:function (name) {
+      var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
+      if (results)
+        return results[1] || 0;
+    },
+
+    locale:'en'
+
+  });
+
 })(jQuery);