alchemy_cms 2.0.7 → 2.1.beta1

data/.gitignore

@@ -14,7 +14,4 @@ tmp
 spec/dummy/index/
 log
 spec/dummy/uploads/
-spec/dummy/.sass-cache/
-spec/dummy/db/migrate
-spec/dummy/db/seeds.rb
-.rvmrc
+.sass-cache

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   #- 1.9.3
 branches:
   only:
-    - master
+    - next_stable
 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

@@ -3,13 +3,18 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in alchemy.gemspec
 gemspec
 
+# gem 'tvdeyen-fleximage', :git => 'git@github.com:masche842/fleximage.git'
+# gem 'userstamp', :git => 'git@github.com:masche842/userstamp.git'
+
+#gem 'attachment_magic', :path => '/Users/tvd/code/ruby/gems/attachment_magic'
+
 group :development, :test do
-	gem 'gettext', '>=1.93.0', :require => false
+	gem 'gettext', '>=1.9.3', :require => false
 end
 
 group :test do
 	gem 'factory_girl_rails'
-	gem "capybara", ">= 0.4.0"
+	gem "capybara"
 	gem "launchy"
 	gem "database_cleaner"
 end

data/README.md

@@ -1,13 +1,10 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png)](http://travis-ci.org/magiclabs/alchemy_cms)
-![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
-
 About
 -----
 
-Alchemy is a powerful Content Management System (CMS) with an extremly flexible content storing architecture.
+**CAUTION: This branch is a pre alpha development branch. For productive environments use [master](https://github.com/magiclabs/alchemy_cms), or [next_stable](https://github.com/magiclabs/alchemy_cms/tree/next_stable) branch.**
 
 Features
 --------
@@ -46,12 +43,13 @@ 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_cms/wiki/Software-Requirements))
+- Hostable on any Server that supports RubyOnRails and ImageMagick ([Software Requirements](https://github.com/magiclabs/alchemy/wiki/Software-Requirements))
 
 Rails Version
 -------------
 
-This version of Alchemy runs with Rails 3.0.10.
+This branch of Alchemy runs with Rails 3.1.1 and Ruby 1.9.2.
+<<<<<<< HEAD
 
 If you are looking for a Rails 2 compatible version check the rails-2 branch.
 
@@ -61,6 +59,8 @@ Ruby Version
 ------------
 
 Alchemy runs with REE, Ruby 1.8.7, Ruby 1.9.2 and Ruby 1.9.3.
+=======
+>>>>>>> 1a8411a94fbcf0ebd5a10ce774f29263b70d7665
 
 Installation
 ------------

data/Rakefile

@@ -1,27 +1,20 @@
-# encoding: UTF-8
-require 'rubygems'
+#!/usr/bin/env rake
 begin
-  require 'bundler'
+  require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rake'
-require 'rdoc/task'
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-import File.join(File.dirname(__FILE__), 'lib/tasks/gettext.rake')
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
-Bundler::GemHelper.install_tasks
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
 
-desc 'Generate documentation for the alchemy plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+desc 'Generate documentation for Alchemy CMS.'
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Alchemy CMS'
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -30,3 +23,18 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.include('app/**/*.rb')
 end
+
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+
+# uncomment the next line if you want to see all dummy app rake tasks
+# load 'rails/tasks/engine.rake'
+load File.join(File.dirname(__FILE__), 'lib/tasks/gettext.rake')
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+Bundler::GemHelper.install_tasks

data/alchemy_cms.gemspec

@@ -19,30 +19,30 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<rails>, ["~> 3.0.15"])
-  s.add_runtime_dependency(%q<authlogic>, ["~> 3.0"])
+  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"])
-  s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.7"])
+  s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.0.9"])
   s.add_runtime_dependency(%q<gettext_i18n_rails>, [">= 0.3"])
   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<userstamp>, ["~> 2.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"])
-  s.add_runtime_dependency(%q<tinymce_hammer>, ["~> 0.2"])
-  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.1.1"])
+  s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0.16"])
+  s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2"])
 
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.6"])
+	s.add_development_dependency(%q<rspec-rails>, ["~> 2.7"])
 	s.add_development_dependency(%q<sqlite3>)
+	s.add_development_dependency 'sass-rails', ['~> 3.1.4']
+	s.add_development_dependency 'coffee-rails', ['~> 3.1.1']
+	s.add_development_dependency 'uglifier', ['>= 1.0.3']
 
-	if !ENV['CI']
-		if RUBY_VERSION =~ /^1.9/
-			s.add_development_dependency(%q<ruby-debug19>)
-		else
-			s.add_development_dependency(%q<ruby-debug>)
-		end
+	if RUBY_VERSION =~ /^1.9/
+		s.add_development_dependency(%q<ruby-debug19>)
+	else
+		s.add_development_dependency(%q<ruby-debug>)
 	end
 
 end

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

@@ -0,0 +1,212 @@
+if (typeof(Alchemy) === 'undefined') {
+	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 = parseInt(id.replace(/^image_picture_/, ''));
+				$.ajax({url:'/admin/pictures/'+id, type: 'PUT', data: {name: value}});
+				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);
+			};
+		},
+		
+		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(selector + ' button.button');
+		},
+		
+		resizeFrame : function() {
+			var options = {
+				top: 90,
+				left: 65,
+				right: 0
+			};
+			var $mainFrame = $('#main_content');
+			var $topFrame = $('#top_menu');
+			var view_height = $(window).height();
+			var view_width = $(window).width();
+			var mainFrameHeight = view_height - options.top;
+			var topFrameHeight = options.top;
+			var width = view_width - options.left - options.right;
+			if ($mainFrame.length > 0) {
+				$mainFrame.css({
+					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();
+			}
+		}
+		
+	});
+	
+})(jQuery);

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

@@ -0,0 +1,36 @@
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+(function($) {
+
+	$.extend(Alchemy, {
+
+		ButtonObserver: function (selector) {
+			$(selector).click(function(event) {
+				Alchemy.disableButton(this);
+			});
+		},
+
+		disableButton: function (button) {
+			var $button = $(button), $clone = $button.clone(), width = $button.outerWidth(), text = $button.text();
+			$button.hide();
+			$button.parent().append($clone);
+			$clone.attr({disabled: true, href: 'javascript:void(0)'})
+			.addClass('disabled cloned-button')
+			.css({width: width})
+			.html('<img src="/assets/alchemy/ajax_loader.gif">')
+			.show();
+			return true;
+		},
+
+		enableButton: function (button) {
+			var $button = $(button);
+			$button.show();
+			$button.parent().find('.cloned-button').remove();
+			return true;
+		}
+
+	});
+
+})(jQuery);