typus 3.0.10 → 3.0.11.rc1

data/.gitignore

@@ -12,4 +12,3 @@ log/*.log
 test/fixtures/rails_app/public/system/*
 test/fixtures/rails_app/tmp/*
 tmp/**/*
-vendor/

data/Gemfile

@@ -8,7 +8,7 @@ gemspec
 
 gem 'acts_as_list'
 gem 'acts_as_tree'
-gem 'dragonfly', '~>0.8.1'
+gem 'dragonfly', '~> 0.9'
 gem 'factory_girl'
 gem 'paperclip'
 gem 'rack-cache', :require => 'rack/cache'
@@ -32,7 +32,7 @@ group :development, :test do
   end
 
   platforms :ruby do
-    gem 'mysql2'
+    gem 'mysql2', '0.2.7'
     gem 'pg'
     gem 'sqlite3'
   end
@@ -41,9 +41,13 @@ end
 
 # MongoDB support is still in "beta" mode, so I'm not testing it for the moment.
 group :production do
-  # MongoDB support
-  gem 'mongoid', '2.0.0.rc.7'
-  gem 'bson_ext'
+
+  gem 'mongoid'
+
+  platforms :ruby do
+    gem 'bson_ext'
+  end
+
 end
 
 group :production do

data/README.md

@@ -1,83 +1,47 @@
 # Typus: Admin Panel for Ruby on Rails applications
 
-**Typus** is designed for a single activity:
-
-    Trusted users editing structured content.
-
-**Typus** doesn't try to be all the things to all the people but it's
-extensible enough to match lots of use cases.
+**Typus** allows trusted users to edit structured content.
 
 ## Key Features
 
-- Built-in Authentication.
-- User Permissions by using Access Control Lists. (stored in yaml files)
+- Built-in Authentication and Access Control Lists.
 - CRUD and custom actions for your models on a clean interface.
-- Internationalized interface (Català, German, Greek, English, Español,
-Français, Magyar, Italiano, Portuguese, Russian, 中文)
+- Internationalized interface ([See available translations][locales])
 - Customizable and extensible templates.
-- Integrated [paperclip][1] and [dragonfly][2] attachments viewer.
-- Low memory footprint.
-- Works with `Rails 3.0.5`.
-- Tested with `ruby-1.8.7-p334`, `ree-1.8.7-2011.03` and `ruby-1.9.2-p180` and `jruby-1.5.6`.
+- Integrated [paperclip][paperclip] and [dragonfly][dragonfly] attachments viewer.
+- Works with `Rails 3.0.X`.
+- Tested with latest versions of `1.8.7`, `ree`, `1.9.2` and `jruby`.
 - Tested with `SQLite`, `MySQL` and `PostgreSQL`.
-- MIT License, the same as Rails.
 
 ## Links
 
-- [Documentation](http://core.typuscms.com/)
-- [Demo](http://demo.typuscms.com/) ([Code][3])
+- [Documentation](https://github.com/fesplugas/typus/wiki)
+- [Issues](https://github.com/fesplugas/typus/issues)
+- [Demo](http://demo.typuscms.com/) ([Code][code])
 - [Source Code](http://github.com/fesplugas/typus)
 - [Mailing List](http://groups.google.com/group/typus)
 - [Gems](http://rubygems.org/gems/typus)
 - [Contributors List](http://github.com/fesplugas/typus/contributors)
-- [Continous Integration](http://ci.typuscms.com/)
 
 ## Installing
 
 Add **Typus** to your `Gemfile`
 
-    gem 'typus', :git => 'https://github.com/fesplugas/typus.git'
-
-    # If you have problems with "Smart HTTP" use the "Git Transfer Protocol".
-    # gem 'typus', :git => 'git://github.com/fesplugas/typus.git'
+    gem 'typus', :git => 'git://github.com/fesplugas/typus.git'
 
-Update your bundle
+Update your bundle, run the generator and start the application server:
 
     $ bundle install
-
-Run the generator
-
     $ rails generate typus
-
-Start the application server
-
     $ rails server
 
 and go to <http://0.0.0.0:3000/admin>.
 
-## MIT License
-
-    Copyright (c) 2007-2011 Francesc Esplugas Marti
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
+## License
 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Typus is released under the MIT license.
 
-[1]: http://rubygems.org/gems/paperclip
-[2]: http://rubygems.org/gems/dragonfly
-[3]: https://github.com/fesplugas/typus/tree/master/test/fixtures/rails_app
+[paperclip]: http://rubygems.org/gems/paperclip
+[dragonfly]: http://rubygems.org/gems/dragonfly
+[code]: https://github.com/fesplugas/typus/tree/master/test/fixtures/rails_app
+[locales]: https://github.com/fesplugas/typus/tree/master/config/locales

data/app/assets/vendor/typus/javascripts/application.js

@@ -0,0 +1,2 @@
+// Place your application-specific JavaScript functions and classes for
+// the admin panel here.

data/app/assets/vendor/typus/javascripts/jquery.application.js

@@ -0,0 +1,29 @@
+$(document).ready(function() {
+
+  $("#quicksearch").searchField();
+
+  $('.resource :input', document.myForm).bind("change", function() { setConfirmUnload(true); });
+
+  $("a.fancybox").fancybox({
+    'titlePosition': 'over',
+    'type': 'image'
+  });
+
+  $(".iframe").fancybox({
+    'width': '75%',
+    'height': '100%',
+    'autoScale': false,
+    'transitionIn': 'none',
+    'transitionOut': 'none',
+    'type': 'iframe'
+  });
+
+});
+
+function setConfirmUnload(on) {
+  window.onbeforeunload = (on) ? unloadMessage : null;
+}
+
+function unloadMessage() {
+  return "You have entered new data on this page. If you navigate away from this page without first saving your data, the changes will be lost.";
+}

data/app/assets/vendor/typus/javascripts/jquery.rails.autocomplete.js

@@ -0,0 +1,32 @@
+/*
+* Unobtrusive autocomplete
+*
+* To use it, you just have to include the HTML attribute autocomplete
+* with the autocomplete URL as the value
+*
+*   Example:
+*       <input type="text" autocomplete="/url/to/autocomplete">
+* 
+* Optionally, you can use a jQuery selector to specify a field that can
+* be updated with the element id whenever you find a matching value
+*
+*   Example:
+*       <input type="text" autocomplete="/url/to/autocomplete" id_element="#id_field">
+*/
+
+$(document).ready(function(){
+  $('input[data-autocomplete]').each(function(i){
+    $(this).autocomplete({
+      minLength: 3,
+      source: $(this).attr('data-autocomplete'),
+
+      select: function(event, ui) {
+        $(this).val(ui.item.value);
+        if ($(this).attr('id_element')) {
+          $($(this).attr('id_element')).val(ui.item.id);
+        }
+        return false;
+      }
+    });
+  });
+});

data/app/assets/vendor/typus/javascripts/jquery.rails.js

@@ -0,0 +1,158 @@
+/**
+ * Unobtrusive scripting adapter for jQuery
+ *
+ * Requires jQuery 1.4.3 or later.
+ * https://github.com/rails/jquery-ujs
+ */
+
+(function($) {
+	// Make sure that every Ajax request sends the CSRF token
+	function CSRFProtection(xhr) {
+		var token = $('meta[name="csrf-token"]').attr('content');
+		if (token) xhr.setRequestHeader('X-CSRF-Token', token);
+	}
+	if ('ajaxPrefilter' in $) $.ajaxPrefilter(function(options, originalOptions, xhr){ CSRFProtection(xhr) });
+	else $(document).ajaxSend(function(e, xhr){ CSRFProtection(xhr) });
+
+	// Triggers an event on an element and returns the event result
+	function fire(obj, name, data) {
+		var event = $.Event(name);
+		obj.trigger(event, data);
+		return event.result !== false;
+	}
+
+	// Submits "remote" forms and links with ajax
+	function handleRemote(element) {
+		var method, url, data,
+			dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+
+	if (fire(element, 'ajax:before')) {
+		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;
+		}
+			$.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 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.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" />';
+		}
+
+		form.hide().append(metadata_input).appendTo('body');
+		form.submit();
+	}
+
+	function disableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.data('ujs:enable-with', input.val())
+				.val(input.data('disable-with'))
+				.attr('disabled', 'disabled');
+		});
+	}
+
+	function enableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.val(input.data('ujs:enable-with')).removeAttr('disabled');
+		});
+	}
+
+	function allowAction(element) {
+		var message = element.data('confirm');
+		return !message || (fire(element, 'confirm') && confirm(message));
+	}
+
+	function requiredValuesMissing(form) {
+		var missing = false;
+		form.find('input[name][required]').each(function() {
+			if (!$(this).val()) missing = true;
+		});
+		return missing;
+	}
+
+	$('a[data-confirm], a[data-method], a[data-remote]').live('click.rails', function(e) {
+		var link = $(this);
+		if (!allowAction(link)) return false;
+
+		if (link.data('remote') != undefined) {
+			handleRemote(link);
+			return false;
+		} else if (link.data('method')) {
+			handleMethod(link);
+			return false;
+		}
+	});
+
+	$('form').live('submit.rails', function(e) {
+		var form = $(this), remote = form.data('remote') != undefined;
+		if (!allowAction(form)) return false;
+
+		// skip other logic when required values are missing
+		if (requiredValuesMissing(form)) return !remote;
+
+		if (remote) {
+			handleRemote(form);
+			return false;
+		} else {
+			// slight timeout so that the submit button gets properly serialized
+			setTimeout(function(){ disableFormElements(form) }, 13);
+		}
+	});
+
+	$('form input[type=submit], form button[type=submit], form button:not([type])').live('click.rails', function() {
+		var button = $(this);
+		if (!allowAction(button)) return false;
+		// register the pressed submit button
+		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));
+	});
+
+	$('form').live('ajax:complete.rails', function(event) {
+		if (this == event.target) enableFormElements($(this));
+	});
+})( jQuery );

data/app/assets/vendor/typus/javascripts/jquery.searchField.js

@@ -0,0 +1,91 @@
+/*
+ * searchField - jQuery plugin to display and remove
+ * a default value in a searchvalue on blur/focus
+ *
+ * Copyright (c) 2008 J�örn Zaefferer
+ *
+ * $Id$
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Clear the help text in a search field (either in the value or title attribute)
+ * when focused, and restore it on blur if nothing was entered. If the value is
+ * blank but there is a title attribute, the title will be moved to the initial value.
+ *
+ * @example $('#quicksearch').searchField();
+ * @before <input id="quicksearch" title="Enter search here" name="quicksearch" />
+ * @result <input id="quicksearch" value="Enter search here" name="quicksearch" />
+ *
+ * @name searchField
+ * @type jQuery
+ * @cat Plugins/SearchField
+ */
+jQuery.fn.searchField = function(mark){
+	return this.each(function() {
+		var mark = mark || this.title;
+
+		if (!mark)
+			return;
+
+		var target = this;
+		var original = $(this);
+		if (this.type == "password") {
+			target = $("<input />")
+				.insertBefore(this)
+				.css("display", $(this).css("display"))
+				.attr("size", this.size)
+				.attr("title", this.title)
+				.attr("class", this.className)
+				.addClass("watermark")[0];
+			if (!this.value) {
+				$(this).hide();
+			} else {
+				$(target).hide();
+			}
+		}
+
+		if(!target.value || mark == this.value) {
+			$(target).addClass("watermark");
+		}
+
+		// setup initial value
+		if (!this.value || target != this) {
+			target.value = mark;
+		}
+
+		$(target).focus(function() {
+				if (target != original[0]) {
+				$(this).hide();
+				original.show().focus();
+			} else if (this.value == mark) {
+				this.value = '';
+				$(this).removeClass("watermark");
+			}
+		});
+		$(this).blur(function() {
+			if (!this.value.length) {
+				if (target != original[0]) {
+					$(target).show();
+					original.hide();
+				} else {
+					this.value = mark;
+					$(this).addClass("watermark")
+				}
+			}
+		});
+
+		// make sure that when the form is submitted, the watermark is
+		// replaced with the empty string, which is usually the expected behavior.
+       $(this).parents("form:first").submit(function(){
+           if ($(target).hasClass("watermark")) {
+               $(target).attr("value", "");
+               $(target).removeClass("watermark");
+           }
+       });
+	});
+};