refinerycms-core 0.9.9.19 → 0.9.9.20

data/public/javascripts/rails.js

@@ -9,167 +9,289 @@
  *
  * Requires jQuery 1.4.3 or later.
  * https://github.com/rails/jquery-ujs
+
+ * Uploading file using rails.js
+ * =============================
+ *
+ * By default, browsers do not allow files to be uploaded via AJAX. As a result, if there are any non-blank file fields
+ * in the remote form, this adapter aborts the AJAX submission and allows the form to submit through standard means.
+ *
+ * The `ajax:aborted:file` event allows you to bind your own handler to process the form submission however you wish.
+ *
+ * Ex:
+ *     $('form').live('ajax:aborted:file', function(event, elements){
+ *       // Implement own remote file-transfer handler here for non-blank file inputs passed in `elements`.
+ *       // Returning false in this handler tells rails.js to disallow standard form submission
+ *       return false;
+ *     });
+ *
+ * The `ajax:aborted:file` event is fired when a file-type input is detected with a non-blank value.
+ *
+ * Third-party tools can use this hook to detect when an AJAX file upload is attempted, and then use
+ * techniques like the iframe method to upload the file instead.
+ *
+ * Required fields in rails.js
+ * ===========================
+ *
+ * If any blank required inputs (required="required") are detected in the remote form, the whole form submission
+ * is canceled. Note that this is unlike file inputs, which still allow standard (non-AJAX) form submission.
+ *
+ * The `ajax:aborted:required` event allows you to bind your own handler to inform the user of blank required inputs.
+ *
+ * !! Note that Opera does not fire the form's submit event if there are blank required inputs, so this event may never
+ *    get fired in Opera. This event is what causes other browsers to exhibit the same submit-aborting behavior.
+ *
+ * Ex:
+ *     $('form').live('ajax:aborted:required', function(event, elements){
+ *       // Returning false in this handler tells rails.js to submit the form anyway.
+ *       // The blank required inputs are passed to this function in `elements`.
+ *       return ! confirm("Would you like to submit the form with missing info?");
+ *     });
  */
 
 (function($) {
-	// Make sure that every Ajax request sends the CSRF token
-	function CSRFProtection(fn) {
-		var token = $('meta[name="csrf-token"]').attr('content');
-		if (token) fn(function(xhr) { xhr.setRequestHeader('X-CSRF-Token', token) });
-	}
-	if ($().jquery == '1.5') { // gruesome hack
-		var factory = $.ajaxSettings.xhr;
-		$.ajaxSettings.xhr = function() {
-			var xhr = factory();
-			CSRFProtection(function(setHeader) {
-				var open = xhr.open;
-				xhr.open = function() { open.apply(this, arguments); setHeader(this) };
-			});
-			return xhr;
-		};
-	}
-	else $(document).ajaxSend(function(e, xhr) {
-		CSRFProtection(function(setHeader) { setHeader(xhr) });
-	});
 
-	// Triggers an event on an element and returns the event result
-	function fire(obj, name, data) {
-		var event = new $.Event(name);
-		obj.trigger(event, data);
-		return event.result !== false;
-	}
+	// Shorthand to make it a little easier to call public rails functions from within rails.js
+	var rails;
 
-	// Submits "remote" forms and links with ajax
-	function handleRemote(element) {
-		var method, url, data,
-			dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType);
-
-		if (element.is('form')) {
-			method = element.attr('method');
-			url = element.attr('action');
-			data = element.serializeArray();
-			// memoized value from clicked submit button
-			var button = element.data('ujs:submit-button');
-			if (button) {
-				data.push(button);
-				element.data('ujs:submit-button', null);
-			}
-		} else {
-			method = element.attr('data-method');
-			url = element.attr('href');
-			data = null;
-		}
+	$.rails = rails = {
+
+		// Link elements bound by jquery-ujs
+		linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote]',
+
+		// Form elements bound by jquery-ujs
+		formSubmitSelector: 'form',
+
+		// Form input elements bound by jquery-ujs
+		formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])',
+
+		// Form input elements disabled during form submission
+		disableSelector: 'input[data-disable-with], button[data-disable-with], textarea[data-disable-with]',
+
+		// Form input elements re-enabled after form submission
+		enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled',
+
+		// Form required input elements
+		requiredInputSelector: 'input[name][required],textarea[name][required]',
+
+		// Form file input elements
+		fileInputSelector: 'input:file',
+
+		// Make sure that every Ajax request sends the CSRF token
+		CSRFProtection: function(xhr) {
+			var token = $('meta[name="csrf-token"]').attr('content');
+			if (token) xhr.setRequestHeader('X-CSRF-Token', token);
+		},
+
+		// Triggers an event on an element and returns false if the event result is false
+		fire: function(obj, name, data) {
+			var event = $.Event(name);
+			obj.trigger(event, data);
+			return event.result !== false;
+		},
+
+		// Submits "remote" forms and links with ajax
+		handleRemote: function(element) {
+			var method, url, data,
+				dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+
+			if (rails.fire(element, 'ajax:before')) {
 
-		$.ajax({
-			url: url, type: method || 'GET', data: data, dataType: dataType,
-			// stopping the "ajax:beforeSend" event will cancel the ajax request
-			beforeSend: function(xhr, settings) {
-				if (settings.dataType === undefined) {
-					xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+				if (element.is('form')) {
+					method = element.attr('method');
+					url = element.attr('action');
+					data = element.serializeArray();
+					// memoized value from clicked submit button
+					var button = element.data('ujs:submit-button');
+					if (button) {
+						data.push(button);
+						element.data('ujs:submit-button', null);
+					}
+				} else {
+					method = element.data('method');
+					url = element.attr('href');
+					data = null;
 				}
-				return fire(element, 'ajax:beforeSend', [xhr, settings]);
-			},
-			success: function(data, status, xhr) {
-				element.trigger('ajax:success', [data, status, xhr]);
-			},
-			complete: function(xhr, status) {
-				element.trigger('ajax:complete', [xhr, status]);
-			},
-			error: function(xhr, status, error) {
-				element.trigger('ajax:error', [xhr, status, error]);
+
+				$.ajax({
+					url: url, type: method || 'GET', data: data, dataType: dataType,
+					// stopping the "ajax:beforeSend" event will cancel the ajax request
+					beforeSend: function(xhr, settings) {
+						if (settings.dataType === undefined) {
+							xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+						}
+						return rails.fire(element, 'ajax:beforeSend', [xhr, settings]);
+					},
+					success: function(data, status, xhr) {
+						element.trigger('ajax:success', [data, status, xhr]);
+					},
+					complete: function(xhr, status) {
+						element.trigger('ajax:complete', [xhr, status]);
+					},
+					error: function(xhr, status, error) {
+						element.trigger('ajax:error', [xhr, status, error]);
+					}
+				});
 			}
-		});
-	}
+		},
 
-	// Handles "data-method" on links such as:
-	// <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
-	function handleMethod(link) {
-		var href = link.attr('href'),
-			method = link.attr('data-method'),
-			csrf_token = $('meta[name=csrf-token]').attr('content'),
-			csrf_param = $('meta[name=csrf-param]').attr('content'),
-			form = $('<form method="post" action="' + href + '"></form>'),
-			metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
-
-		if (csrf_param !== undefined && csrf_token !== undefined) {
-			metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
-		}
+		// Handles "data-method" on links such as:
+		// <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
+		handleMethod: function(link) {
+			var href = link.attr('href'),
+				method = link.data('method'),
+				csrf_token = $('meta[name=csrf-token]').attr('content'),
+				csrf_param = $('meta[name=csrf-param]').attr('content'),
+				form = $('<form method="post" action="' + href + '"></form>'),
+				metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
 
-		form.hide().append(metadata_input).appendTo('body');
-		form.submit();
-	}
+			if (csrf_param !== undefined && csrf_token !== undefined) {
+				metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
+			}
 
-	function disableFormElements(form) {
-		form.find('input[data-disable-with]').each(function() {
-			var input = $(this);
-			input.data('ujs:enable-with', input.val())
-				.val(input.attr('data-disable-with'))
-				.attr('disabled', 'disabled');
-		});
-	}
+			form.hide().append(metadata_input).appendTo('body');
+			form.submit();
+		},
 
-	function enableFormElements(form) {
-		form.find('input[data-disable-with]').each(function() {
-			var input = $(this);
-			input.val(input.data('ujs:enable-with')).removeAttr('disabled');
-		});
-	}
+		/* Disables form elements:
+			- Caches element value in 'ujs:enable-with' data store
+			- Replaces element text with value of 'data-disable-with' attribute
+			- Adds disabled=disabled attribute
+		*/
+		disableFormElements: function(form) {
+			form.find(rails.disableSelector).each(function() {
+				var element = $(this), method = element.is('button') ? 'html' : 'val';
+				element.data('ujs:enable-with', element[method]());
+				element[method](element.data('disable-with'));
+				element.attr('disabled', 'disabled');
+			});
+		},
 
-	function allowAction(element) {
-		var message = element.attr('data-confirm');
-		return !message || (fire(element, 'confirm') && confirm(message));
-	}
+		/* Re-enables disabled form elements:
+			- Replaces element text with cached value from 'ujs:enable-with' data store (created in `disableFormElements`)
+			- Removes disabled attribute
+		*/
+		enableFormElements: function(form) {
+			form.find(rails.enableSelector).each(function() {
+				var element = $(this), method = element.is('button') ? 'html' : 'val';
+				if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with'));
+				element.removeAttr('disabled');
+			});
+		},
+
+		// If message provided in 'data-confirm' attribute, fires `confirm` event and returns result of confirm dialog.
+		// Attaching a handler to the element's `confirm` event that returns false cancels the confirm dialog.
+		allowAction: function(element) {
+			var message = element.data('confirm');
+			return !message || (rails.fire(element, 'confirm') && confirm(message));
+		},
+
+		// Helper function which checks for blank inputs in a form that match the specified CSS selector
+		blankInputs: function(form, specifiedSelector, nonBlank) {
+			var inputs = $(), input,
+				selector = specifiedSelector || 'input,textarea';
+			form.find(selector).each(function() {
+				input = $(this);
+				// Collect non-blank inputs if nonBlank option is true, otherwise, collect blank inputs
+				if (nonBlank ? input.val() : !input.val()) {
+					inputs = inputs.add(input);
+				}
+			});
+			return inputs.length ? inputs : false;
+		},
+
+		// Helper function which checks for non-blank inputs in a form that match the specified CSS selector
+		nonBlankInputs: function(form, specifiedSelector) {
+			return rails.blankInputs(form, specifiedSelector, true); // true specifies nonBlank
+		},
 
-	function requiredValuesMissing(form) {
-		var missing = false;
-		form.find('input[name][required]').each(function() {
-			if (!$(this).val()) missing = true;
-		});
-		return missing;
+		// Helper function, needed to provide consistent behavior in IE
+		stopEverything: function(e) {
+			e.stopImmediatePropagation();
+			return false;
+		},
+
+		// find all the submit events directly bound to the form and
+		// manually invoke them. If anyone returns false then stop the loop
+		callFormSubmitBindings: function(form) {
+			var events = form.data('events'), continuePropagation = true;
+			if (events !== undefined && events['submit'] !== undefined) {
+				$.each(events['submit'], function(i, obj){
+					if (typeof obj.handler === 'function') return continuePropagation = obj.handler(obj.data);
+				});
+			}
+			return continuePropagation;
+		}
+	};
+
+	// ajaxPrefilter is a jQuery 1.5 feature
+	if ('ajaxPrefilter' in $) {
+		$.ajaxPrefilter(function(options, originalOptions, xhr){ rails.CSRFProtection(xhr); });
+	} else {
+		$(document).ajaxSend(function(e, xhr){ rails.CSRFProtection(xhr); });
 	}
 
-	$('a[data-confirm], a[data-method], a[data-remote]').live('click.rails', function(e) {
+	$(rails.linkClickSelector).live('click.rails', function(e) {
 		var link = $(this);
-		if (!allowAction(link)) return false;
+		if (!rails.allowAction(link)) return rails.stopEverything(e);
 
-		if (link.attr('data-remote') != undefined) {
-			handleRemote(link);
+		if (link.data('remote') !== undefined) {
+			rails.handleRemote(link);
 			return false;
-		} else if (link.attr('data-method')) {
-			handleMethod(link);
+		} else if (link.data('method')) {
+			rails.handleMethod(link);
 			return false;
 		}
 	});
 
-	$('form').live('submit.rails', function(e) {
-		var form = $(this), remote = form.attr('data-remote') != undefined;
-		if (!allowAction(form)) return false;
+	$(rails.formSubmitSelector).live('submit.rails', function(e) {
+		var form = $(this),
+			remote = form.data('remote') !== undefined,
+			blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector),
+			nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector);
+
+		if (!rails.allowAction(form)) return rails.stopEverything(e);
 
-		// skip other logic when required values are missing
-		if (requiredValuesMissing(form)) return !remote;
+		// skip other logic when required values are missing or file upload is present
+		if (blankRequiredInputs && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
+			return !remote;
+		}
 
 		if (remote) {
-			handleRemote(form);
+			if (nonBlankFileInputs) {
+				return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+			}
+
+			// If browser does not support submit bubbling, then this live-binding will be called before direct
+			// bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
+			if (!$.support.submitBubbles && rails.callFormSubmitBindings(form) === false) return rails.stopEverything(e);
+
+			rails.handleRemote(form);
 			return false;
 		} else {
 			// slight timeout so that the submit button gets properly serialized
-			setTimeout(function(){ disableFormElements(form) }, 13);
+			setTimeout(function(){ rails.disableFormElements(form); }, 13);
 		}
 	});
 
-	$('form input[type=submit], form button[type=submit], form button:not([type])').live('click.rails', function() {
+	$(rails.formInputClickSelector).live('click.rails', function(event) {
 		var button = $(this);
-		if (!allowAction(button)) return false;
+
+		if (!rails.allowAction(button)) return rails.stopEverything(event);
+
 		// register the pressed submit button
-		var name = button.attr('name'), data = name ? {name:name, value:button.val()} : null;
+		var name = button.attr('name'),
+			data = name ? {name:name, value:button.val()} : null;
+
 		button.closest('form').data('ujs:submit-button', data);
 	});
 
-	$('form').live('ajax:beforeSend.rails', function(event) {
-		if (this == event.target) disableFormElements($(this));
+	$(rails.formSubmitSelector).live('ajax:beforeSend.rails', function(event) {
+		if (this == event.target) rails.disableFormElements($(this));
 	});
 
-	$('form').live('ajax:complete.rails', function(event) {
-		if (this == event.target) enableFormElements($(this));
+	$(rails.formSubmitSelector).live('ajax:complete.rails', function(event) {
+		if (this == event.target) rails.enableFormElements($(this));
 	});
+
 })( jQuery );

data/public/javascripts/refinery/admin.js

@@ -569,7 +569,7 @@ var link_dialog = {
                                  ($('#web_address_target_blank').get(0).checked ? "_blank" : "")
                                );
     });
-   
+
     $('#web_address_target_blank').click(function(){
       parent.document.getElementById('wym_target').value = this.checked ? "_blank" : "";
     });

data/public/javascripts/refinery/core.js

@@ -25,3 +25,5 @@ init_flash_messages = function(){
   });
   $('#flash.flash_message').prependTo('#records');
 };
+
+

data/public/javascripts/wymeditor/lang/de.js

@@ -1,19 +1,20 @@
 WYMeditor.STRINGS['de'] = {
+  Apply_Style: 'Style',
 	Strong:			 'Fett',
 	Emphasis:		 'Kursiv',
-	Superscript:		'Text hochstellen',
-	Subscript:		'Text tiefstellen',
-	Ordered_List:	 'Geordnete Liste einfügen',
-	Unordered_List:	 'Ungeordnete Liste einfügen',
+	Superscript:		'Hochstellen',
+	Subscript:		'Tiefstellen',
+	Ordered_List:	 'Geordnete Liste',
+	Unordered_List:	 'Ungeordnete Liste',
 	Indent:			 'Einzug erhöhen',
 	Outdent:			'Einzug vermindern',
-	Undo:			 'Befehle rückgängig machen',
-	Redo:			 'Befehle wiederherstellen',
-	Link:			 'Hyperlink einfügen',
+	Undo:			 'Rückgängig',
+	Redo:			 'Wiederherstellen',
+	Link:			 'Hyperlink',
 	Unlink:			 'Hyperlink entfernen',
-	Image:			'Bild einfügen',
-	Table:			'Tabelle einfügen',
-	HTML:			 'HTML anzeigen/verstecken',
+	Image:			'Bild',
+	Table:			'Tabelle',
+	HTML:			 'HTML',
 	Paragraph:		'Absatz',
 	Heading_1:		'Überschrift 1',
 	Heading_2:		'Überschrift 2',
@@ -41,5 +42,4 @@ WYMeditor.STRINGS['de'] = {
 	Classes:			'Klassen',
 	Status:			 'Status',
 	Source_Code:		'Quellcode'
-};
-
+};

data/public/javascripts/wymeditor/lang/sk.js

@@ -0,0 +1,45 @@
+WYMeditor.STRINGS['sk'] = {
+	Strong:			 'Tučné',
+	Emphasis:		 'Kurzíva',
+	Superscript:		'Horný index',
+	Subscript:		'Dolný index',
+	Ordered_List:	 'Číslovaný zoznam',
+	Unordered_List:	 'Nečíslovaný zoznam',
+	Indent:			 'Zväčšiť odsadenie',
+	Outdent:			'Zmeňšiť odsadenie',
+	Undo:			 'Späť',
+	Redo:			 'Znovu',
+	Link:			 'Vytvoriť odkaz',
+	Unlink:			 'Zrušiť odkaz',
+	Image:			'Obrázok',
+	Table:			'Tabuľka',
+	HTML:			 'HTML',
+	Paragraph:		'Odstavec',
+	Heading_1:		'Nadpis 1. úrovne',
+	Heading_2:		'Nadpis 2. úrovne',
+	Heading_3:		'Nadpis 3. úrovne',
+	Heading_4:		'Nadpis 4. úrovne',
+	Heading_5:		'Nadpis 5. úrovne',
+	Heading_6:		'Nadpis 6. úrovne',
+	Preformatted:	 'Predformátovaný text',
+	Blockquote:		 'Citácia',
+	Table_Header:	 'Hlavičková bunka tabulky',
+	URL:				'Adresa',
+	Title:			'Text po nabehnutí myšou',
+	Alternative_Text: 'Text pre prípad nezobrazenia obrázku',
+	Caption:			'Titulok tabuľky',
+	Summary:			'Zhrnutie obsahu',
+	Number_Of_Rows:	 'Počet riadkov',
+	Number_Of_Cols:	 'Počet stĺpcov',
+	Submit:			 'Vytvoriť',
+	Cancel:			 'Zrušiť',
+	Choose:			 'Vybrať',
+	Preview:			'Náhľad',
+	Paste_From_Word:	'Vložiť z Wordu',
+	Tools:			'Nástroje',
+	Containers:		 'Typy obsahu',
+	Classes:			'Triedy',
+	Status:			 'Stav',
+	Source_Code:		'Zdrojový kód'
+};
+

data/public/stylesheets/refinery/refinery.css

@@ -213,7 +213,7 @@ a#site_bar_refinery_cms_logo {
 #content, #page_container {
   background-color: white;
 }
-body.login #site_bar_content, body.login header {
+body.login #site_bar_content {
   width: 650px;
 }
 body.login #page_container {
@@ -221,6 +221,9 @@ body.login #page_container {
 }
 body.login header {
   background: #eaeaea;
+  width: 620px;
+  padding: 0px 15px 1em;
+  height: auto;
 }
 header, footer, nav {
   display: block;
@@ -305,7 +308,6 @@ body.login header h1 {
   padding-bottom: 0px;
   line-height: 30px;
   padding-top: 15px;
-  min-height: 60px;
 }
 #menu, header .jcarousel-container {
   display: block;

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.19}
+  s.version           = %q{0.9.9.20}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-04-22}
+  s.date              = %q{2011-04-28}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '= 0.9.9.19'
-  s.add_dependency 'refinerycms-settings',        '= 0.9.9.19'
+  s.add_dependency 'refinerycms-base',            '= 0.9.9.20'
+  s.add_dependency 'refinerycms-settings',        '= 0.9.9.20'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
@@ -379,6 +379,7 @@ Gem::Specification.new do |s|
     'public/javascripts/wymeditor/lang/pt.js',
     'public/javascripts/wymeditor/lang/rs.js',
     'public/javascripts/wymeditor/lang/ru.js',
+    'public/javascripts/wymeditor/lang/sk.js',
     'public/javascripts/wymeditor/lang/sl.js',
     'public/javascripts/wymeditor/lang/sv.js',
     'public/javascripts/wymeditor/lang/tr.js',
@@ -416,6 +417,7 @@ Gem::Specification.new do |s|
     'spec',
     'spec/lib',
     'spec/lib/refinery',
+    'spec/lib/refinery/plugin_spec.rb',
     'spec/lib/refinery/plugins_spec.rb'
   ]
 end