+  }})
{% endblock %}
{% block title %}
 }})
+
- {% snippet 'home/snippets/search.html' %}
+ {% block search %}
+ {% snippet 'home/snippets/search.html' %}
+ {% endblock %}
+ value = parseInt( elem.css( "zIndex" ), 10 );
+ if ( !isNaN( value ) && value !== 0 ) {
+ return value;
+ }
+ }
+ elem = elem.parent();
+ }
+ }
+
+ return 0;
+ },
+
+ uniqueId: function() {
+ return this.each(function() {
+ if ( !this.id ) {
+ this.id = "ui-id-" + (++uuid);
+ }
+ });
+ },
+
+ removeUniqueId: function() {
+ return this.each(function() {
+ if ( runiqueId.test( this.id ) ) {
+ $( this ).removeAttr( "id" );
+ }
+ });
+ }
+});
+
+// selectors
+function focusable( element, isTabIndexNotNaN ) {
+ var map, mapName, img,
+ nodeName = element.nodeName.toLowerCase();
+ if ( "area" === nodeName ) {
+ map = element.parentNode;
+ mapName = map.name;
+ if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+ return false;
+ }
+ img = $( "img[usemap=#" + mapName + "]" )[0];
+ return !!img && visible( img );
+ }
+ return ( /input|select|textarea|button|object/.test( nodeName ) ?
+ !element.disabled :
+ "a" === nodeName ?
+ element.href || isTabIndexNotNaN :
+ isTabIndexNotNaN) &&
+ // the element and all of its ancestors must be visible
+ visible( element );
+}
+
+function visible( element ) {
+ return $.expr.filters.visible( element ) &&
+ !$( element ).parents().addBack().filter(function() {
+ return $.css( this, "visibility" ) === "hidden";
+ }).length;
+}
+
+$.extend( $.expr[ ":" ], {
+ data: $.expr.createPseudo ?
+ $.expr.createPseudo(function( dataName ) {
+ return function( elem ) {
+ return !!$.data( elem, dataName );
+ };
+ }) :
+ // support: jQuery <1.8
+ function( elem, i, match ) {
+ return !!$.data( elem, match[ 3 ] );
+ },
+
+ focusable: function( element ) {
+ return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
+ },
+
+ tabbable: function( element ) {
+ var tabIndex = $.attr( element, "tabindex" ),
+ isTabIndexNaN = isNaN( tabIndex );
+ return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
+ }
+});
+
+// support: jQuery <1.8
+if ( !$( "" ).outerWidth( 1 ).jquery ) {
+ $.each( [ "Width", "Height" ], function( i, name ) {
+ var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+ type = name.toLowerCase(),
+ orig = {
+ innerWidth: $.fn.innerWidth,
+ innerHeight: $.fn.innerHeight,
+ outerWidth: $.fn.outerWidth,
+ outerHeight: $.fn.outerHeight
+ };
+
+ function reduce( elem, size, border, margin ) {
+ $.each( side, function() {
+ size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
+ if ( border ) {
+ size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
+ }
+ if ( margin ) {
+ size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
+ }
+ });
+ return size;
+ }
+
+ $.fn[ "inner" + name ] = function( size ) {
+ if ( size === undefined ) {
+ return orig[ "inner" + name ].call( this );
+ }
+
+ return this.each(function() {
+ $( this ).css( type, reduce( this, size ) + "px" );
+ });
+ };
+
+ $.fn[ "outer" + name] = function( size, margin ) {
+ if ( typeof size !== "number" ) {
+ return orig[ "outer" + name ].call( this, size );
+ }
+
+ return this.each(function() {
+ $( this).css( type, reduce( this, size, true, margin ) + "px" );
+ });
+ };
+ });
+}
+
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+ $.fn.addBack = function( selector ) {
+ return this.add( selector == null ?
+ this.prevObject : this.prevObject.filter( selector )
+ );
+ };
+}
+
+// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
+if ( $( "" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
+ $.fn.removeData = (function( removeData ) {
+ return function( key ) {
+ if ( arguments.length ) {
+ return removeData.call( this, $.camelCase( key ) );
+ } else {
+ return removeData.call( this );
+ }
+ };
+ })( $.fn.removeData );
+}
+
+
+
+
+
+// deprecated
+$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+$.support.selectstart = "onselectstart" in document.createElement( "div" );
+$.fn.extend({
+ disableSelection: function() {
+ return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+ ".ui-disableSelection", function( event ) {
+ event.preventDefault();
+ });
+ },
+
+ enableSelection: function() {
+ return this.unbind( ".ui-disableSelection" );
+ }
+});
+
+$.extend( $.ui, {
+ // $.ui.plugin is deprecated. Use $.widget() extensions instead.
+ plugin: {
+ add: function( module, option, set ) {
+ var i,
+ proto = $.ui[ module ].prototype;
+ for ( i in set ) {
+ proto.plugins[ i ] = proto.plugins[ i ] || [];
+ proto.plugins[ i ].push( [ option, set[ i ] ] );
+ }
+ },
+ call: function( instance, name, args ) {
+ var i,
+ set = instance.plugins[ name ];
+ if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
+ return;
+ }
+
+ for ( i = 0; i < set.length; i++ ) {
+ if ( instance.options[ set[ i ][ 0 ] ] ) {
+ set[ i ][ 1 ].apply( instance.element, args );
+ }
+ }
+ }
+ },
+
+ // only used by resizable
+ hasScroll: function( el, a ) {
+
+ //If overflow is hidden, the element might have extra content, but the user wants to hide it
+ if ( $( el ).css( "overflow" ) === "hidden") {
+ return false;
+ }
+
+ var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+ has = false;
+
+ if ( el[ scroll ] > 0 ) {
+ return true;
+ }
+
+ // TODO: determine which cases actually cause this to happen
+ // if the element doesn't have the scroll set, see if it's possible to
+ // set the scroll
+ el[ scroll ] = 1;
+ has = ( el[ scroll ] > 0 );
+ el[ scroll ] = 0;
+ return has;
+ }
+});
+
+})( jQuery );
diff --git a/ckan/public/base/vendor/jquery.ui.mouse.js b/ckan/public/base/vendor/jquery.ui.mouse.js
new file mode 100755
index 00000000000..62022cedf02
--- /dev/null
+++ b/ckan/public/base/vendor/jquery.ui.mouse.js
@@ -0,0 +1,169 @@
+/*!
+ * jQuery UI Mouse 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/mouse/
+ *
+ * Depends:
+ * jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var mouseHandled = false;
+$( document ).mouseup( function() {
+ mouseHandled = false;
+});
+
+$.widget("ui.mouse", {
+ version: "1.10.3",
+ options: {
+ cancel: "input,textarea,button,select,option",
+ distance: 1,
+ delay: 0
+ },
+ _mouseInit: function() {
+ var that = this;
+
+ this.element
+ .bind("mousedown."+this.widgetName, function(event) {
+ return that._mouseDown(event);
+ })
+ .bind("click."+this.widgetName, function(event) {
+ if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
+ $.removeData(event.target, that.widgetName + ".preventClickEvent");
+ event.stopImmediatePropagation();
+ return false;
+ }
+ });
+
+ this.started = false;
+ },
+
+ // TODO: make sure destroying one instance of mouse doesn't mess with
+ // other instances of mouse
+ _mouseDestroy: function() {
+ this.element.unbind("."+this.widgetName);
+ if ( this._mouseMoveDelegate ) {
+ $(document)
+ .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+ .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
+ }
+ },
+
+ _mouseDown: function(event) {
+ // don't let more than one widget handle mouseStart
+ if( mouseHandled ) { return; }
+
+ // we may have missed mouseup (out of window)
+ (this._mouseStarted && this._mouseUp(event));
+
+ this._mouseDownEvent = event;
+
+ var that = this,
+ btnIsLeft = (event.which === 1),
+ // event.target.nodeName works around a bug in IE 8 with
+ // disabled inputs (#7620)
+ elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
+ if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+ return true;
+ }
+
+ this.mouseDelayMet = !this.options.delay;
+ if (!this.mouseDelayMet) {
+ this._mouseDelayTimer = setTimeout(function() {
+ that.mouseDelayMet = true;
+ }, this.options.delay);
+ }
+
+ if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+ this._mouseStarted = (this._mouseStart(event) !== false);
+ if (!this._mouseStarted) {
+ event.preventDefault();
+ return true;
+ }
+ }
+
+ // Click event may never have fired (Gecko & Opera)
+ if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
+ $.removeData(event.target, this.widgetName + ".preventClickEvent");
+ }
+
+ // these delegates are required to keep context
+ this._mouseMoveDelegate = function(event) {
+ return that._mouseMove(event);
+ };
+ this._mouseUpDelegate = function(event) {
+ return that._mouseUp(event);
+ };
+ $(document)
+ .bind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+ .bind("mouseup."+this.widgetName, this._mouseUpDelegate);
+
+ event.preventDefault();
+
+ mouseHandled = true;
+ return true;
+ },
+
+ _mouseMove: function(event) {
+ // IE mouseup check - mouseup happened when mouse was out of window
+ if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
+ return this._mouseUp(event);
+ }
+
+ if (this._mouseStarted) {
+ this._mouseDrag(event);
+ return event.preventDefault();
+ }
+
+ if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+ this._mouseStarted =
+ (this._mouseStart(this._mouseDownEvent, event) !== false);
+ (this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+ }
+
+ return !this._mouseStarted;
+ },
+
+ _mouseUp: function(event) {
+ $(document)
+ .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+ .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
+
+ if (this._mouseStarted) {
+ this._mouseStarted = false;
+
+ if (event.target === this._mouseDownEvent.target) {
+ $.data(event.target, this.widgetName + ".preventClickEvent", true);
+ }
+
+ this._mouseStop(event);
+ }
+
+ return false;
+ },
+
+ _mouseDistanceMet: function(event) {
+ return (Math.max(
+ Math.abs(this._mouseDownEvent.pageX - event.pageX),
+ Math.abs(this._mouseDownEvent.pageY - event.pageY)
+ ) >= this.options.distance
+ );
+ },
+
+ _mouseDelayMet: function(/* event */) {
+ return this.mouseDelayMet;
+ },
+
+ // These are placeholder methods, to be overriden by extending plugin
+ _mouseStart: function(/* event */) {},
+ _mouseDrag: function(/* event */) {},
+ _mouseStop: function(/* event */) {},
+ _mouseCapture: function(/* event */) { return true; }
+});
+
+})(jQuery);
diff --git a/ckan/public/base/vendor/jquery.ui.sortable.js b/ckan/public/base/vendor/jquery.ui.sortable.js
new file mode 100755
index 00000000000..c9f2c9021cb
--- /dev/null
+++ b/ckan/public/base/vendor/jquery.ui.sortable.js
@@ -0,0 +1,1285 @@
+/*!
+ * jQuery UI Sortable 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/sortable/
+ *
+ * Depends:
+ * jquery.ui.core.js
+ * jquery.ui.mouse.js
+ * jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+/*jshint loopfunc: true */
+
+function isOverAxis( x, reference, size ) {
+ return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+function isFloating(item) {
+ return (/left|right/).test(item.css("float")) || (/inline|table-cell/).test(item.css("display"));
+}
+
+$.widget("ui.sortable", $.ui.mouse, {
+ version: "1.10.3",
+ widgetEventPrefix: "sort",
+ ready: false,
+ options: {
+ appendTo: "parent",
+ axis: false,
+ connectWith: false,
+ containment: false,
+ cursor: "auto",
+ cursorAt: false,
+ dropOnEmpty: true,
+ forcePlaceholderSize: false,
+ forceHelperSize: false,
+ grid: false,
+ handle: false,
+ helper: "original",
+ items: "> *",
+ opacity: false,
+ placeholder: false,
+ revert: false,
+ scroll: true,
+ scrollSensitivity: 20,
+ scrollSpeed: 20,
+ scope: "default",
+ tolerance: "intersect",
+ zIndex: 1000,
+
+ // callbacks
+ activate: null,
+ beforeStop: null,
+ change: null,
+ deactivate: null,
+ out: null,
+ over: null,
+ receive: null,
+ remove: null,
+ sort: null,
+ start: null,
+ stop: null,
+ update: null
+ },
+ _create: function() {
+
+ var o = this.options;
+ this.containerCache = {};
+ this.element.addClass("ui-sortable");
+
+ //Get the items
+ this.refresh();
+
+ //Let's determine if the items are being displayed horizontally
+ this.floating = this.items.length ? o.axis === "x" || isFloating(this.items[0].item) : false;
+
+ //Let's determine the parent's offset
+ this.offset = this.element.offset();
+
+ //Initialize mouse events for interaction
+ this._mouseInit();
+
+ //We're ready to go
+ this.ready = true;
+
+ },
+
+ _destroy: function() {
+ this.element
+ .removeClass("ui-sortable ui-sortable-disabled");
+ this._mouseDestroy();
+
+ for ( var i = this.items.length - 1; i >= 0; i-- ) {
+ this.items[i].item.removeData(this.widgetName + "-item");
+ }
+
+ return this;
+ },
+
+ _setOption: function(key, value){
+ if ( key === "disabled" ) {
+ this.options[ key ] = value;
+
+ this.widget().toggleClass( "ui-sortable-disabled", !!value );
+ } else {
+ // Don't call widget base _setOption for disable as it adds ui-state-disabled class
+ $.Widget.prototype._setOption.apply(this, arguments);
+ }
+ },
+
+ _mouseCapture: function(event, overrideHandle) {
+ var currentItem = null,
+ validHandle = false,
+ that = this;
+
+ if (this.reverting) {
+ return false;
+ }
+
+ if(this.options.disabled || this.options.type === "static") {
+ return false;
+ }
+
+ //We have to refresh the items data once first
+ this._refreshItems(event);
+
+ //Find out if the clicked node (or one of its parents) is a actual item in this.items
+ $(event.target).parents().each(function() {
+ if($.data(this, that.widgetName + "-item") === that) {
+ currentItem = $(this);
+ return false;
+ }
+ });
+ if($.data(event.target, that.widgetName + "-item") === that) {
+ currentItem = $(event.target);
+ }
+
+ if(!currentItem) {
+ return false;
+ }
+ if(this.options.handle && !overrideHandle) {
+ $(this.options.handle, currentItem).find("*").addBack().each(function() {
+ if(this === event.target) {
+ validHandle = true;
+ }
+ });
+ if(!validHandle) {
+ return false;
+ }
+ }
+
+ this.currentItem = currentItem;
+ this._removeCurrentsFromItems();
+ return true;
+
+ },
+
+ _mouseStart: function(event, overrideHandle, noActivation) {
+
+ var i, body,
+ o = this.options;
+
+ this.currentContainer = this;
+
+ //We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+ this.refreshPositions();
+
+ //Create and append the visible helper
+ this.helper = this._createHelper(event);
+
+ //Cache the helper size
+ this._cacheHelperProportions();
+
+ /*
+ * - Position generation -
+ * This block generates everything position related - it's the core of draggables.
+ */
+
+ //Cache the margins of the original element
+ this._cacheMargins();
+
+ //Get the next scrolling parent
+ this.scrollParent = this.helper.scrollParent();
+
+ //The element's absolute position on the page minus margins
+ this.offset = this.currentItem.offset();
+ this.offset = {
+ top: this.offset.top - this.margins.top,
+ left: this.offset.left - this.margins.left
+ };
+
+ $.extend(this.offset, {
+ click: { //Where the click happened, relative to the element
+ left: event.pageX - this.offset.left,
+ top: event.pageY - this.offset.top
+ },
+ parent: this._getParentOffset(),
+ relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+ });
+
+ // Only after we got the offset, we can change the helper's position to absolute
+ // TODO: Still need to figure out a way to make relative sorting possible
+ this.helper.css("position", "absolute");
+ this.cssPosition = this.helper.css("position");
+
+ //Generate the original position
+ this.originalPosition = this._generatePosition(event);
+ this.originalPageX = event.pageX;
+ this.originalPageY = event.pageY;
+
+ //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+ (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+ //Cache the former DOM position
+ this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+ //If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+ if(this.helper[0] !== this.currentItem[0]) {
+ this.currentItem.hide();
+ }
+
+ //Create the placeholder
+ this._createPlaceholder();
+
+ //Set a containment if given in the options
+ if(o.containment) {
+ this._setContainment();
+ }
+
+ if( o.cursor && o.cursor !== "auto" ) { // cursor option
+ body = this.document.find( "body" );
+
+ // support: IE
+ this.storedCursor = body.css( "cursor" );
+ body.css( "cursor", o.cursor );
+
+ this.storedStylesheet = $( "" ).appendTo( body );
+ }
+
+ if(o.opacity) { // opacity option
+ if (this.helper.css("opacity")) {
+ this._storedOpacity = this.helper.css("opacity");
+ }
+ this.helper.css("opacity", o.opacity);
+ }
+
+ if(o.zIndex) { // zIndex option
+ if (this.helper.css("zIndex")) {
+ this._storedZIndex = this.helper.css("zIndex");
+ }
+ this.helper.css("zIndex", o.zIndex);
+ }
+
+ //Prepare scrolling
+ if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+ this.overflowOffset = this.scrollParent.offset();
+ }
+
+ //Call callbacks
+ this._trigger("start", event, this._uiHash());
+
+ //Recache the helper size
+ if(!this._preserveHelperProportions) {
+ this._cacheHelperProportions();
+ }
+
+
+ //Post "activate" events to possible containers
+ if( !noActivation ) {
+ for ( i = this.containers.length - 1; i >= 0; i-- ) {
+ this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+ }
+ }
+
+ //Prepare possible droppables
+ if($.ui.ddmanager) {
+ $.ui.ddmanager.current = this;
+ }
+
+ if ($.ui.ddmanager && !o.dropBehaviour) {
+ $.ui.ddmanager.prepareOffsets(this, event);
+ }
+
+ this.dragging = true;
+
+ this.helper.addClass("ui-sortable-helper");
+ this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+ return true;
+
+ },
+
+ _mouseDrag: function(event) {
+ var i, item, itemElement, intersection,
+ o = this.options,
+ scrolled = false;
+
+ //Compute the helpers position
+ this.position = this._generatePosition(event);
+ this.positionAbs = this._convertPositionTo("absolute");
+
+ if (!this.lastPositionAbs) {
+ this.lastPositionAbs = this.positionAbs;
+ }
+
+ //Do scrolling
+ if(this.options.scroll) {
+ if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+
+ if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+ this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+ } else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
+ this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+ }
+
+ if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+ this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+ } else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
+ this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+ }
+
+ } else {
+
+ if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+ scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+ } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+ scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+ }
+
+ if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+ scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+ } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+ scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+ }
+
+ }
+
+ if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+ $.ui.ddmanager.prepareOffsets(this, event);
+ }
+ }
+
+ //Regenerate the absolute position used for position checks
+ this.positionAbs = this._convertPositionTo("absolute");
+
+ //Set the helper position
+ if(!this.options.axis || this.options.axis !== "y") {
+ this.helper[0].style.left = this.position.left+"px";
+ }
+ if(!this.options.axis || this.options.axis !== "x") {
+ this.helper[0].style.top = this.position.top+"px";
+ }
+
+ //Rearrange
+ for (i = this.items.length - 1; i >= 0; i--) {
+
+ //Cache variables and intersection, continue if no intersection
+ item = this.items[i];
+ itemElement = item.item[0];
+ intersection = this._intersectsWithPointer(item);
+ if (!intersection) {
+ continue;
+ }
+
+ // Only put the placeholder inside the current Container, skip all
+ // items form other containers. This works because when moving
+ // an item from one container to another the
+ // currentContainer is switched before the placeholder is moved.
+ //
+ // Without this moving items in "sub-sortables" can cause the placeholder to jitter
+ // beetween the outer and inner container.
+ if (item.instance !== this.currentContainer) {
+ continue;
+ }
+
+ // cannot intersect with itself
+ // no useless actions that have been done before
+ // no action if the item moved is the parent of the item checked
+ if (itemElement !== this.currentItem[0] &&
+ this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
+ !$.contains(this.placeholder[0], itemElement) &&
+ (this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
+ ) {
+
+ this.direction = intersection === 1 ? "down" : "up";
+
+ if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
+ this._rearrange(event, item);
+ } else {
+ break;
+ }
+
+ this._trigger("change", event, this._uiHash());
+ break;
+ }
+ }
+
+ //Post events to containers
+ this._contactContainers(event);
+
+ //Interconnect with droppables
+ if($.ui.ddmanager) {
+ $.ui.ddmanager.drag(this, event);
+ }
+
+ //Call callbacks
+ this._trigger("sort", event, this._uiHash());
+
+ this.lastPositionAbs = this.positionAbs;
+ return false;
+
+ },
+
+ _mouseStop: function(event, noPropagation) {
+
+ if(!event) {
+ return;
+ }
+
+ //If we are using droppables, inform the manager about the drop
+ if ($.ui.ddmanager && !this.options.dropBehaviour) {
+ $.ui.ddmanager.drop(this, event);
+ }
+
+ if(this.options.revert) {
+ var that = this,
+ cur = this.placeholder.offset(),
+ axis = this.options.axis,
+ animation = {};
+
+ if ( !axis || axis === "x" ) {
+ animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft);
+ }
+ if ( !axis || axis === "y" ) {
+ animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop);
+ }
+ this.reverting = true;
+ $(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
+ that._clear(event);
+ });
+ } else {
+ this._clear(event, noPropagation);
+ }
+
+ return false;
+
+ },
+
+ cancel: function() {
+
+ if(this.dragging) {
+
+ this._mouseUp({ target: null });
+
+ if(this.options.helper === "original") {
+ this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+ } else {
+ this.currentItem.show();
+ }
+
+ //Post deactivating events to containers
+ for (var i = this.containers.length - 1; i >= 0; i--){
+ this.containers[i]._trigger("deactivate", null, this._uiHash(this));
+ if(this.containers[i].containerCache.over) {
+ this.containers[i]._trigger("out", null, this._uiHash(this));
+ this.containers[i].containerCache.over = 0;
+ }
+ }
+
+ }
+
+ if (this.placeholder) {
+ //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+ if(this.placeholder[0].parentNode) {
+ this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+ }
+ if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
+ this.helper.remove();
+ }
+
+ $.extend(this, {
+ helper: null,
+ dragging: false,
+ reverting: false,
+ _noFinalSort: null
+ });
+
+ if(this.domPosition.prev) {
+ $(this.domPosition.prev).after(this.currentItem);
+ } else {
+ $(this.domPosition.parent).prepend(this.currentItem);
+ }
+ }
+
+ return this;
+
+ },
+
+ serialize: function(o) {
+
+ var items = this._getItemsAsjQuery(o && o.connected),
+ str = [];
+ o = o || {};
+
+ $(items).each(function() {
+ var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
+ if (res) {
+ str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
+ }
+ });
+
+ if(!str.length && o.key) {
+ str.push(o.key + "=");
+ }
+
+ return str.join("&");
+
+ },
+
+ toArray: function(o) {
+
+ var items = this._getItemsAsjQuery(o && o.connected),
+ ret = [];
+
+ o = o || {};
+
+ items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
+ return ret;
+
+ },
+
+ /* Be careful with the following core functions */
+ _intersectsWith: function(item) {
+
+ var x1 = this.positionAbs.left,
+ x2 = x1 + this.helperProportions.width,
+ y1 = this.positionAbs.top,
+ y2 = y1 + this.helperProportions.height,
+ l = item.left,
+ r = l + item.width,
+ t = item.top,
+ b = t + item.height,
+ dyClick = this.offset.click.top,
+ dxClick = this.offset.click.left,
+ isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && ( y1 + dyClick ) < b ),
+ isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && ( x1 + dxClick ) < r ),
+ isOverElement = isOverElementHeight && isOverElementWidth;
+
+ if ( this.options.tolerance === "pointer" ||
+ this.options.forcePointerForContainers ||
+ (this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
+ ) {
+ return isOverElement;
+ } else {
+
+ return (l < x1 + (this.helperProportions.width / 2) && // Right Half
+ x2 - (this.helperProportions.width / 2) < r && // Left Half
+ t < y1 + (this.helperProportions.height / 2) && // Bottom Half
+ y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+ }
+ },
+
+ _intersectsWithPointer: function(item) {
+
+ var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+ isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+ isOverElement = isOverElementHeight && isOverElementWidth,
+ verticalDirection = this._getDragVerticalDirection(),
+ horizontalDirection = this._getDragHorizontalDirection();
+
+ if (!isOverElement) {
+ return false;
+ }
+
+ return this.floating ?
+ ( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
+ : ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
+
+ },
+
+ _intersectsWithSides: function(item) {
+
+ var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+ isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+ verticalDirection = this._getDragVerticalDirection(),
+ horizontalDirection = this._getDragHorizontalDirection();
+
+ if (this.floating && horizontalDirection) {
+ return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
+ } else {
+ return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
+ }
+
+ },
+
+ _getDragVerticalDirection: function() {
+ var delta = this.positionAbs.top - this.lastPositionAbs.top;
+ return delta !== 0 && (delta > 0 ? "down" : "up");
+ },
+
+ _getDragHorizontalDirection: function() {
+ var delta = this.positionAbs.left - this.lastPositionAbs.left;
+ return delta !== 0 && (delta > 0 ? "right" : "left");
+ },
+
+ refresh: function(event) {
+ this._refreshItems(event);
+ this.refreshPositions();
+ return this;
+ },
+
+ _connectWith: function() {
+ var options = this.options;
+ return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
+ },
+
+ _getItemsAsjQuery: function(connected) {
+
+ var i, j, cur, inst,
+ items = [],
+ queries = [],
+ connectWith = this._connectWith();
+
+ if(connectWith && connected) {
+ for (i = connectWith.length - 1; i >= 0; i--){
+ cur = $(connectWith[i]);
+ for ( j = cur.length - 1; j >= 0; j--){
+ inst = $.data(cur[j], this.widgetFullName);
+ if(inst && inst !== this && !inst.options.disabled) {
+ queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
+ }
+ }
+ }
+ }
+
+ queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
+
+ for (i = queries.length - 1; i >= 0; i--){
+ queries[i][0].each(function() {
+ items.push(this);
+ });
+ }
+
+ return $(items);
+
+ },
+
+ _removeCurrentsFromItems: function() {
+
+ var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
+
+ this.items = $.grep(this.items, function (item) {
+ for (var j=0; j < list.length; j++) {
+ if(list[j] === item.item[0]) {
+ return false;
+ }
+ }
+ return true;
+ });
+
+ },
+
+ _refreshItems: function(event) {
+
+ this.items = [];
+ this.containers = [this];
+
+ var i, j, cur, inst, targetData, _queries, item, queriesLength,
+ items = this.items,
+ queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
+ connectWith = this._connectWith();
+
+ if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
+ for (i = connectWith.length - 1; i >= 0; i--){
+ cur = $(connectWith[i]);
+ for (j = cur.length - 1; j >= 0; j--){
+ inst = $.data(cur[j], this.widgetFullName);
+ if(inst && inst !== this && !inst.options.disabled) {
+ queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+ this.containers.push(inst);
+ }
+ }
+ }
+ }
+
+ for (i = queries.length - 1; i >= 0; i--) {
+ targetData = queries[i][1];
+ _queries = queries[i][0];
+
+ for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+ item = $(_queries[j]);
+
+ item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
+
+ items.push({
+ item: item,
+ instance: targetData,
+ width: 0, height: 0,
+ left: 0, top: 0
+ });
+ }
+ }
+
+ },
+
+ refreshPositions: function(fast) {
+
+ //This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+ if(this.offsetParent && this.helper) {
+ this.offset.parent = this._getParentOffset();
+ }
+
+ var i, item, t, p;
+
+ for (i = this.items.length - 1; i >= 0; i--){
+ item = this.items[i];
+
+ //We ignore calculating positions of all connected containers when we're not over them
+ if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
+ continue;
+ }
+
+ t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+ if (!fast) {
+ item.width = t.outerWidth();
+ item.height = t.outerHeight();
+ }
+
+ p = t.offset();
+ item.left = p.left;
+ item.top = p.top;
+ }
+
+ if(this.options.custom && this.options.custom.refreshContainers) {
+ this.options.custom.refreshContainers.call(this);
+ } else {
+ for (i = this.containers.length - 1; i >= 0; i--){
+ p = this.containers[i].element.offset();
+ this.containers[i].containerCache.left = p.left;
+ this.containers[i].containerCache.top = p.top;
+ this.containers[i].containerCache.width = this.containers[i].element.outerWidth();
+ this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+ }
+ }
+
+ return this;
+ },
+
+ _createPlaceholder: function(that) {
+ that = that || this;
+ var className,
+ o = that.options;
+
+ if(!o.placeholder || o.placeholder.constructor === String) {
+ className = o.placeholder;
+ o.placeholder = {
+ element: function() {
+
+ var nodeName = that.currentItem[0].nodeName.toLowerCase(),
+ element = $( "<" + nodeName + ">", that.document[0] )
+ .addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
+ .removeClass("ui-sortable-helper");
+
+ if ( nodeName === "tr" ) {
+ that.currentItem.children().each(function() {
+ $( "
",
options: {
- disabled: false
+ disabled: false,
+
+ // callbacks
+ create: null
},
_createWidget: function( options, element ) {
- // $.widget.bridge stores the plugin instance, but we do it anyway
- // so that it's stored even before the _create function runs
- $.data( element, this.widgetName, this );
+ element = $( element || this.defaultElement || this )[ 0 ];
this.element = $( element );
- this.options = $.extend( true, {},
+ this.uuid = uuid++;
+ this.eventNamespace = "." + this.widgetName + this.uuid;
+ this.options = $.widget.extend( {},
this.options,
this._getCreateOptions(),
options );
- var self = this;
- this.element.bind( "remove." + this.widgetName, function() {
- self.destroy();
- });
+ this.bindings = $();
+ this.hoverable = $();
+ this.focusable = $();
+
+ if ( element !== this ) {
+ $.data( element, this.widgetFullName, this );
+ this._on( true, this.element, {
+ remove: function( event ) {
+ if ( event.target === element ) {
+ this.destroy();
+ }
+ }
+ });
+ this.document = $( element.style ?
+ // element within the document
+ element.ownerDocument :
+ // element is window or document
+ element.document || element );
+ this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+ }
this._create();
- this._trigger( "create" );
+ this._trigger( "create", null, this._getCreateEventData() );
this._init();
},
- _getCreateOptions: function() {
- return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
- },
- _create: function() {},
- _init: function() {},
+ _getCreateOptions: $.noop,
+ _getCreateEventData: $.noop,
+ _create: $.noop,
+ _init: $.noop,
destroy: function() {
+ this._destroy();
+ // we can probably remove the unbind calls in 2.0
+ // all event bindings should go through this._on()
this.element
- .unbind( "." + this.widgetName )
- .removeData( this.widgetName );
+ .unbind( this.eventNamespace )
+ // 1.9 BC for #7810
+ // TODO remove dual storage
+ .removeData( this.widgetName )
+ .removeData( this.widgetFullName )
+ // support: jquery <1.6.3
+ // http://bugs.jquery.com/ticket/9413
+ .removeData( $.camelCase( this.widgetFullName ) );
this.widget()
- .unbind( "." + this.widgetName )
+ .unbind( this.eventNamespace )
.removeAttr( "aria-disabled" )
.removeClass(
- this.widgetBaseClass + "-disabled " +
+ this.widgetFullName + "-disabled " +
"ui-state-disabled" );
+
+ // clean up events and states
+ this.bindings.unbind( this.eventNamespace );
+ this.hoverable.removeClass( "ui-state-hover" );
+ this.focusable.removeClass( "ui-state-focus" );
},
+ _destroy: $.noop,
widget: function() {
return this.element;
},
option: function( key, value ) {
- var options = key;
+ var options = key,
+ parts,
+ curOption,
+ i;
if ( arguments.length === 0 ) {
// don't return a reference to the internal hash
- return $.extend( {}, this.options );
+ return $.widget.extend( {}, this.options );
}
- if (typeof key === "string" ) {
- if ( value === undefined ) {
- return this.options[ key ];
- }
+ if ( typeof key === "string" ) {
+ // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
options = {};
- options[ key ] = value;
+ parts = key.split( "." );
+ key = parts.shift();
+ if ( parts.length ) {
+ curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+ for ( i = 0; i < parts.length - 1; i++ ) {
+ curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+ curOption = curOption[ parts[ i ] ];
+ }
+ key = parts.pop();
+ if ( value === undefined ) {
+ return curOption[ key ] === undefined ? null : curOption[ key ];
+ }
+ curOption[ key ] = value;
+ } else {
+ if ( value === undefined ) {
+ return this.options[ key ] === undefined ? null : this.options[ key ];
+ }
+ options[ key ] = value;
+ }
}
this._setOptions( options );
@@ -220,10 +332,11 @@ $.Widget.prototype = {
return this;
},
_setOptions: function( options ) {
- var self = this;
- $.each( options, function( key, value ) {
- self._setOption( key, value );
- });
+ var key;
+
+ for ( key in options ) {
+ this._setOption( key, options[ key ] );
+ }
return this;
},
@@ -232,10 +345,10 @@ $.Widget.prototype = {
if ( key === "disabled" ) {
this.widget()
- [ value ? "addClass" : "removeClass"](
- this.widgetBaseClass + "-disabled" + " " +
- "ui-state-disabled" )
+ .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
.attr( "aria-disabled", value );
+ this.hoverable.removeClass( "ui-state-hover" );
+ this.focusable.removeClass( "ui-state-focus" );
}
return this;
@@ -248,6 +361,97 @@ $.Widget.prototype = {
return this._setOption( "disabled", true );
},
+ _on: function( suppressDisabledCheck, element, handlers ) {
+ var delegateElement,
+ instance = this;
+
+ // no suppressDisabledCheck flag, shuffle arguments
+ if ( typeof suppressDisabledCheck !== "boolean" ) {
+ handlers = element;
+ element = suppressDisabledCheck;
+ suppressDisabledCheck = false;
+ }
+
+ // no element argument, shuffle and use this.element
+ if ( !handlers ) {
+ handlers = element;
+ element = this.element;
+ delegateElement = this.widget();
+ } else {
+ // accept selectors, DOM elements
+ element = delegateElement = $( element );
+ this.bindings = this.bindings.add( element );
+ }
+
+ $.each( handlers, function( event, handler ) {
+ function handlerProxy() {
+ // allow widgets to customize the disabled handling
+ // - disabled as an array instead of boolean
+ // - disabled class as method for disabling individual parts
+ if ( !suppressDisabledCheck &&
+ ( instance.options.disabled === true ||
+ $( this ).hasClass( "ui-state-disabled" ) ) ) {
+ return;
+ }
+ return ( typeof handler === "string" ? instance[ handler ] : handler )
+ .apply( instance, arguments );
+ }
+
+ // copy the guid so direct unbinding works
+ if ( typeof handler !== "string" ) {
+ handlerProxy.guid = handler.guid =
+ handler.guid || handlerProxy.guid || $.guid++;
+ }
+
+ var match = event.match( /^(\w+)\s*(.*)$/ ),
+ eventName = match[1] + instance.eventNamespace,
+ selector = match[2];
+ if ( selector ) {
+ delegateElement.delegate( selector, eventName, handlerProxy );
+ } else {
+ element.bind( eventName, handlerProxy );
+ }
+ });
+ },
+
+ _off: function( element, eventName ) {
+ eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+ element.unbind( eventName ).undelegate( eventName );
+ },
+
+ _delay: function( handler, delay ) {
+ function handlerProxy() {
+ return ( typeof handler === "string" ? instance[ handler ] : handler )
+ .apply( instance, arguments );
+ }
+ var instance = this;
+ return setTimeout( handlerProxy, delay || 0 );
+ },
+
+ _hoverable: function( element ) {
+ this.hoverable = this.hoverable.add( element );
+ this._on( element, {
+ mouseenter: function( event ) {
+ $( event.currentTarget ).addClass( "ui-state-hover" );
+ },
+ mouseleave: function( event ) {
+ $( event.currentTarget ).removeClass( "ui-state-hover" );
+ }
+ });
+ },
+
+ _focusable: function( element ) {
+ this.focusable = this.focusable.add( element );
+ this._on( element, {
+ focusin: function( event ) {
+ $( event.currentTarget ).addClass( "ui-state-focus" );
+ },
+ focusout: function( event ) {
+ $( event.currentTarget ).removeClass( "ui-state-focus" );
+ }
+ });
+ },
+
_trigger: function( type, event, data ) {
var prop, orig,
callback = this.options[ type ];
@@ -272,11 +476,46 @@ $.Widget.prototype = {
}
this.element.trigger( event, data );
-
- return !( $.isFunction(callback) &&
- callback.call( this.element[0], event, data ) === false ||
+ return !( $.isFunction( callback ) &&
+ callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
event.isDefaultPrevented() );
}
};
-}));
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+ $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+ if ( typeof options === "string" ) {
+ options = { effect: options };
+ }
+ var hasOptions,
+ effectName = !options ?
+ method :
+ options === true || typeof options === "number" ?
+ defaultEffect :
+ options.effect || defaultEffect;
+ options = options || {};
+ if ( typeof options === "number" ) {
+ options = { duration: options };
+ }
+ hasOptions = !$.isEmptyObject( options );
+ options.complete = callback;
+ if ( options.delay ) {
+ element.delay( options.delay );
+ }
+ if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+ element[ method ]( options );
+ } else if ( effectName !== method && element[ effectName ] ) {
+ element[ effectName ]( options.duration, options.easing, callback );
+ } else {
+ element.queue(function( next ) {
+ $( this )[ method ]();
+ if ( callback ) {
+ callback.call( element[ 0 ] );
+ }
+ next();
+ });
+ }
+ };
+});
+
+})( jQuery );
diff --git a/ckan/public/base/vendor/jquery.ui.widget.min.js b/ckan/public/base/vendor/jquery.ui.widget.min.js
deleted file mode 100644
index 12d47c2f79c..00000000000
--- a/ckan/public/base/vendor/jquery.ui.widget.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-(function(factory){if(typeof define==="function"&&define.amd){define(["jquery"],factory);}else{factory(jQuery);}}(function($,undefined){if($.cleanData){var _cleanData=$.cleanData;$.cleanData=function(elems){for(var i=0,elem;(elem=elems[i])!=null;i++){try{$(elem).triggerHandler("remove");}catch(e){}}
-_cleanData(elems);};}else{var _remove=$.fn.remove;$.fn.remove=function(selector,keepData){return this.each(function(){if(!keepData){if(!selector||$.filter(selector,[this]).length){$("*",this).add([this]).each(function(){try{$(this).triggerHandler("remove");}catch(e){}});}}
-return _remove.call($(this),selector,keepData);});};}
-$.widget=function(name,base,prototype){var namespace=name.split(".")[0],fullName;name=name.split(".")[1];fullName=namespace+"-"+name;if(!prototype){prototype=base;base=$.Widget;}
-$.expr[":"][fullName]=function(elem){return!!$.data(elem,name);};$[namespace]=$[namespace]||{};$[namespace][name]=function(options,element){if(arguments.length){this._createWidget(options,element);}};var basePrototype=new base();basePrototype.options=$.extend(true,{},basePrototype.options);$[namespace][name].prototype=$.extend(true,basePrototype,{namespace:namespace,widgetName:name,widgetEventPrefix:$[namespace][name].prototype.widgetEventPrefix||name,widgetBaseClass:fullName},prototype);$.widget.bridge(name,$[namespace][name]);};$.widget.bridge=function(name,object){$.fn[name]=function(options){var isMethodCall=typeof options==="string",args=Array.prototype.slice.call(arguments,1),returnValue=this;options=!isMethodCall&&args.length?$.extend.apply(null,[true,options].concat(args)):options;if(isMethodCall&&options.charAt(0)==="_"){return returnValue;}
-if(isMethodCall){this.each(function(){var instance=$.data(this,name),methodValue=instance&&$.isFunction(instance[options])?instance[options].apply(instance,args):instance;if(methodValue!==instance&&methodValue!==undefined){returnValue=methodValue;return false;}});}else{this.each(function(){var instance=$.data(this,name);if(instance){instance.option(options||{})._init();}else{$.data(this,name,new object(options,this));}});}
-return returnValue;};};$.Widget=function(options,element){if(arguments.length){this._createWidget(options,element);}};$.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(options,element){$.data(element,this.widgetName,this);this.element=$(element);this.options=$.extend(true,{},this.options,this._getCreateOptions(),options);var self=this;this.element.bind("remove."+this.widgetName,function(){self.destroy();});this._create();this._trigger("create");this._init();},_getCreateOptions:function(){return $.metadata&&$.metadata.get(this.element[0])[this.widgetName];},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled "+"ui-state-disabled");},widget:function(){return this.element;},option:function(key,value){var options=key;if(arguments.length===0){return $.extend({},this.options);}
-if(typeof key==="string"){if(value===undefined){return this.options[key];}
-options={};options[key]=value;}
-this._setOptions(options);return this;},_setOptions:function(options){var self=this;$.each(options,function(key,value){self._setOption(key,value);});return this;},_setOption:function(key,value){this.options[key]=value;if(key==="disabled"){this.widget()
-[value?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"+" "+"ui-state-disabled").attr("aria-disabled",value);}
-return this;},enable:function(){return this._setOption("disabled",false);},disable:function(){return this._setOption("disabled",true);},_trigger:function(type,event,data){var prop,orig,callback=this.options[type];data=data||{};event=$.Event(event);event.type=(type===this.widgetEventPrefix?type:this.widgetEventPrefix+type).toLowerCase();event.target=this.element[0];orig=event.originalEvent;if(orig){for(prop in orig){if(!(prop in event)){event[prop]=orig[prop];}}}
-this.element.trigger(event,data);return!($.isFunction(callback)&&callback.call(this.element[0],event,data)===false||event.isDefaultPrevented());}};}));
\ No newline at end of file
diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index 8924b72606a..56bdf2a316a 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -25,6 +25,7 @@ block_html5_shim =
vendor = jquery.js
bootstrap = jquery.js
fileupload = jquery.js
+reorder = jquery.js
[groups]
@@ -39,8 +40,13 @@ bootstrap =
font-awesome/css/font-awesome.css
font-awesome/css/font-awesome-ie7.css
-
fileupload =
jquery.ui.widget.js
jquery-fileupload/jquery.iframe-transport.js
jquery-fileupload/jquery.fileupload.js
+
+reorder =
+ jquery.ui.core.js
+ jquery.ui.widget.js
+ jquery.ui.mouse.js
+ jquery.ui.sortable.js
diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html
index bfa9b3a2ee5..81a322b3997 100644
--- a/ckan/templates/admin/config.html
+++ b/ckan/templates/admin/config.html
@@ -10,7 +10,7 @@
+
{#
The page block allows you to add content to the page. Most of the time it is
@@ -102,17 +102,9 @@
{%- block page %}{% endblock -%}
{#
- The scripts block allows you to add additonal scripts to the page. Use the
- super() function to load the default scripts before/after your own.
- NOTE: Scripts should be loaded by the {% resource %} tag except
- in very special circumstances DO NOT USE THIS METHOD FOR ADDING SCRIPTS.
-
- Example:
-
- {% block scripts %}
- {{ super() }}
-
- {% endblock %}
+ DO NOT USE THIS BLOCK FOR ADDING SCRIPTS
+ Scripts should be loaded by the {% resource %} tag except in very special
+ circumstances
#}
{%- block scripts %}
{% endblock -%}
diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html
index 69259e22ec3..bec97ae26e6 100644
--- a/ckan/templates/group/about.html
+++ b/ckan/templates/group/about.html
@@ -1,14 +1,12 @@
{% extends "group/read_base.html" %}
-{% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ _('About') }} - {{ super() }}{% endblock %}
{% block primary_content_inner %}
{% link_for _('Groups'), controller='group', action='index' %}
{% block breadcrumb_content_inner %}
{% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}
- {% link_for _('Edit'), controller='group', action='edit', id=group.name %}
+ {% link_for _('Manage'), controller='group', action='edit', id=group.name %}
{% endblock %}
{% endblock %}
-{% block subtitle %}{{ _('Edit Group') }}{% endblock %}
-
{% block page_heading_class %}hide-heading{% endblock %}
{% block page_heading %}{{ _('Edit Group') }}{% endblock %}
diff --git a/ckan/templates/group/edit_base.html b/ckan/templates/group/edit_base.html
index a5f1203d529..566da231192 100644
--- a/ckan/templates/group/edit_base.html
+++ b/ckan/templates/group/edit_base.html
@@ -1,17 +1,19 @@
{% extends "page.html" %}
+{% block subtitle %}{{ _('Manage') }} - {{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}
+
{% set group = c.group_dict %}
{% block breadcrumb_content %}
{% link_for _('Groups'), controller='group', action='index' %}
{% block breadcrumb_content_inner %}
{% link_for group.display_name|truncate(35), controller='group', action='read', id=group.name %}
- {% link_for _('Edit'), controller='group', action='edit', id=group.name %}
+ {% link_for _('Manage'), controller='group', action='edit', id=group.name %}
{% endblock %}
{% endblock %}
{% block content_action %}
- {% link_for _('View group'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %}
+ {% link_for _('View'), controller='group', action='read', id=c.group_dict.name, class_='btn', icon='eye-open' %}
{% endblock %}
{% block content_primary_nav %}
diff --git a/ckan/templates/group/index.html b/ckan/templates/group/index.html
index 6298cb5a120..514c12bb961 100644
--- a/ckan/templates/group/index.html
+++ b/ckan/templates/group/index.html
@@ -1,6 +1,6 @@
{% extends "page.html" %}
-{% block subtitle %}{{ _('Groups of Datasets') }}{% endblock %}
+{% block subtitle %}{{ _('Groups') }}{% endblock %}
{% block breadcrumb_content %}
{% link_for _('Groups'), controller='group', action='index' %}
@@ -17,11 +17,13 @@
{% block primary_content_inner %}
{{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
diff --git a/ckan/templates/group/members.html b/ckan/templates/group/members.html
index 600c6d1bf54..210562903b7 100644
--- a/ckan/templates/group/members.html
+++ b/ckan/templates/group/members.html
@@ -1,9 +1,12 @@
{% extends "group/edit_base.html" %}
-{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }} - {{ _('Groups') }}{% endblock %}
+
+{% block page_primary_action %}
+ {% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+{% endblock %}
{% block primary_content_inner %}
- {% link_for _('Add Member'), controller='group', action='member_new', id=c.group_dict.id, class_='btn pull-right', icon='plus-sign-alt' %}
{% set locale = h.dump_json({'content': _('Are you sure you want to reset the config?')}) %}
{{ _('Reset') }}
-
+
{% endblock %}
diff --git a/ckan/templates/base.html b/ckan/templates/base.html
index 6012bf65928..9ab7a69d973 100644
--- a/ckan/templates/base.html
+++ b/ckan/templates/base.html
@@ -85,7 +85,7 @@
{# Allows custom attributes to be added to the tag #}
- {% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}
{% block group_description %} {% if c.group_dict.description %} {{ h.render_markdown(c.group_dict.description) }} - {% else %} -{{ _('There is no description for this group') }}
{% endif %} {% endblock %} diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html index 800ed24db9b..47a6d029bb4 100644 --- a/ckan/templates/group/activity_stream.html +++ b/ckan/templates/group/activity_stream.html @@ -1,6 +1,6 @@ {% extends "group/read_base.html" %} -{% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %} +{% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %} {% block primary_content_inner %}{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}
diff --git a/ckan/templates/group/edit.html b/ckan/templates/group/edit.html index 57808056d54..ff5c0b96989 100644 --- a/ckan/templates/group/edit.html +++ b/ckan/templates/group/edit.html @@ -4,11 +4,9 @@{{ _('Groups') }}
{% block groups_search_form %} - {% snippet 'snippets/search_form.html', type='group', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params %} + {% snippet 'snippets/search_form.html', type='group', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params, no_bottom_border=true if c.page.items %} {% endblock %} {% block groups_list %} {% if c.page.items or request.params %} - {% snippet "group/snippets/group_list.html", groups=c.page.items %} + {% if c.page.items %} + {% snippet "group/snippets/group_list.html", groups=c.page.items %} + {% endif %} {% else %}{{ _('There are currently no groups for this site') }}. diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html index 6a8fa691c29..f7b24c236fe 100644 --- a/ckan/templates/group/member_new.html +++ b/ckan/templates/group/member_new.html @@ -50,29 +50,18 @@
{{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
{% if user %}
-
- {% set format_attrs = {'disabled': true} %}
- {{ form.input('username', label=_('User'), value=user.name, classes=['control-medium'], attrs=format_attrs) }}
+ {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
+ {{ _('Delete') }}
+
{% else %}
- {% set format_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/user/autocomplete?q=?'} %}
- {{ form.input('username', id='field-username', label=_('User'), placeholder=_('Username'), value='', error='', classes=['control-medium'], attrs=format_attrs) }}
+
{% endif %}
- {% set format_attrs = {'data-module': 'autocomplete'} %}
- {{ form.select('role', label=_('Role'), options=c.roles, selected=c.user_role, error='', attrs=format_attrs) }}
-
- {% if user %}
- {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
- {{ _('Delete') }}
-
- {% else %}
-
- {% endif %}
-
-
+
+
{% endblock %}
{% endblock %}
@@ -85,12 +74,9 @@
{% trans %}
- Admin: Can add/edit and delete datasets, as well as
- manage group members.
- Editor: Can add and edit datasets, but not manage
- group members.
- Member: Can view the group's private
- datasets, but not add new datasets.
+ Admin: Can edit group information, as well as
+ manage organization members.
+ Member: Can add/remove datasets from groups
{% endtrans %}
- {% if user %}
- {% set locale = h.dump_json({'content': _('Are you sure you want to delete this member?')}) %}
- {{ _('Delete') }}
-
- {% else %}
-
- {% endif %}
-
-
+ Admin: Can add/edit and delete datasets, as well as - manage group members.
-Editor: Can add and edit datasets, but not manage - group members.
-Member: Can view the group's private - datasets, but not add new datasets.
+Admin: Can edit group information, as well as + manage organization members.
+Member: Can add/remove datasets from groups
{% endtrans %}{{ _('{0} members'.format(c.members|length)) }}
|
-
-
diff --git a/ckan/templates/organization/members.html b/ckan/templates/organization/members.html
index c5dcd0ebdae..6e3f4446b9f 100644
--- a/ckan/templates/organization/members.html
+++ b/ckan/templates/organization/members.html
@@ -1,6 +1,6 @@
{% extends "organization/edit_base.html" %}
-{% block subtitle %}{{ _('Members') }} - {{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ _('Members') }} - {{ super() }}{% endblock %}
{% block page_primary_action %}
{% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
diff --git a/ckan/templates/organization/read.html b/ckan/templates/organization/read.html
index a702541fd66..e2a6a04b090 100644
--- a/ckan/templates/organization/read.html
+++ b/ckan/templates/organization/read.html
@@ -1,7 +1,7 @@
{% extends "organization/read_base.html" %}
{% block page_primary_action %}
- {% if h.check_access('package_create', {'organization_id': c.group_dict.id}) %}
+ {% if h.check_access('package_create', {'owner_org': c.group_dict.id}) %}
{% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
{% endif %}
{% endblock %}
@@ -15,7 +15,14 @@
'translated_fields': c.translated_fields,
'remove_field': c.remove_field }
%}
- {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params %}
+ {% set sorting = [
+ (_('Relevance'), 'score desc, metadata_modified desc'),
+ (_('Name Ascending'), 'title_string asc'),
+ (_('Name Descending'), 'title_string desc'),
+ (_('Last Modified'), 'metadata_modified desc'),
+ (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+ %}
+ {% snippet 'snippets/search_form.html', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params %}
{% endblock %}
{% block packages_list %}
{% if c.page.items %}
diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html
index d5a0f8120d5..1c9454f4729 100644
--- a/ckan/templates/organization/read_base.html
+++ b/ckan/templates/organization/read_base.html
@@ -1,6 +1,6 @@
{% extends "page.html" %}
-{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %}
{% block breadcrumb_content %}
|
|---|
{{ _('Upload Log') }}
{{ item.message | urlize }}
-
+
{{ h.time_ago_from_timestamp(item.timestamp) }}
- more info
+ {{ _('Details') }}
-
{% block resource_actions_inner %}
{% if h.check_access('package_update', {'id':pkg.id }) %}
-
- {% link_for _('Edit'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %} +
- {% link_for _('Manage'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn', icon='wrench' %} {% endif %} {% if res.url %}
-
@@ -61,8 +61,6 @@
{% if res.description %} {{ h.render_markdown(res.description) }} - {% else %} -
{{ _('There is no description for this resource') }}
{% endif %} {% if not res.description and c.package.notes %}{{ _('From the dataset abstract') }}
diff --git a/ckan/templates/package/resources.html b/ckan/templates/package/resources.html index e353d03f10b..0e02b3846dd 100644 --- a/ckan/templates/package/resources.html +++ b/ckan/templates/package/resources.html @@ -1,5 +1,7 @@ {% extends "package/edit_base.html" %} +{% set has_reorder = c.pkg_dict and c.pkg_dict.resources and c.pkg_dict.resources|length > 0 %} + {% block subtitle %}{{ _('Resources') }} - {{ h.dataset_display_name(pkg) }}{% endblock %} {% block page_primary_action %} @@ -8,7 +10,7 @@ {% block primary_content_inner %} {% if pkg.resources %} --
+
- {{ h.nav_link(_('Datasets'), controller='package', action='search', highlight_actions = 'new index') }} diff --git a/ckan/templates/package/snippets/package_basic_fields.html b/ckan/templates/package/snippets/package_basic_fields.html index d1ac7e25577..0418e3be2f8 100644 --- a/ckan/templates/package/snippets/package_basic_fields.html +++ b/ckan/templates/package/snippets/package_basic_fields.html @@ -64,12 +64,14 @@ {% endif %} {% if show_organizations_selector %} - {% set existing_org = data.owner_org %} + {% set existing_org = data.owner_org or data.group_id %}
-
{% for resource in pkg.resources %}
{% snippet 'package/snippets/resource_item.html', pkg=pkg, res=resource, url_is_edit=true %}
{% endfor %}
@@ -19,3 +21,10 @@
{% endtrans %}
{% endif %}
{% endblock %}
+
+{% block scripts %}
+ {{ super() }}
+ {% if has_reorder %}
+ {% resource 'vendor/reorder' %}
+ {% endif %}
+{% endblock %}
diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
index 6274ecc0798..6c8173eb772 100644
--- a/ckan/templates/package/search.html
+++ b/ckan/templates/package/search.html
@@ -1,7 +1,7 @@
{% extends "page.html" %}
{% import 'macros/form.html' as form %}
-{% block subtitle %}{{ _("Search for a Dataset") }}{% endblock %}
+{% block subtitle %}{{ _("Datasets") }}{% endblock %}
{% block breadcrumb_content %}
{% if package.resources and not hide_resources %} diff --git a/ckan/templates/snippets/package_list.html b/ckan/templates/snippets/package_list.html index 99aed748242..75213d535a3 100644 --- a/ckan/templates/snippets/package_list.html +++ b/ckan/templates/snippets/package_list.html @@ -15,7 +15,7 @@ #} {% if packages %} -{% endif %} - {{ form.required_message() }} + + {% if data.id and h.check_access('package_delete', {'id': data.id}) and data.state != 'active' %} ++ ++ {% endif %} {% endblock %} diff --git a/ckan/templates/package/snippets/package_context.html b/ckan/templates/package/snippets/package_context.html index 3640468c51e..110bbd5201b 100644 --- a/ckan/templates/package/snippets/package_context.html +++ b/ckan/templates/package/snippets/package_context.html @@ -6,8 +6,6 @@+ ++{{ pkg.title or pkg.name }}
{{ h.markdown_extract(pkg.notes, 180) }} {% link_for _('read more'), controller='package', action='about', id=pkg.name %} - {% else %} -{{ _('There is no description for this dataset') }}
{% endif %}{% endblock %} diff --git a/ckan/templates/package/snippets/package_metadata_fields.html b/ckan/templates/package/snippets/package_metadata_fields.html index 4805e6637f9..b398818b297 100644 --- a/ckan/templates/package/snippets/package_metadata_fields.html +++ b/ckan/templates/package/snippets/package_metadata_fields.html @@ -29,22 +29,6 @@ {% endblock %} {% block dataset_fields %} - {% if data.groups %} --
diff --git a/ckan/templates/package/snippets/package_form.html b/ckan/templates/package/snippets/package_form.html
index 33d726639f1..0c3d2872fbb 100644
--- a/ckan/templates/package/snippets/package_form.html
+++ b/ckan/templates/package/snippets/package_form.html
@@ -33,15 +33,13 @@
{% endblock %}
{% block delete_button %}
- {% if h.check_access('package_delete', {'id': data.id}) %}
+ {% if h.check_access('package_delete', {'id': data.id}) and not data.state == 'deleted' %}
{% set locale = h.dump_json({'content': _('Are you sure you want to delete this dataset?')}) %}
{% block delete_button_text %}{{ _('Delete') }}{% endblock %}
{% endif %}
{% endblock %}
- {% block cancel_button %}
- {% block cancel_button_text %}{{ _('Cancel') }}{% endblock %}
- {% endblock %}
+ {{ form.required_message() }}
- -- {% endif %} - {% set group_name = 'groups__%s__id' % data.groups|length %} - {% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %} - {{ form.input(group_name, label=_('Add Group'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }} {% endblock %} {% endblock %} diff --git a/ckan/templates/package/snippets/resource_form.html b/ckan/templates/package/snippets/resource_form.html index f3bb2bddc91..3c5cb06da28 100644 --- a/ckan/templates/package/snippets/resource_form.html +++ b/ckan/templates/package/snippets/resource_form.html @@ -4,7 +4,7 @@ {% set errors = errors or {} %} {% set action = form_action or h.url_for(controller='package', action='new_resource', id=pkg_name) %} -- {% for group in data.groups %} - - {% endfor %} ---
+
-
{% for package in packages %}
{% snippet 'snippets/package_item.html', package=package, item_class=item_class, hide_resources=hide_resources, banner=banner, truncate=truncate, truncate_title=truncate_title %}
{% endfor %}
diff --git a/ckan/templates/snippets/search_form.html b/ckan/templates/snippets/search_form.html
index 6fdd9e1638e..d0c6bd95887 100644
--- a/ckan/templates/snippets/search_form.html
+++ b/ckan/templates/snippets/search_form.html
@@ -1,10 +1,11 @@
{% import 'macros/form.html' as form %}
-{% set placeholder = placeholder if placeholder else _('Search...') %}
+{% set placeholder = placeholder if placeholder else _('Search datasets...') %}
{% set sorting = sorting if sorting else [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %}
{% set search_class = search_class if search_class else 'search-giant' %}
+{% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
-
{% block page_heading %}{{ _('Login') }}{% endblock %}< {% endblock %} {% block secondary_content %} -
- + {% if h.check_access('user_create') %} +{{ _('Need an Account?') }}
---{% trans %}Then sign right up, it only takes a minute.{% endtrans %}
- -+ + {% endif %}{{ _('Need an Account?') }}
+++{% trans %}Then sign right up, it only takes a minute.{% endtrans %}
+ +{{ _('Forgotten your password?') }}
diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html index 13f58fc3054..2ca0a920f41 100644 --- a/ckan/templates/user/read.html +++ b/ckan/templates/user/read.html @@ -1,7 +1,5 @@ {% extends "user/read_base.html" %} -{% block subtitle %}{{ user.display_name }}{% endblock %} - {% block primary_content_inner %}{% block page_heading %}{{ _('Datasets') }}{% endblock %} diff --git a/ckan/templates/user/read_base.html b/ckan/templates/user/read_base.html index 3a24c21c5a1..9fb39fd2998 100644 --- a/ckan/templates/user/read_base.html +++ b/ckan/templates/user/read_base.html @@ -2,7 +2,7 @@ {% set user = c.user_dict %} -{% block subtitle %}{{ user.display_name }}{% endblock %} +{% block subtitle %}{{ user.display_name }} - {{ _('Users') }}{% endblock %} {% block breadcrumb_content %} {{ h.build_nav('user_index', _('Users')) }} @@ -10,9 +10,9 @@ {% endblock %} {% block content_action %} -{% if h.check_access('user_update', user) %} - {% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %} -{% endif %} + {% if h.check_access('user_update', user) %} + {% link_for _('Manage'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %} + {% endif %} {% endblock %} {% block content_primary_nav %} diff --git a/ckan/templates/user/snippets/back_to_user_action.html b/ckan/templates/user/snippets/back_to_user_action.html deleted file mode 100644 index 8ca7494916f..00000000000 --- a/ckan/templates/user/snippets/back_to_user_action.html +++ /dev/null @@ -1 +0,0 @@ -
- {% link_for _('View my profile'), controller='user', action='read', id=user.name, class_='btn', icon='eye-open' %}
diff --git a/ckan/templates/user/snippets/login_form.html b/ckan/templates/user/snippets/login_form.html index d1b54251137..e6a88d95902 100644 --- a/ckan/templates/user/snippets/login_form.html +++ b/ckan/templates/user/snippets/login_form.html @@ -24,6 +24,6 @@ {{ form.checkbox('remember', label=_("Remember me"), id='field-remember', checked=true, value="63072000") }}- +diff --git a/ckan/tests/functional/api/test_activity.py b/ckan/tests/functional/api/test_activity.py index bd42409edd6..f093a200a7c 100644 --- a/ckan/tests/functional/api/test_activity.py +++ b/ckan/tests/functional/api/test_activity.py @@ -573,17 +573,17 @@ def _update_extra(self, package_dict, user): [group['name'] for group in package_dict['groups']], apikey=apikey) - extras_before = package_dict['extras'] + import copy + extras_before = copy.deepcopy(package_dict['extras']) assert len(extras_before) > 0, ( "Can't update an extra if the package doesn't have any") # Update the package's first extra. - extras = list(extras_before) - if extras[0]['value'] != '"edited"': - extras[0]['value'] = '"edited"' + if package_dict['extras'][0]['value'] != '"edited"': + package_dict['extras'][0]['value'] = '"edited"' else: - assert extras[0]['value'] != '"edited again"' - extras[0]['value'] = '"edited again"' + assert package_dict['extras'][0]['value'] != '"edited again"' + package_dict['extras'][0]['value'] = '"edited again"' updated_package = package_update(self.app, package_dict, user['apikey']) diff --git a/ckan/tests/functional/api/test_user.py b/ckan/tests/functional/api/test_user.py index 317428de865..875e8a668ab 100644 --- a/ckan/tests/functional/api/test_user.py +++ b/ckan/tests/functional/api/test_user.py @@ -1,20 +1,27 @@ +import paste +from pylons import config from nose.tools import assert_equal import ckan.logic as logic +import ckan.new_authz as new_authz from ckan import model from ckan.lib.create_test_data import CreateTestData from ckan.tests import TestController as ControllerTestCase +from ckan.tests.pylons_controller import PylonsTestCase from ckan.tests import url_for +import ckan.config.middleware +from ckan.common import json + class TestUserApi(ControllerTestCase): @classmethod def setup_class(cls): CreateTestData.create() - + @classmethod def teardown_class(cls): model.repo.rebuild_db() - + def test_autocomplete(self): response = self.app.get( url=url_for(controller='api', action='user_autocomplete', ver=2), @@ -51,8 +58,186 @@ def test_autocomplete_limit(self): print response.json assert_equal(len(response.json), 1) + +class TestCreateUserApiDisabled(PylonsTestCase): + ''' + Tests for the creating user when create_user_via_api is disabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + cls.sysadmin_user = model.User.get('testsysadmin') + PylonsTestCase.setup_class() + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_enabled_sysadmin(self): + params = { + 'name': 'testinganewusersysadmin', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post( + '/api/3/action/user_create', + json.dumps(params), + extra_environ={'Authorization': str(self.sysadmin_user.apikey)}, + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is True + + def test_user_create_api_disabled_anon(self): + params = { + 'name': 'testinganewuseranon', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params), + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is False + + +class TestCreateUserApiEnabled(PylonsTestCase): + ''' + Tests for the creating user when create_user_via_api is enabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + config['ckan.auth.create_user_via_api'] = True + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + PylonsTestCase.setup_class() + cls.sysadmin_user = model.User.get('testsysadmin') + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_enabled_sysadmin(self): + params = { + 'name': 'testinganewusersysadmin', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post( + '/api/3/action/user_create', + json.dumps(params), + extra_environ={'Authorization': str(self.sysadmin_user.apikey)}) + res_dict = res.json + assert res_dict['success'] is True + + def test_user_create_api_enabled_anon(self): + params = { + 'name': 'testinganewuseranon', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params)) + res_dict = res.json + assert res_dict['success'] is True + + +class TestCreateUserWebDisabled(PylonsTestCase): + ''' + Tests for the creating user by create_user_via_web is disabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + config['ckan.auth.create_user_via_web'] = False + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + cls.sysadmin_user = model.User.get('testsysadmin') + PylonsTestCase.setup_class() + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_disabled(self): + params = { + 'name': 'testinganewuser', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params), + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is False + + +class TestCreateUserWebEnabled(PylonsTestCase): + ''' + Tests for the creating user by create_user_via_web is enabled. + ''' + + @classmethod + def setup_class(cls): + CreateTestData.create() + cls._original_config = config.copy() + config['ckan.auth.create_user_via_web'] = True + new_authz.clear_auth_functions_cache() + wsgiapp = ckan.config.middleware.make_app( + config['global_conf'], **config) + cls.app = paste.fixture.TestApp(wsgiapp) + cls.sysadmin_user = model.User.get('testsysadmin') + PylonsTestCase.setup_class() + + @classmethod + def teardown_class(cls): + config.clear() + config.update(cls._original_config) + new_authz.clear_auth_functions_cache() + PylonsTestCase.teardown_class() + + model.repo.rebuild_db() + + def test_user_create_api_disabled(self): + params = { + 'name': 'testinganewuser', + 'email': 'testinganewuser@ckan.org', + 'password': 'random', + } + res = self.app.post('/api/3/action/user_create', json.dumps(params), + expect_errors=True) + res_dict = res.json + assert res_dict['success'] is False + + class TestUserActions(object): - + @classmethod def setup_class(cls): CreateTestData.create() diff --git a/ckan/tests/functional/test_group.py b/ckan/tests/functional/test_group.py index c5dc63b1097..f8a968f09cd 100644 --- a/ckan/tests/functional/test_group.py +++ b/ckan/tests/functional/test_group.py @@ -3,7 +3,6 @@ from nose.tools import assert_equal import mock -import ckan.tests.test_plugins as test_plugins import ckan.model as model import ckan.lib.search as search @@ -16,7 +15,6 @@ from ckan.tests import is_search_supported - class TestGroup(FunctionalTestCase): @classmethod @@ -25,6 +23,10 @@ def setup_class(self): model.Session.remove() CreateTestData.create() + # reduce extraneous logging + from ckan.lib import activity_streams_session_extension + activity_streams_session_extension.logger.level = 100 + @classmethod def teardown_class(self): model.repo.rebuild_db() @@ -56,14 +58,14 @@ def test_atom_feed_page_negative(self): assert '"page" parameter must be a positive integer' in res, res def test_children(self): - if model.engine_is_sqlite() : + if model.engine_is_sqlite(): from nose import SkipTest raise SkipTest("Can't use CTE for sqlite") group_name = 'deletetest' CreateTestData.create_groups([{'name': group_name, 'packages': []}, - {'name': "parent_group", + {'name': "parent_group", 'packages': []}], admin_user_name='testsysadmin') @@ -73,7 +75,7 @@ def test_children(self): rev = model.repo.new_revision() rev.author = "none" - member = model.Member(group_id=parent.id, table_id=group.id, + member = model.Member(group_id=group.id, table_id=parent.id, table_name='group', capacity='member') model.Session.add(member) model.repo.commit_and_remove() @@ -103,17 +105,21 @@ def test_children(self): def test_sorting(self): model.repo.rebuild_db() + testsysadmin = model.User(name=u'testsysadmin') + testsysadmin.sysadmin = True + model.Session.add(testsysadmin) + pkg1 = model.Package(name="pkg1") pkg2 = model.Package(name="pkg2") model.Session.add(pkg1) model.Session.add(pkg2) CreateTestData.create_groups([{'name': "alpha", 'packages': []}, - {'name': "beta", - 'packages': ["pkg1", "pkg2"]}, - {'name': "delta", - 'packages': ["pkg1"]}, - {'name': "gamma", 'packages': []}], + {'name': "beta", + 'packages': ["pkg1", "pkg2"]}, + {'name': "delta", + 'packages': ["pkg1"]}, + {'name': "gamma", 'packages': []}], admin_user_name='testsysadmin') context = {'model': model, 'session': model.Session, @@ -148,7 +154,6 @@ def test_sorting(self): assert results[0]['name'] == u'beta', results[0]['name'] assert results[1]['name'] == u'delta', results[1]['name'] - def test_mainmenu(self): # the home page does a package search so have to skip this test if # search is not supported @@ -198,14 +203,16 @@ def test_read_and_authorized_to_edit(self): title = u'Dave\'s books' pkgname = u'warandpeace' offset = url_for(controller='group', action='read', id=name) - res = self.app.get(offset, extra_environ={'REMOTE_USER': 'testsysadmin'}) + res = self.app.get(offset, + extra_environ={'REMOTE_USER': 'testsysadmin'}) assert title in res, res assert 'edit' in res assert name in res def test_new_page(self): offset = url_for(controller='group', action='new') - res = self.app.get(offset, extra_environ={'REMOTE_USER': 'testsysadmin'}) + res = self.app.get(offset, + extra_environ={'REMOTE_USER': 'testsysadmin'}) assert 'Add A Group' in res, res @@ -258,7 +265,6 @@ def setup_class(self): model.Session.add(model.Package(name=self.packagename)) model.repo.commit_and_remove() - @classmethod def teardown_class(self): model.Session.remove() @@ -662,6 +668,7 @@ def test_2_atom_feed(self): assert 'xmlns="http://www.w3.org/2005/Atom"' in res, res assert '' in res, res + class TestMemberInvite(FunctionalTestCase): @classmethod def setup_class(self): diff --git a/ckan/tests/functional/test_package.py b/ckan/tests/functional/test_package.py index 662ad0c2458..23a8bb48247 100644 --- a/ckan/tests/functional/test_package.py +++ b/ckan/tests/functional/test_package.py @@ -6,6 +6,7 @@ from nose.tools import assert_equal from ckan.tests import * +import ckan.tests as tests from ckan.tests.html_check import HtmlCheckMethods from ckan.tests.pylons_controller import PylonsTestCase from base import FunctionalTestCase @@ -1505,3 +1506,43 @@ def test_package_autocomplete(self): expected = ['A Wonderful Story (warandpeace)|warandpeace','annakarenina|annakarenina'] received = sorted(res.body.split('\n')) assert expected == received + +class TestResourceListing(TestPackageBase): + @classmethod + def setup_class(cls): + + CreateTestData.create() + cls.tester_user = model.User.by_name(u'tester') + cls.extra_environ_admin = {'REMOTE_USER': 'testsysadmin'} + cls.extra_environ_tester = {'REMOTE_USER': 'tester'} + cls.extra_environ_someone_else = {'REMOTE_USER': 'someone_else'} + + tests.call_action_api(cls.app, 'organization_create', + name='test_org_2', + apikey=cls.tester_user.apikey) + + tests.call_action_api(cls.app, 'package_create', + name='crimeandpunishment', + owner_org='test_org_2', + apikey=cls.tester_user.apikey) + + @classmethod + def teardown_class(cls): + model.repo.rebuild_db() + + def test_resource_listing_premissions_sysadmin(self): + # sysadmin 200 + self.app.get('/dataset/resources/crimeandpunishment', extra_environ=self.extra_environ_admin, status=200) + + def test_resource_listing_premissions_auth_user(self): + # auth user 200 + self.app.get('/dataset/resources/crimeandpunishment', extra_environ=self.extra_environ_tester, status=200) + + def test_resource_listing_premissions_non_auth_user(self): + # non auth user 401 + self.app.get('/dataset/resources/crimeandpunishment', extra_environ=self.extra_environ_someone_else, status=[302,401]) + + def test_resource_listing_premissions_not_logged_in(self): + # not logged in 401 + self.app.get('/dataset/resources/crimeandpunishment', status=[302,401]) + diff --git a/ckan/tests/functional/test_related.py b/ckan/tests/functional/test_related.py index 6fa2fed4266..9e65917fb2a 100644 --- a/ckan/tests/functional/test_related.py +++ b/ckan/tests/functional/test_related.py @@ -367,8 +367,13 @@ def test_related_list_missing_id_and_name(self): usr = logic.get_action('get_site_user')({'model':model,'ignore_auth': True},{}) context = dict(model=model, user=usr['name'], session=model.Session) data_dict = {} - from sqlalchemy.orm.query import Query - assert type(logic.get_action('related_list')(context, data_dict)) == Query + related_list = logic.get_action('related_list')(context, data_dict) + assert len(related_list) == 8 + related_keys = set(['view_count', 'description', 'title', 'url', + 'created', 'featured', 'image_url', 'type', 'id', 'owner_id']) + for related in related_list: + assert set(related.keys()) == related_keys + def test_related_list(self): p = model.Package.get('warandpeace') diff --git a/ckan/tests/lib/test_accept.py b/ckan/tests/lib/test_accept.py index 8234ab9a087..13c065e4b8c 100644 --- a/ckan/tests/lib/test_accept.py +++ b/ckan/tests/lib/test_accept.py @@ -56,10 +56,3 @@ def test_accept_valid6(self): assert_equal( ct, "application/rdf+xml; charset=utf-8") assert_equal( markup, True) assert_equal( ext, "rdf") - - def test_accept_valid7(self): - a = "text/turtle,application/turtle,application/rdf+xml;q=0.8,text/plain;q=0.9,*/*;q=.5" - ct, markup, ext = accept.parse_header(a) - assert_equal( ct, "text/plain; charset=utf-8") - assert_equal( markup, False) - assert_equal( ext, "txt") diff --git a/ckan/tests/lib/test_dictization.py b/ckan/tests/lib/test_dictization.py index ff376e628b8..954e3d5d4aa 100644 --- a/ckan/tests/lib/test_dictization.py +++ b/ckan/tests/lib/test_dictization.py @@ -48,6 +48,8 @@ def setup_class(cls): 'name': u'david', 'capacity': 'public', 'image_url': u'', + 'image_display_url': u'', + 'display_name': u"Dave's books", 'type': u'group', 'state': u'active', 'is_organization': False, @@ -57,6 +59,8 @@ def setup_class(cls): 'name': u'roger', 'capacity': 'public', 'image_url': u'', + 'image_display_url': u'', + 'display_name': u"Roger's books", 'type': u'group', 'state': u'active', 'is_organization': False, @@ -877,8 +881,6 @@ def test_16_group_dictized(self): context = {"model": model, "session": model.Session} - pkg = model.Session.query(model.Package).filter_by(name='annakarenina3').first() - simple_group_dict = {'name': 'simple', 'title': 'simple', 'type': 'organization', @@ -896,7 +898,7 @@ def test_16_group_dictized(self): 'approval_status': 'approved', 'extras': [{'key': 'genre', 'value': u'"horror"'}, {'key': 'media', 'value': u'"dvd"'}], - 'packages':[{'name': 'annakarenina2'}, {'id': pkg.id, 'capacity': 'in'}], + 'packages':[{'name': 'annakarenina2'}], 'users':[{'name': 'annafan'}], 'groups':[{'name': 'simple'}], 'tags':[{'name': 'russian'}] @@ -923,6 +925,7 @@ def test_16_group_dictized(self): 'capacity' : 'public', 'display_name': u'simple', 'image_url': u'', + 'image_display_url': u'', 'name': u'simple', 'packages': 0, 'state': u'active', @@ -945,41 +948,43 @@ def test_16_group_dictized(self): 'name': u'help', 'display_name': u'help', 'image_url': u'', - 'package_count': 2, + 'image_display_url': u'', + 'package_count': 1, 'is_organization': False, - 'packages': [{'author': None, - 'author_email': None, - 'license_id': u'other-open', - 'maintainer': None, - 'maintainer_email': None, - 'type': u'dataset', - 'name': u'annakarenina3', - 'notes': u'Some test notes\n\n### A 3rd level heading\n\n**Some bolded text.**\n\n*Some italicized text.*\n\nForeign characters:\nu with umlaut \xfc\n66-style quote \u201c\nforeign word: th\xfcmb\n\nNeeds escaping:\nleft arrow <\n\n/etc/ckan/${INSTANCE}/install_settings.sh -#!/bin/bash -EOF - chmod +x /etc/ckan/${INSTANCE}/install_settings.sh -fi - -# Parse the settings -. /etc/ckan/${INSTANCE}/install_settings.sh - -# See which settings are set, and create any we need that aren't -if [ "X${CKAN_DB_PASSWORD}" = "X" ] ; then - # Create a password - CKAN_DB_PASSWORD=`< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c10` - cat < > /etc/ckan/${INSTANCE}/install_settings.sh -CKAN_DB_PASSWORD=${CKAN_DB_PASSWORD} -EOF -fi - -error() { - echo -e "${@}" 1>&2 - exit 1 -} - -echo "Installing or upgrading CKAN ${INSTANCE} ..." - -echo "Ensuring users and groups are set up correctly ..." -ckan_ensure_users_and_groups ${INSTANCE} - -chown ckan${INSTANCE}:ckan${INSTANCE} /etc/ckan/${INSTANCE}/install_settings.sh - -echo "Ensuring directories exist for ${INSTANCE} CKAN INSTANCE ..." -ckan_make_ckan_directories ${INSTANCE} - -# Disable any existing crontabs during the upgrade, we don't want -# scripts running when things are still changing -echo "Disabling the crontab for the ckan${INSTANCE} user ..." -PACKAGED_CRONJOB="/tmp/${INSTANCE}-cronjob" -cat < ${PACKAGED_CRONJOB} -# m h dom mon dow command -EOF -crontab -u ckan${INSTANCE} ${PACKAGED_CRONJOB} - -# Try to put CKAN into maintenance mode, if it is installed -if [ -f /etc/apache2/sites-available/${INSTANCE}.maint ] ; then - # We have a maintence mode available - echo "Putting CKAN into maintenance mode ..." - ckan_maintenance_on ${INSTANCE} -fi - -echo "Setting log file permissions so that both Apache and cron jobs can log to the same place ..." -ckan_set_log_file_permissions ${INSTANCE} - -echo "Ensuring who.ini file exists ..." -ckan_create_who_ini ${INSTANCE} - -echo "Ensuring wsgi.py file exists ..." -ckan_create_wsgi_handler ${INSTANCE} - -if [[ ( "$LOCAL_DB" == "yes" ) ]] -then - # Replace any existing user with a new one with this password - echo "Making sure PostgreSQL is running ..." - /etc/init.d/postgresql-8.4 start - - echo "Setting the password of the ${INSTANCE} user in PostgreSQL" - ckan_add_or_replace_database_user ${INSTANCE} ${CKAN_DB_PASSWORD} -fi - -if ! [ -f /etc/ckan/${INSTANCE}/${INSTANCE}.ini ] ; then - # Create the config file - echo "Creating/overwriting the config for CKAN ... " - ckan_create_config_file ${INSTANCE} ${CKAN_DB_PASSWORD} ${LOCAL_DB} - # Now that the file exists, make some customisations - sed \ - -e "s,^\(ckan.dump_dir\)[ =].*,\1 = /var/lib/ckan/${INSTANCE}/static/dump," \ - -i /etc/ckan/${INSTANCE}/${INSTANCE}.ini - #echo "Ensuring the latest plugins are configured ..." - #sed -e "s/^\(ckan.plugins\)[ =].*/\1 = ${INSTANCE}/" \ - # -i /etc/ckan/${INSTANCE}/${INSTANCE}.ini -fi - -if [[ ( "$LOCAL_DB" == "yes" ) ]] -then - echo "Ensuring the ${INSTANCE} database exists ..." - ckan_ensure_db_exists ${INSTANCE} -fi - -# Overwrite the existing Apache config -if [ -f /etc/apache2/sites-enabled/000-default ] ; then - echo "Disabling the default Apache site ..." - a2dissite 000-default -fi - -echo "Overwriting the existing Apache config ..." -ckan_overwrite_apache_config ${INSTANCE} ${HOSTNAME} - -# Make sure mod_rewrite is enabled -if ! [ -f /etc/apache2/mods-enabled/rewrite.load ] ; then - echo "Enabling Apache mod_rewite ..." - a2enmod rewrite -fi - -if [[ ( "$LOCAL_DB" == "yes" ) ]] -then - # Standard paster db upgrade - echo "Performing any database upgrades ..." - paster --plugin=ckan db upgrade --config=/etc/ckan/${INSTANCE}/${INSTANCE}.ini -fi - -# Make sure our INSTANCE is enabled -echo "Bringing the ${INSTANCE} INSTANCE out of maintenance mode ..." -ckan_maintenance_off ${INSTANCE} - -# Restart Apache so it is aware of any changes -echo "Reloading apache ..." -/etc/init.d/apache2 reload - -# Install the new crontab -echo "Enabling crontab for the ckan${INSTANCE} user ..." -PACKAGED_CRONJOB="/tmp/${INSTANCE}-cronjob" -cat << EOF > ${PACKAGED_CRONJOB} -# WARNING: Do not edit these cron tabs, they will be overwritten any time -# the ckan INSTANCE package is upgraded -# QUESTION: Should email reports be sent to root? -EOF -crontab -u ckan${INSTANCE} ${PACKAGED_CRONJOB} - -exit 0 diff --git a/ckan_deb/usr/bin/ckan-instance-maintenance b/ckan_deb/usr/bin/ckan-instance-maintenance deleted file mode 100755 index cd019b27a96..00000000000 --- a/ckan_deb/usr/bin/ckan-instance-maintenance +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -. /usr/lib/ckan/common.sh - -set -e - -# Un-comment for debugging - -# Check we are root -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" - exit 1 -fi - -error() { - echo -e "${@}" 1>&2 - exit 1 -} - -usage() { - error "ERROR: call this script with instance name and \"on\" or \"off\", e.g.\n $0 dgu on" -} - -[ "X$1" = "X" ] || [ "X$2" = "X" ] && usage -instance=$1 -command=$2 - -for conf in /etc/apache2/sites-available/${instance}{,.maint} ; do - [ -f ${conf} ] || error "ERROR: ${conf} not found" -done - -case $command in - on) - echo "Putting CKAN site \"${instance}\" into maintenance mode ..." - maintenance_on $instance - echo "done." - ;; - - off) - echo "Disabling maintenance mode for CKAN site \"${instance}\" ..." - maintenance_off $instance - echo "done." - ;; - *) - usage - ;; -esac - -exit 0 diff --git a/ckan_deb/usr/bin/ckan-setup-solr b/ckan_deb/usr/bin/ckan-setup-solr deleted file mode 100755 index 0642a4c16d9..00000000000 --- a/ckan_deb/usr/bin/ckan-setup-solr +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -. /usr/lib/ckan/common.sh - -# Check we are root -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" - exit 1 -fi - -# Install solr-jetty if needed -if ! [ -f /etc/default/jetty ] ; then - echo "Installing solr-jetty ..." - apt-get update - apt-get install -y solr-jetty - echo "done." -fi - -echo "Configuring Solr for use with CKAN ..." -sed \ - -e "s,NO_START=1,NO_START=0," \ - -e "s,#JETTY_HOST=\$(uname -n),JETTY_HOST=127.0.0.1," \ - -e "s,#JETTY_PORT=8080,JETTY_PORT=8983," \ - -i /etc/default/jetty -mv /usr/share/solr/conf/schema.xml /usr/share/solr/conf/schema.xml.`date --utc "+%Y-%m-%d_%T"`.bak -ln -s /usr/lib/pymodules/python2.6/ckan/config/solr/schema-1.4.xml /usr/share/solr/conf/schema.xml -service jetty stop -service jetty start -echo "done." diff --git a/ckan_deb/usr/lib/ckan/common.sh b/ckan_deb/usr/lib/ckan/common.sh deleted file mode 100644 index 0458296e2c9..00000000000 --- a/ckan_deb/usr/lib/ckan/common.sh +++ /dev/null @@ -1,294 +0,0 @@ -#!/bin/bash - -ckan_log () { - echo "ckan: " $1 -} - -#_echo="echo" -ckan_maintenance_on () { - local INSTANCE - INSTANCE=$1 - $_echo a2dissite ${INSTANCE} - $_echo a2ensite ${INSTANCE}.maint - $_echo service apache2 reload -} - -ckan_maintenance_off () { - local INSTANCE - INSTANCE=$1 - $_echo a2dissite ${INSTANCE}.maint - $_echo a2ensite ${INSTANCE} - $_echo service apache2 reload -} - -ckan_set_log_file_permissions () { - local INSTANCE - INSTANCE=$1 - sudo chown www-data:ckan${INSTANCE} /var/log/ckan/${INSTANCE} - sudo chmod g+w /var/log/ckan/${INSTANCE} - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}1.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}2.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}3.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}4.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}5.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}6.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}7.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}8.log - sudo touch /var/log/ckan/${INSTANCE}/${INSTANCE}9.log - sudo chmod g+w /var/log/ckan/${INSTANCE}/${INSTANCE}*.log - sudo chown www-data:ckan${INSTANCE} /var/log/ckan/${INSTANCE}/${INSTANCE}*.log -} - -ckan_ensure_users_and_groups () { - local INSTANCE - INSTANCE=$1 - COMMAND_OUTPUT=`cat /etc/group | grep "ckan${INSTANCE}:"` - if ! [[ "$COMMAND_OUTPUT" =~ "ckan${INSTANCE}:" ]] ; then - echo "Creating the 'ckan${INSTANCE}' group ..." - sudo groupadd --system "ckan${INSTANCE}" - fi - COMMAND_OUTPUT=`cat /etc/passwd | grep "ckan${INSTANCE}:"` - if ! [[ "$COMMAND_OUTPUT" =~ "ckan${INSTANCE}:" ]] ; then - echo "Creating the 'ckan${INSTANCE}' user ..." - sudo useradd --system --gid "ckan${INSTANCE}" --home /var/lib/ckan/${INSTANCE} -M --shell /usr/sbin/nologin ckan${INSTANCE} - fi -} - -ckan_make_ckan_directories () { - local INSTANCE - if [ "X$1" = "X" ] ; then - echo "ERROR: call the function make_ckan_directories with an INSTANCE name, e.g." - echo " dgu" - exit 1 - else - INSTANCE=$1 - mkdir -p -m 0755 /etc/ckan/${INSTANCE} - mkdir -p -m 0750 /var/lib/ckan/${INSTANCE}{,/static} - mkdir -p -m 0770 /var/{backup,log}/ckan/${INSTANCE} /var/lib/ckan/${INSTANCE}/{data,sstore,static/dump} - sudo chown ckan${INSTANCE}:ckan${INSTANCE} /etc/ckan/${INSTANCE} - sudo chown www-data:ckan${INSTANCE} /var/{backup,log}/ckan/${INSTANCE} /var/lib/ckan/${INSTANCE} /var/lib/ckan/${INSTANCE}/{data,sstore,static/dump} - sudo chmod g+w /var/log/ckan/${INSTANCE} /var/lib/ckan/${INSTANCE}/{data,sstore,static/dump} - fi -} - -ckan_create_who_ini () { - local INSTANCE - if [ "X$1" = "X" ] ; then - echo "ERROR: call the function create_who_ini function with an INSTANCE name, e.g." - echo " dgu" - exit 1 - else - INSTANCE=$1 - if ! [ -f /etc/ckan/$0/who.ini ] ; then - cp -n /usr/share/pyshared/ckan/config/who.ini /etc/ckan/${INSTANCE}/who.ini - sed -e "s,%(here)s,/var/lib/ckan/${INSTANCE}," \ - -i /etc/ckan/${INSTANCE}/who.ini - chown ckan${INSTANCE}:ckan${INSTANCE} /etc/ckan/${INSTANCE}/who.ini - fi - fi -} - -ckan_create_config_file () { - local INSTANCE password LOCAL_DB - if [ "X$1" = "X" ] || [ "X$2" = "X" ] ; then - echo "ERROR: call the function create_config_file function with an INSTANCE name, and a password for postgresql e.g." - echo " dgu 1U923hjkh8" - exit 1 - else - INSTANCE=$1 - password=$2 - LOCAL_DB=$3 - # Create an install settings file if it doesn't exist - if [ -f /etc/ckan/${INSTANCE}/${INSTANCE}.ini ] ; then - mv /etc/ckan/${INSTANCE}/${INSTANCE}.ini "/etc/ckan/${INSTANCE}/${INSTANCE}.ini.`date +%F_%T`.bak" - fi - paster make-config ckan /etc/ckan/${INSTANCE}/${INSTANCE}.ini - - if [[ ( "$LOCAL_DB" == "yes" ) ]] - then - sed -e "s,^\(sqlalchemy.url\)[ =].*,\1 = postgresql://${INSTANCE}:${password}@localhost/${INSTANCE}," \ - -i /etc/ckan/${INSTANCE}/${INSTANCE}.ini - fi - sed -e "s,^\(email_to\)[ =].*,\1 = root," \ - -e "s,^\(error_email_from\)[ =].*,\1 = ckan-${INSTANCE}@`hostname`," \ - -e "s,# ckan\.site_id = ckan.net,ckan.site_id = ${INSTANCE}," \ - -e "s,^\(cache_dir\)[ =].*,\1 = /var/lib/ckan/${INSTANCE}/data," \ - -e "s,^\(who\.config_file\)[ =].*,\1 = /etc/ckan/${INSTANCE}/who.ini," \ - -e "s,\"ckan\.log\",\"/var/log/ckan/${INSTANCE}/${INSTANCE}.log\"," \ - -e "s,#solr_url = http://127.0.0.1:8983/solr,solr_url = http://127.0.0.1:8983/solr," \ - -i /etc/ckan/${INSTANCE}/${INSTANCE}.ini - sudo chown ckan${INSTANCE}:ckan${INSTANCE} /etc/ckan/${INSTANCE}/${INSTANCE}.ini - fi -} - -ckan_add_or_replace_database_user () { - local INSTANCE password - if [ "X$1" = "X" ] || [ "X$2" = "X" ] ; then - echo "ERROR: call the function ckan_add_or_replace_database_user function with an INSTANCE name, and a password for postgresql e.g." - echo " dgu 1U923hjkh8" - echo " You can generate a password like this: " - echo " < /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c10" - exit 1 - else - INSTANCE=$1 - password=$2 - COMMAND_OUTPUT=`sudo -u postgres psql -c "SELECT 'True' FROM pg_user WHERE usename='${INSTANCE}'"` - if ! [[ "$COMMAND_OUTPUT" =~ True ]] ; then - echo "Creating the ${INSTANCE} user ..." - sudo -u postgres psql -c "CREATE USER \"${INSTANCE}\" WITH PASSWORD '${password}'" - else - echo "Setting the ${INSTANCE} user password ..." - sudo -u postgres psql -c "ALTER USER \"${INSTANCE}\" WITH PASSWORD '${password}'" - fi - fi -} - -ckan_ensure_db_exists () { - local INSTANCE - if [ "X$1" = "X" ] ; then - echo "ERROR: call the function ensure_db_exists function with an INSTANCE name, e.g." - echo " dgu" - exit 1 - else - INSTANCE=$1 - COMMAND_OUTPUT=`sudo -u postgres psql -c "select datname from pg_database where datname='$INSTANCE'"` - if ! [[ "$COMMAND_OUTPUT" =~ ${INSTANCE} ]] ; then - echo "Creating the database ..." - sudo -u postgres createdb -O ${INSTANCE} ${INSTANCE} -E utf-8 - paster --plugin=ckan db init --config=/etc/ckan/${INSTANCE}/${INSTANCE}.ini - fi - fi -} - -ckan_create_wsgi_handler () { - local INSTANCE - if [ "X$1" = "X" ] ; then - echo "ERROR: call the function create_wsgi_handler function with an INSTANCE name, e.g." - echo " dgu" - exit 1 - else - INSTANCE=$1 - if [ ! -f "/var/lib/ckan/${INSTANCE}/wsgi.py" ] - then - sudo mkdir /var/lib/ckan/${INSTANCE}/pyenv - sudo chown -R ckan${INSTANCE}:ckan${INSTANCE} /var/lib/ckan/${INSTANCE}/pyenv - sudo -u ckan${INSTANCE} virtualenv --setuptools /var/lib/ckan/${INSTANCE}/pyenv - echo "Attempting to install 'pip' 1.0 from pypi.python.org into pyenv to be used for extensions ..." - sudo -u ckan${INSTANCE} /var/lib/ckan/${INSTANCE}/pyenv/bin/easy_install --upgrade "pip>=1.0" "pip<=1.0.99" - echo "done." - echo "Attempting to install 'paster' pypi.python.org into pyenv ..." - sudo -u ckan${INSTANCE} /var/lib/ckan/${INSTANCE}/pyenv/bin/pip install --ignore-installed "pastescript" - echo "done." - cat <<- EOF > /var/lib/ckan/${INSTANCE}/packaging_version.txt - 1.5 - EOF - cat <<- EOF > /var/lib/ckan/${INSTANCE}/wsgi.py - import os - instance_dir = '/var/lib/ckan/${INSTANCE}' - config_dir = '/etc/ckan/${INSTANCE}' - config_file = '${INSTANCE}.ini' - pyenv_bin_dir = os.path.join(instance_dir, 'pyenv', 'bin') - activate_this = os.path.join(pyenv_bin_dir, 'activate_this.py') - execfile(activate_this, dict(__file__=activate_this)) - # this is werid but without importing ckanext first import of paste.deploy will fail - #import ckanext - config_filepath = os.path.join(config_dir, config_file) - if not os.path.exists(config_filepath): - raise Exception('No such file %r'%config_filepath) - from paste.deploy import loadapp - from paste.script.util.logging_config import fileConfig - fileConfig(config_filepath) - application = loadapp('config:%s' % config_filepath) - from apachemiddleware import MaintenanceResponse - application = MaintenanceResponse(application) - EOF - sudo chmod +x /var/lib/ckan/${INSTANCE}/wsgi.py - fi - fi -} - -ckan_overwrite_apache_config () { - local INSTANCE ServerName - if [ "X$1" = "X" ] ; then - echo "ERROR: call the function overwrite_apache_config function with an INSTANCE name, the server name and a server aliase e.g." - echo " dgu catalogue.data.gov.uk dgu-live.okfn.org" - exit 1 - else - INSTANCE=$1 - ServerName=$2 - #rm /etc/apache2/sites-available/${INSTANCE}.common - cat < /etc/apache2/sites-available/${INSTANCE}.common - - # WARNING: Do not manually edit this file, it is designed to be - # overwritten at any time by the postinst script of - # dependent packages - - # These are common settings used for both the normal and maintenance modes - - DocumentRoot /var/lib/ckan/${INSTANCE}/static - ServerName ${ServerName} - - - # XXX Should this be deny? We get a "Client denied by server configuration" without it - allow from all - - - - allow from all - - - - allow from all - - - Alias /dump /var/lib/ckan/${INSTANCE}/static/dump - - # Disable the mod_python handler for static files -- SetHandler None - Options +Indexes - - - # this is our app - WSGIScriptAlias / /var/lib/ckan/${INSTANCE}/wsgi.py - - # pass authorization info on (needed for rest api) - WSGIPassAuthorization On - - # Deploy as a daemon (avoids conflicts between CKAN instances) - # WSGIDaemonProcess ${INSTANCE} display-name=${INSTANCE} processes=4 threads=15 maximum-requests=10000 - # WSGIProcessGroup ${INSTANCE} - - ErrorLog /var/log/apache2/${INSTANCE}.error.log - CustomLog /var/log/apache2/${INSTANCE}.custom.log combined -EOF - #rm /etc/apache2/sites-available/${INSTANCE} - cat </etc/apache2/sites-available/${INSTANCE} - - # WARNING: Do not manually edit this file, it is designed to be - # overwritten at any time by the postinst script of - # dependent packages - Include /etc/apache2/sites-available/${INSTANCE}.common - -EOF - #rm /etc/apache2/sites-available/${INSTANCE}.maint - cat </etc/apache2/sites-available/${INSTANCE}.maint - - # WARNING: Do not manually edit this file, it is designed to be - # overwritten at any time by the postinst script of - # dependent packages - Include /etc/apache2/sites-available/${INSTANCE}.common - - # Maintenance mode - RewriteEngine On - RewriteRule ^(.*)/new /return_503 [PT,L] - RewriteRule ^(.*)/create /return_503 [PT,L] - RewriteRule ^(.*)/authz /return_503 [PT,L] - RewriteRule ^(.*)/edit /return_503 [PT,L] - RewriteCond %{REQUEST_METHOD} !^GET$ [NC] - RewriteRule (.*) /return_503 [PT,L] - -EOF - fi -} diff --git a/ckanext/datapusher/helpers.py b/ckanext/datapusher/helpers.py index d5291425b28..535e6d57635 100644 --- a/ckanext/datapusher/helpers.py +++ b/ckanext/datapusher/helpers.py @@ -9,3 +9,19 @@ def datapusher_status(resource_id): return { 'status': 'unknown' } + + +def datapusher_status_description(status): + _ = toolkit._ + + if status.get('status'): + captions = { + 'complete': _('Complete'), + 'pending': _('Pending'), + 'submitting': _('Submitting'), + 'error': _('Error'), + } + + return captions.get(status['status'], status['status'].capitalize()) + else: + return _('Not Uploaded Yet') diff --git a/ckanext/datapusher/logic/action.py b/ckanext/datapusher/logic/action.py index f618a886fd6..683ac036145 100644 --- a/ckanext/datapusher/logic/action.py +++ b/ckanext/datapusher/logic/action.py @@ -45,9 +45,12 @@ def datapusher_submit(context, data_dict): datapusher_url = pylons.config.get('ckan.datapusher.url') - callback_url = p.toolkit.url_for( - controller='api', action='action', logic_function='datapusher_hook', - ver=3, qualified=True) + site_url = pylons.config['ckan.site_url'] + + callback_url = site_url.rstrip('/') + p.toolkit.url_for( + controller='api', action='action', + logic_function='datapusher_hook', ver=3 + ) user = p.toolkit.get_action('user_show')(context, {'id': context['user']}) @@ -86,7 +89,7 @@ def datapusher_submit(context, data_dict): 'job_type': 'push_to_datastore', 'result_url': callback_url, 'metadata': { - 'ckan_url': pylons.config['ckan.site_url'], + 'ckan_url': site_url, 'resource_id': res_id, 'set_url_type': data_dict.get('set_url_type', False) } @@ -165,6 +168,7 @@ def datapusher_hook(context, data_dict): view_list = p.toolkit.get_action('resource_view_create')(context, view) + context['ignore_auth'] = True p.toolkit.get_action('task_status_update')(context, task) diff --git a/ckanext/datapusher/plugin.py b/ckanext/datapusher/plugin.py index c53dd14790d..56fb44d2122 100644 --- a/ckanext/datapusher/plugin.py +++ b/ckanext/datapusher/plugin.py @@ -80,10 +80,11 @@ def configure(self, config): datapusher_formats = config.get('ckan.datapusher.formats', '').lower() self.datapusher_formats = datapusher_formats.split() or DEFAULT_FORMATS - datapusher_url = config.get('ckan.datapusher.url') - if not datapusher_url: - raise Exception( - 'Config option `ckan.datapusher.url` has to be set.') + for config_option in ('ckan.site_url', 'ckan.datapusher.url',): + if not config.get(config_option): + raise Exception( + 'Config option `{0}` must be set to use the DataPusher.' + .format(config_option)) def notify(self, entity, operation=None): if isinstance(entity, model.Resource): @@ -94,10 +95,7 @@ def notify(self, entity, operation=None): # 1 parameter context = {'model': model, 'ignore_auth': True, 'defer_commit': True} - package = p.toolkit.get_action('package_show')(context, { - 'id': entity.get_package_id() - }) - if (not package['private'] and entity.format and + if (entity.format and entity.format.lower() in self.datapusher_formats and entity.url_type != 'datapusher'): try: @@ -128,4 +126,7 @@ def get_auth_functions(self): def get_helpers(self): return { - 'datapusher_status': helpers.datapusher_status} + 'datapusher_status': helpers.datapusher_status, + 'datapusher_status_description': + helpers.datapusher_status_description, + } diff --git a/ckanext/datapusher/tests/test.py b/ckanext/datapusher/tests/test.py index 2ec2df42d21..af7488736f6 100644 --- a/ckanext/datapusher/tests/test.py +++ b/ckanext/datapusher/tests/test.py @@ -138,7 +138,7 @@ def test_send_datapusher_creates_task(self): assert task['state'] == 'pending', task - def test_datapusher_hook(self): + def _call_datapusher_hook(self, user): package = model.Package.get('annakarenina') resource = package.resources[0] @@ -163,7 +163,7 @@ def test_datapusher_hook(self): } } postparams = '%s=1' % json.dumps(data) - auth = {'Authorization': str(self.sysadmin_user.apikey)} + auth = {'Authorization': str(user.apikey)} res = self.app.post('/api/action/datapusher_hook', params=postparams, extra_environ=auth, status=200) print res.body @@ -182,3 +182,11 @@ def test_datapusher_hook(self): task_type='datapusher', key='datapusher') assert task['state'] == 'success', task + + def test_datapusher_hook_sysadmin(self): + + self._call_datapusher_hook(self.sysadmin_user) + + def test_datapusher_hook_normal_user(self): + + self._call_datapusher_hook(self.normal_user) diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py index 4dc41ff974d..53775000752 100644 --- a/ckanext/datastore/db.py +++ b/ckanext/datastore/db.py @@ -292,6 +292,8 @@ def convert(data, type_name): if type_name.startswith('_'): sub_type = type_name[1:] return [convert(item, sub_type) for item in data] + if type_name == 'tsvector': + return unicode(data, 'utf-8') if isinstance(data, datetime.datetime): return data.isoformat() if isinstance(data, (int, float)): @@ -835,7 +837,10 @@ def _insert_links(data_dict, limit, offset): data_dict['_links'] = {} # get the url from the request - urlstring = toolkit.request.environ['CKAN_CURRENT_URL'] + try: + urlstring = toolkit.request.environ['CKAN_CURRENT_URL'] + except TypeError: + return # no links required for local actions # change the offset in the url parsed = list(urlparse.urlparse(urlstring)) diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py index 804fec1a197..1b90193a1bb 100644 --- a/ckanext/datastore/logic/action.py +++ b/ckanext/datastore/logic/action.py @@ -380,7 +380,7 @@ def datastore_search_sql(context, data_dict): '(; equals chr(59)) and string concatenation (||). ')] }) - p.toolkit.check_access('datastore_search', context, data_dict) + p.toolkit.check_access('datastore_search_sql', context, data_dict) data_dict['connection_url'] = pylons.config['ckan.datastore.read_url'] diff --git a/ckanext/datastore/logic/auth.py b/ckanext/datastore/logic/auth.py index f99d7f45ae3..d002d106fda 100644 --- a/ckanext/datastore/logic/auth.py +++ b/ckanext/datastore/logic/auth.py @@ -35,5 +35,10 @@ def datastore_search(context, data_dict): return datastore_auth(context, data_dict, 'resource_show') +@p.toolkit.auth_allow_anonymous_access +def datastore_search_sql(context, data_dict): + return {'success': True} + + def datastore_change_permissions(context, data_dict): return datastore_auth(context, data_dict) diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py index f91310ecdec..73103e67121 100644 --- a/ckanext/datastore/plugin.py +++ b/ckanext/datastore/plugin.py @@ -221,6 +221,7 @@ def get_auth_functions(self): 'datastore_upsert': auth.datastore_upsert, 'datastore_delete': auth.datastore_delete, 'datastore_search': auth.datastore_search, + 'datastore_search_sql': auth.datastore_search_sql, 'datastore_change_permissions': auth.datastore_change_permissions} def before_map(self, m): diff --git a/ckanext/example_iauthfunctions/plugin.py b/ckanext/example_iauthfunctions/plugin_v4.py similarity index 97% rename from ckanext/example_iauthfunctions/plugin.py rename to ckanext/example_iauthfunctions/plugin_v4.py index 469b2c627b0..5bf972b07d0 100644 --- a/ckanext/example_iauthfunctions/plugin.py +++ b/ckanext/example_iauthfunctions/plugin_v4.py @@ -3,7 +3,6 @@ def group_create(context, data_dict=None): -# from nose.tools import set_trace; set_trace() # Get the user name of the logged-in user. user_name = context['user'] diff --git a/ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py b/ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py new file mode 100644 index 00000000000..44d43cf9d3d --- /dev/null +++ b/ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py @@ -0,0 +1,29 @@ +import pylons.config as config + +import ckan.plugins as plugins +import ckan.plugins.toolkit as toolkit + + +def group_create(context, data_dict=None): + + # Get the value of the ckan.iauthfunctions.users_can_create_groups + # setting from the CKAN config file as a string, or False if the setting + # isn't in the config file. + users_can_create_groups = config.get( + 'ckan.iauthfunctions.users_can_create_groups', False) + + # Convert the value from a string to a boolean. + users_can_create_groups = toolkit.asbool(users_can_create_groups) + + if users_can_create_groups: + return {'success': True} + else: + return {'success': False, + 'msg': 'Only sysadmins can create groups'} + + +class ExampleIAuthFunctionsPlugin(plugins.SingletonPlugin): + plugins.implements(plugins.IAuthFunctions) + + def get_auth_functions(self): + return {'group_create': group_create} diff --git a/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py b/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py index 7031867df27..25d2501ea77 100644 --- a/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py +++ b/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py @@ -3,14 +3,88 @@ ''' import paste.fixture import pylons.test +import pylons.config as config +import webtest import ckan.model as model import ckan.tests as tests -import ckan.plugins as plugins -import ckan.plugins.toolkit as toolkit +import ckan.plugins +import ckan.new_tests.factories as factories -class TestExampleIAuthFunctionsPlugin(object): +class TestExampleIAuthFunctionsCustomConfigSetting(object): + '''Tests for the plugin_v5_custom_config_setting module. + + ''' + def _get_app(self, users_can_create_groups): + + # Set the custom config option in pylons.config. + config['ckan.iauthfunctions.users_can_create_groups'] = ( + users_can_create_groups) + + # Return a test app with the custom config. + app = ckan.config.middleware.make_app(config['global_conf'], **config) + app = webtest.TestApp(app) + + ckan.plugins.load('example_iauthfunctions_v5_custom_config_setting') + + return app + + def teardown(self): + + # Remove the custom config option from pylons.config. + del config['ckan.iauthfunctions.users_can_create_groups'] + + # Delete any stuff that's been created in the db, so it doesn't + # interfere with the next test. + model.repo.rebuild_db() + + @classmethod + def teardown_class(cls): + ckan.plugins.unload('example_iauthfunctions_v5_custom_config_setting') + + def test_sysadmin_can_create_group_when_config_is_False(self): + app = self._get_app(users_can_create_groups=False) + sysadmin = factories.Sysadmin() + + tests.call_action_api(app, 'group_create', name='test-group', + apikey=sysadmin['apikey']) + + def test_user_cannot_create_group_when_config_is_False(self): + app = self._get_app(users_can_create_groups=False) + user = factories.User() + + tests.call_action_api(app, 'group_create', name='test-group', + apikey=user['apikey'], status=403) + + def test_visitor_cannot_create_group_when_config_is_False(self): + app = self._get_app(users_can_create_groups=False) + + tests.call_action_api(app, 'group_create', name='test-group', + status=403) + + def test_sysadmin_can_create_group_when_config_is_True(self): + app = self._get_app(users_can_create_groups=True) + sysadmin = factories.Sysadmin() + + tests.call_action_api(app, 'group_create', name='test-group', + apikey=sysadmin['apikey']) + + def test_user_can_create_group_when_config_is_True(self): + app = self._get_app(users_can_create_groups=True) + user = factories.User() + + tests.call_action_api(app, 'group_create', name='test-group', + apikey=user['apikey']) + + def test_visitor_cannot_create_group_when_config_is_True(self): + app = self._get_app(users_can_create_groups=True) + + tests.call_action_api(app, 'group_create', name='test-group', + status=403) + + +class TestExampleIAuthFunctionsPluginV4(object): '''Tests for the ckanext.example_iauthfunctions.plugin module. ''' @@ -24,17 +98,7 @@ def setup_class(cls): # Test code should use CKAN's plugins.load() function to load plugins # to be tested. - plugins.load('example_iauthfunctions') - - def setup(self): - '''Nose runs this method before each test method in our test class.''' - - # Access CKAN's model directly (bad) to create a sysadmin user and save - # it against self for all test methods to access. - self.sysadmin = model.User(name='test_sysadmin', sysadmin=True) - model.Session.add(self.sysadmin) - model.Session.commit() - model.Session.remove() + ckan.plugins.load('example_iauthfunctions_v4') def teardown(self): '''Nose runs this method after each test method in our test class.''' @@ -51,31 +115,25 @@ def teardown_class(cls): ''' # We have to unload the plugin we loaded, so it doesn't affect any # tests that run after ours. - plugins.unload('example_iauthfunctions') + ckan.plugins.unload('example_iauthfunctions_v4') def _make_curators_group(self): '''This is a helper method for test methods to call when they want the 'curators' group to be created. ''' + sysadmin = factories.Sysadmin() + # Create a user who will *not* be a member of the curators group. - noncurator = tests.call_action_api(self.app, 'user_create', - apikey=self.sysadmin.apikey, - name='noncurator', - email='email', - password='password') + noncurator = factories.User() # Create a user who will be a member of the curators group. - curator = tests.call_action_api(self.app, 'user_create', - apikey=self.sysadmin.apikey, - name='curator', - email='email', - password='password') + curator = factories.User() # Create the curators group, with the 'curator' user as a member. users = [{'name': curator['name'], 'capacity': 'member'}] curators_group = tests.call_action_api(self.app, 'group_create', - apikey=self.sysadmin.apikey, + apikey=sysadmin['apikey'], name='curators', users=users) @@ -85,12 +143,14 @@ def test_group_create_with_no_curators_group(self): '''Test that group_create doesn't crash when there's no curators group. ''' + sysadmin = factories.Sysadmin() + # Make sure there's no curators group. assert 'curators' not in tests.call_action_api(self.app, 'group_list') # Make our sysadmin user create a group. CKAN should not crash. tests.call_action_api(self.app, 'group_create', name='test-group', - apikey=self.sysadmin.apikey) + apikey=sysadmin['apikey']) def test_group_create_with_visitor(self): '''A visitor (not logged in) should not be able to create a group. @@ -129,18 +189,18 @@ def test_group_create_with_curator(self): assert result['name'] == name -class TestExampleIAuthFunctionsPluginV3(TestExampleIAuthFunctionsPlugin): +class TestExampleIAuthFunctionsPluginV3(TestExampleIAuthFunctionsPluginV4): '''Tests for the ckanext.example_iauthfunctions.plugin_v3 module. ''' @classmethod def setup_class(cls): cls.app = paste.fixture.TestApp(pylons.test.pylonsapp) - plugins.load('example_iauthfunctions_v3') + ckan.plugins.load('example_iauthfunctions_v3') @classmethod def teardown_class(cls): - plugins.unload('example_iauthfunctions_v3') + ckan.plugins.unload('example_iauthfunctions_v3') def test_group_create_with_no_curators_group(self): '''Test that group_create returns a 404 when there's no curators group. @@ -150,11 +210,9 @@ def test_group_create_with_no_curators_group(self): ''' assert 'curators' not in tests.call_action_api(self.app, 'group_list') - user = tests.call_action_api(self.app, 'user_create', - apikey=self.sysadmin.apikey, - name='test-user', - email='email', - password='password') + + user = factories.User() + response = tests.call_action_api(self.app, 'group_create', name='test_group', apikey=user['apikey'], status=404) @@ -175,18 +233,18 @@ def test_group_create_with_visitor(self): assert response['__type'] == 'Authorization Error' -class TestExampleIAuthFunctionsPluginV2(TestExampleIAuthFunctionsPlugin): +class TestExampleIAuthFunctionsPluginV2(TestExampleIAuthFunctionsPluginV4): '''Tests for the ckanext.example_iauthfunctions.plugin_v2 module. ''' @classmethod def setup_class(cls): cls.app = paste.fixture.TestApp(pylons.test.pylonsapp) - plugins.load('example_iauthfunctions_v2') + ckan.plugins.load('example_iauthfunctions_v2') @classmethod def teardown_class(cls): - plugins.unload('example_iauthfunctions_v2') + ckan.plugins.unload('example_iauthfunctions_v2') def test_group_create_with_curator(self): '''Test that a curator can*not* create a group. diff --git a/ckanext/example_theme/__init__.py b/ckanext/example_theme/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/custom_config_setting/__init__.py b/ckanext/example_theme/custom_config_setting/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/custom_config_setting/plugin.py b/ckanext/example_theme/custom_config_setting/plugin.py new file mode 100644 index 00000000000..6985a5e64e9 --- /dev/null +++ b/ckanext/example_theme/custom_config_setting/plugin.py @@ -0,0 +1,65 @@ +import pylons.config as config + +import ckan.plugins as plugins +import ckan.plugins.toolkit as toolkit + + +def show_most_popular_groups(): + '''Return the value of the most_popular_groups config setting. + + To enable showing the most popular groups, add this line to the + [app:main] section of your CKAN config file:: + + ckan.example_theme.show_most_popular_groups = True + + Returns ``False`` by default, if the setting is not in the config file. + + :rtype: boolean + + ''' + value = config.get('ckan.example_theme.show_most_popular_groups', False) + value = toolkit.asbool(value) + return value + + +def most_popular_groups(): + '''Return a sorted list of the groups with the most datasets.''' + + # Get a list of all the site's groups from CKAN, sorted by number of + # datasets. + groups = toolkit.get_action('group_list')( + data_dict={'sort': 'packages desc', 'all_fields': True}) + + # Truncate the list to the 10 most popular groups only. + groups = groups[:10] + + return groups + + +class ExampleThemePlugin(plugins.SingletonPlugin): + '''An example theme plugin. + + ''' + plugins.implements(plugins.IConfigurer) + + # Declare that this plugin will implement ITemplateHelpers. + plugins.implements(plugins.ITemplateHelpers) + + def update_config(self, config): + + # Add this plugin's templates dir to CKAN's extra_template_paths, so + # that CKAN will use this plugin's custom templates. + toolkit.add_template_directory(config, 'templates') + + def get_helpers(self): + '''Register the most_popular_groups() function above as a template + helper function. + + ''' + # Template helper function names should begin with the name of the + # extension they belong to, to avoid clashing with functions from + # other extensions. + return {'example_theme_most_popular_groups': most_popular_groups, + 'example_theme_show_most_popular_groups': + show_most_popular_groups, + } diff --git a/ckanext/example_theme/custom_config_setting/templates/home/layout1.html b/ckanext/example_theme/custom_config_setting/templates/home/layout1.html new file mode 100644 index 00000000000..2756915852c --- /dev/null +++ b/ckanext/example_theme/custom_config_setting/templates/home/layout1.html @@ -0,0 +1,22 @@ +{% ckan_extends %} + +{% block featured_group %} +++{% endblock %} + +{# Show the most popular groups if the show_most_popular_groups config setting + is True, otherwise call the super block. #} +{% block featured_organization %} + {% if h.example_theme_show_most_popular_groups() %} + {% snippet 'snippets/example_theme_most_popular_groups.html' %} + {% else %} + {{ super() }} + {% endif %} +{% endblock %} diff --git a/ckanext/example_theme/custom_config_setting/templates/snippets b/ckanext/example_theme/custom_config_setting/templates/snippets new file mode 120000 index 00000000000..3b8b13dd149 --- /dev/null +++ b/ckanext/example_theme/custom_config_setting/templates/snippets @@ -0,0 +1 @@ +../../v11_HTML_and_CSS/templates/snippets/ \ No newline at end of file diff --git a/ckanext/example_theme/v01_empty_extension/__init__.py b/ckanext/example_theme/v01_empty_extension/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v01_empty_extension/plugin.py b/ckanext/example_theme/v01_empty_extension/plugin.py new file mode 100644 index 00000000000..43686f7e315 --- /dev/null +++ b/ckanext/example_theme/v01_empty_extension/plugin.py @@ -0,0 +1,8 @@ +import ckan.plugins as plugins + + +class ExampleThemePlugin(plugins.SingletonPlugin): + '''An example theme plugin. + + ''' + pass diff --git a/ckanext/example_theme/v02_empty_template/__init__.py b/ckanext/example_theme/v02_empty_template/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v02_empty_template/plugin.py b/ckanext/example_theme/v02_empty_template/plugin.py new file mode 100644 index 00000000000..4484b6a0fe8 --- /dev/null +++ b/ckanext/example_theme/v02_empty_template/plugin.py @@ -0,0 +1,21 @@ +'''plugin.py + +''' +import ckan.plugins as plugins +import ckan.plugins.toolkit as toolkit + + +class ExampleThemePlugin(plugins.SingletonPlugin): + '''An example theme plugin. + + ''' + # Declare that this class implements IConfigurer. + plugins.implements(plugins.IConfigurer) + + def update_config(self, config): + + # Add this plugin's templates dir to CKAN's extra_template_paths, so + # that CKAN will use this plugin's custom templates. + # 'templates' is the path to the templates dir, relative to this + # plugin.py file. + toolkit.add_template_directory(config, 'templates') diff --git a/ckanext/example_theme/v02_empty_template/templates/home/index.html b/ckanext/example_theme/v02_empty_template/templates/home/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v03_jinja/__init__.py b/ckanext/example_theme/v03_jinja/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v03_jinja/plugin.py b/ckanext/example_theme/v03_jinja/plugin.py new file mode 120000 index 00000000000..b3fbefb50a3 --- /dev/null +++ b/ckanext/example_theme/v03_jinja/plugin.py @@ -0,0 +1 @@ +../v02_empty_template/plugin.py \ No newline at end of file diff --git a/ckanext/example_theme/v03_jinja/templates/home/index.html b/ckanext/example_theme/v03_jinja/templates/home/index.html new file mode 100644 index 00000000000..1762034752e --- /dev/null +++ b/ckanext/example_theme/v03_jinja/templates/home/index.html @@ -0,0 +1,24 @@ +{# Jinja variable example #} ++ +Recent activity
++ {{ h.recently_changed_packages_activity_stream(limit=4) }} ++The title of this site is: {{ app_globals.site_title }}.
+{# End example #} + +{# Jinja for-loop example #} +The currently enabled plugins are:
+-
+ {% for plugin in app_globals.plugins %}
+
- {{ plugin }} + {% endfor %} +
CKAN's page-view tracking feature is enabled.
+{% else %} +CKAN's page-view tracking feature is not enabled.
+{% endif %} +{# End example #} + +{# Jinja comment example #} +{# This text will not appear in the output when this template is rendered. #} +{# End example #} diff --git a/ckanext/example_theme/v04_ckan_extends/__init__.py b/ckanext/example_theme/v04_ckan_extends/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v04_ckan_extends/plugin.py b/ckanext/example_theme/v04_ckan_extends/plugin.py new file mode 120000 index 00000000000..03c7748d253 --- /dev/null +++ b/ckanext/example_theme/v04_ckan_extends/plugin.py @@ -0,0 +1 @@ +../v03_jinja/plugin.py \ No newline at end of file diff --git a/ckanext/example_theme/v04_ckan_extends/templates/home/index.html b/ckanext/example_theme/v04_ckan_extends/templates/home/index.html new file mode 100644 index 00000000000..c58cded7bfa --- /dev/null +++ b/ckanext/example_theme/v04_ckan_extends/templates/home/index.html @@ -0,0 +1 @@ +{% ckan_extends %} diff --git a/ckanext/example_theme/v05_block/__init__.py b/ckanext/example_theme/v05_block/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v05_block/plugin.py b/ckanext/example_theme/v05_block/plugin.py new file mode 120000 index 00000000000..8fd4d455da5 --- /dev/null +++ b/ckanext/example_theme/v05_block/plugin.py @@ -0,0 +1 @@ +../v04_ckan_extends/plugin.py \ No newline at end of file diff --git a/ckanext/example_theme/v05_block/templates/home/layout1.html b/ckanext/example_theme/v05_block/templates/home/layout1.html new file mode 100644 index 00000000000..0d30ad905df --- /dev/null +++ b/ckanext/example_theme/v05_block/templates/home/layout1.html @@ -0,0 +1,5 @@ +{% ckan_extends %} + +{% block featured_group %} + Hello block world! +{% endblock %} diff --git a/ckanext/example_theme/v06_super/__init__.py b/ckanext/example_theme/v06_super/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v06_super/plugin.py b/ckanext/example_theme/v06_super/plugin.py new file mode 120000 index 00000000000..2a362269bdb --- /dev/null +++ b/ckanext/example_theme/v06_super/plugin.py @@ -0,0 +1 @@ +../v05_block/plugin.py \ No newline at end of file diff --git a/ckanext/example_theme/v06_super/templates/home/layout1.html b/ckanext/example_theme/v06_super/templates/home/layout1.html new file mode 100644 index 00000000000..8661e1fb28c --- /dev/null +++ b/ckanext/example_theme/v06_super/templates/home/layout1.html @@ -0,0 +1,14 @@ +{% ckan_extends %} + +{% block featured_group %} + +This paragraph will be added to the top of the +
+ + {# Insert the contents of the original featured_group block: #} + {{ super() }} + +featured_groupblock.This paragraph will be added to the bottom of the +
+ +{% endblock %} diff --git a/ckanext/example_theme/v07_helper_function/__init__.py b/ckanext/example_theme/v07_helper_function/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v07_helper_function/plugin.py b/ckanext/example_theme/v07_helper_function/plugin.py new file mode 120000 index 00000000000..99eb7cdc156 --- /dev/null +++ b/ckanext/example_theme/v07_helper_function/plugin.py @@ -0,0 +1 @@ +../v06_super/plugin.py \ No newline at end of file diff --git a/ckanext/example_theme/v07_helper_function/templates/home/layout1.html b/ckanext/example_theme/v07_helper_function/templates/home/layout1.html new file mode 100644 index 00000000000..fd5c967a932 --- /dev/null +++ b/ckanext/example_theme/v07_helper_function/templates/home/layout1.html @@ -0,0 +1,5 @@ +{% ckan_extends %} + +{% block featured_group %} + {{ h.recently_changed_packages_activity_stream(limit=4) }} +{% endblock %} diff --git a/ckanext/example_theme/v08_custom_helper_function/__init__.py b/ckanext/example_theme/v08_custom_helper_function/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v08_custom_helper_function/plugin.py b/ckanext/example_theme/v08_custom_helper_function/plugin.py new file mode 100644 index 00000000000..5b3707b23b6 --- /dev/null +++ b/ckanext/example_theme/v08_custom_helper_function/plugin.py @@ -0,0 +1,42 @@ +import ckan.plugins as plugins +import ckan.plugins.toolkit as toolkit + + +def most_popular_groups(): + '''Return a sorted list of the groups with the most datasets.''' + + # Get a list of all the site's groups from CKAN, sorted by number of + # datasets. + groups = toolkit.get_action('group_list')( + data_dict={'sort': 'packages desc', 'all_fields': True}) + + # Truncate the list to the 10 most popular groups only. + groups = groups[:10] + + return groups + + +class ExampleThemePlugin(plugins.SingletonPlugin): + '''An example theme plugin. + + ''' + plugins.implements(plugins.IConfigurer) + + # Declare that this plugin will implement ITemplateHelpers. + plugins.implements(plugins.ITemplateHelpers) + + def update_config(self, config): + + # Add this plugin's templates dir to CKAN's extra_template_paths, so + # that CKAN will use this plugin's custom templates. + toolkit.add_template_directory(config, 'templates') + + def get_helpers(self): + '''Register the most_popular_groups() function above as a template + helper function. + + ''' + # Template helper function names should begin with the name of the + # extension they belong to, to avoid clashing with functions from + # other extensions. + return {'example_theme_most_popular_groups': most_popular_groups} diff --git a/ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html b/ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html new file mode 100644 index 00000000000..591ead7b3f8 --- /dev/null +++ b/ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html @@ -0,0 +1,17 @@ +{% ckan_extends %} + +{% block featured_group %} + {{ h.recently_changed_packages_activity_stream(limit=4) }} +{% endblock %} + +{% block featured_organization %} + + {# Show a list of the site's most popular groups. #} +featured_groupblock.Most popular groups
+-
+ {% for group in h.example_theme_most_popular_groups() %}
+
- {{ group.display_name }} + {% endfor %} +
Most popular groups
+ + {# Call the group_list.html snippet. #} + {% snippet 'group/snippets/group_list.html', + groups=h.example_theme_most_popular_groups() %} + +{% endblock %} diff --git a/ckanext/example_theme/v10_custom_snippet/__init__.py b/ckanext/example_theme/v10_custom_snippet/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v10_custom_snippet/plugin.py b/ckanext/example_theme/v10_custom_snippet/plugin.py new file mode 120000 index 00000000000..ea164c3a9f4 --- /dev/null +++ b/ckanext/example_theme/v10_custom_snippet/plugin.py @@ -0,0 +1 @@ +../v09_snippet/plugin.py \ No newline at end of file diff --git a/ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html b/ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html new file mode 100644 index 00000000000..162690717bc --- /dev/null +++ b/ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html @@ -0,0 +1,10 @@ +{% ckan_extends %} + +{% block featured_group %} + {{ h.recently_changed_packages_activity_stream(limit=4) }} +{% endblock %} + +{% block featured_organization %} + {% snippet 'snippets/example_theme_most_popular_groups.html', + groups=h.example_theme_most_popular_groups() %} +{% endblock %} diff --git a/ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html b/ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html new file mode 100644 index 00000000000..0dbe75a6517 --- /dev/null +++ b/ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html @@ -0,0 +1,29 @@ +{# + +Renders a list of the site's most popular groups. + +groups - the list of groups to render + +#} +Most popular groups
+-
+ {% for group in groups %}
+
-
+
+
{{ group.display_name }}
+ + {% if group.description %} ++ {{ h.markdown_extract(group.description, extract_length=80) }} +
+ {% else %} +{{ _('This group has no description') }}
+ {% endif %} + {% if group.packages %} + {{ ungettext('{num} Dataset', '{num} Datasets', group.packages).format(num=group.packages) }} + {% else %} + {{ _('0 Datasets') }} + {% endif %} +
+ {% endfor %}
+
++{% endblock %} + +{% block featured_organization %} + {% snippet 'snippets/example_theme_most_popular_groups.html' %} +{% endblock %} diff --git a/ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html b/ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html new file mode 100644 index 00000000000..7f4d56ecc63 --- /dev/null +++ b/ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html @@ -0,0 +1,30 @@ +{# Renders a list of the site's most popular groups. #} + ++ +Recent activity
++ {{ h.recently_changed_packages_activity_stream(limit=4) }} +++diff --git a/ckanext/example_theme/v12_extra_public_dir/__init__.py b/ckanext/example_theme/v12_extra_public_dir/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ckanext/example_theme/v12_extra_public_dir/plugin.py b/ckanext/example_theme/v12_extra_public_dir/plugin.py new file mode 100644 index 00000000000..4bb3e36d4dc --- /dev/null +++ b/ckanext/example_theme/v12_extra_public_dir/plugin.py @@ -0,0 +1,46 @@ +import ckan.plugins as plugins +import ckan.plugins.toolkit as toolkit + + +def most_popular_groups(): + '''Return a sorted list of the groups with the most datasets.''' + + # Get a list of all the site's groups from CKAN, sorted by number of + # datasets. + groups = toolkit.get_action('group_list')( + data_dict={'sort': 'packages desc', 'all_fields': True}) + + # Truncate the list to the 10 most popular groups only. + groups = groups[:10] + + return groups + + +class ExampleThemePlugin(plugins.SingletonPlugin): + '''An example theme plugin. + + ''' + plugins.implements(plugins.IConfigurer) + + # Declare that this plugin will implement ITemplateHelpers. + plugins.implements(plugins.ITemplateHelpers) + + def update_config(self, config): + + # Add this plugin's templates dir to CKAN's extra_template_paths, so + # that CKAN will use this plugin's custom templates. + toolkit.add_template_directory(config, 'templates') + + # Add this plugin's public dir to CKAN's extra_public_paths, so + # that CKAN will use this plugin's custom static files. + toolkit.add_public_directory(config, 'public') + + def get_helpers(self): + '''Register the most_popular_groups() function above as a template + helper function. + + ''' + # Template helper function names should begin with the name of the + # extension they belong to, to avoid clashing with functions from + # other extensions. + return {'example_theme_most_popular_groups': most_popular_groups} diff --git a/ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg b/ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg new file mode 100644 index 00000000000..6cb24640e0b Binary files /dev/null and b/ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg differ diff --git a/ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html b/ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html new file mode 120000 index 00000000000..8951cfd33b0 --- /dev/null +++ b/ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html @@ -0,0 +1 @@ +../../../v11_HTML_and_CSS/templates/home/layout1.html \ No newline at end of file diff --git a/ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html b/ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html new file mode 100644 index 00000000000..e45a805d82e --- /dev/null +++ b/ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html @@ -0,0 +1,13 @@ +{% ckan_extends %} + +{% block home_image_caption %} + {{ _("CKAN's data previewing tool has many powerful features") }} +{% endblock %} + +{# Replace the promoted image. #} +{% block home_image_content %} + ++ +Most popular groups
++ -
+ {% for group in h.example_theme_most_popular_groups() %}
+
-
+
+
{{ group.display_name }}
+ + {% if group.description %} ++ {{ h.markdown_extract(group.description, extract_length=80) }} +
+ {% else %} +{{ _('This group has no description') }}
+ {% endif %} + {% if group.packages %} + {{ ungettext('{num} Dataset', '{num} Datasets', group.packages).format(num=group.packages) }} + {% else %} + {{ _('0 Datasets') }} + {% endif %} +
+ {% endfor %}
+
+ 
+
+{% endblock %}
diff --git a/ckanext/example_theme/v12_extra_public_dir/templates/snippets b/ckanext/example_theme/v12_extra_public_dir/templates/snippets
new file mode 120000
index 00000000000..68a4f6d14be
--- /dev/null
+++ b/ckanext/example_theme/v12_extra_public_dir/templates/snippets
@@ -0,0 +1 @@
+../../v11_HTML_and_CSS/templates/snippets
\ No newline at end of file
diff --git a/ckanext/example_theme/v13_custom_css/__init__.py b/ckanext/example_theme/v13_custom_css/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/example_theme/v13_custom_css/plugin.py b/ckanext/example_theme/v13_custom_css/plugin.py
new file mode 120000
index 00000000000..bc2b4e7bc10
--- /dev/null
+++ b/ckanext/example_theme/v13_custom_css/plugin.py
@@ -0,0 +1 @@
+../v12_extra_public_dir/plugin.py
\ No newline at end of file
diff --git a/ckanext/example_theme/v13_custom_css/public/example_theme.css b/ckanext/example_theme/v13_custom_css/public/example_theme.css
new file mode 100644
index 00000000000..1d9ae84f4ee
--- /dev/null
+++ b/ckanext/example_theme/v13_custom_css/public/example_theme.css
@@ -0,0 +1,3 @@
+.account-masthead {
+ background-color: rgb(40, 40, 40);
+}
diff --git a/ckanext/example_theme/v13_custom_css/public/promoted-image.jpg b/ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
new file mode 120000
index 00000000000..085db09655e
--- /dev/null
+++ b/ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
@@ -0,0 +1 @@
+../../v12_extra_public_dir/public/promoted-image.jpg
\ No newline at end of file
diff --git a/ckanext/example_theme/v13_custom_css/templates/base.html b/ckanext/example_theme/v13_custom_css/templates/base.html
new file mode 100644
index 00000000000..10d537abd84
--- /dev/null
+++ b/ckanext/example_theme/v13_custom_css/templates/base.html
@@ -0,0 +1,6 @@
+{% ckan_extends %}
+
+{% block styles %}
+ {{ super() }}
+
+{% endblock %}
diff --git a/ckanext/example_theme/v13_custom_css/templates/home b/ckanext/example_theme/v13_custom_css/templates/home
new file mode 120000
index 00000000000..0082d3e1c87
--- /dev/null
+++ b/ckanext/example_theme/v13_custom_css/templates/home
@@ -0,0 +1 @@
+../../v12_extra_public_dir/templates/home
\ No newline at end of file
diff --git a/ckanext/example_theme/v13_custom_css/templates/snippets b/ckanext/example_theme/v13_custom_css/templates/snippets
new file mode 120000
index 00000000000..c54766741bb
--- /dev/null
+++ b/ckanext/example_theme/v13_custom_css/templates/snippets
@@ -0,0 +1 @@
+../../v12_extra_public_dir/templates/snippets
\ No newline at end of file
diff --git a/ckanext/example_theme/v14_more_custom_css/__init__.py b/ckanext/example_theme/v14_more_custom_css/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/example_theme/v14_more_custom_css/plugin.py b/ckanext/example_theme/v14_more_custom_css/plugin.py
new file mode 120000
index 00000000000..d976b2f7ad1
--- /dev/null
+++ b/ckanext/example_theme/v14_more_custom_css/plugin.py
@@ -0,0 +1 @@
+../v13_custom_css/plugin.py
\ No newline at end of file
diff --git a/ckanext/example_theme/v14_more_custom_css/public/example_theme.css b/ckanext/example_theme/v14_more_custom_css/public/example_theme.css
new file mode 100644
index 00000000000..65e08d70170
--- /dev/null
+++ b/ckanext/example_theme/v14_more_custom_css/public/example_theme.css
@@ -0,0 +1,103 @@
+/* =====================================================
+ The "account masthead" bar across the top of the site
+ ===================================================== */
+
+.account-masthead {
+ background-color: rgb(40, 40, 40);
+}
+/* The "bubble" containing the number of new notifications. */
+.account-masthead .account .notifications a span {
+ background-color: black;
+}
+/* The text and icons in the user account info. */
+.account-masthead .account ul li a {
+ color: rgba(255, 255, 255, 0.6);
+}
+/* The user account info text and icons, when the user's pointer is hovering
+ over them. */
+.account-masthead .account ul li a:hover {
+ color: rgba(255, 255, 255, 0.7);
+ background-color: black;
+}
+
+
+/* ========================================================================
+ The main masthead bar that contains the site logo, nav links, and search
+ ======================================================================== */
+
+.masthead {
+ background-color: #3d3d3d;
+}
+/* The "navigation pills" in the masthead (the links to Datasets,
+ Organizations, etc) when the user's pointer hovers over them. */
+.masthead .navigation .nav-pills li a:hover {
+ background-color: rgb(48, 48, 48);
+ color: white;
+}
+/* The "active" navigation pill (for example, when you're on the /dataset page
+ the "Datasets" link is active). */
+.masthead .navigation .nav-pills li.active a {
+ background-color: rgb(74, 74, 74);
+}
+/* The "box shadow" effect that appears around the search box when it
+ has the keyboard cursor's focus. */
+.masthead input[type="text"]:focus {
+ -webkit-box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+ box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+}
+
+
+/* ===========================================
+ The content in the middle of the front page
+ =========================================== */
+
+/* Remove the "box shadow" effect around various boxes on the page. */
+.box {
+ box-shadow: none;
+}
+/* Remove the borders around the "Welcome to CKAN" and "Search Your Data"
+ boxes. */
+.hero .box {
+ border: none;
+}
+/* Change the colors of the "Search Your Data" box. */
+.homepage .module-search .module-content {
+ color: rgb(68, 68, 68);
+ background-color: white;
+}
+/* Change the background color of the "Popular Tags" box. */
+.homepage .module-search .tags {
+ background-color: rgb(61, 61, 61);
+}
+/* Remove some padding. This makes the bottom edges of the "Welcome to CKAN"
+ and "Search Your Data" boxes line up. */
+.module-content:last-child {
+ padding-bottom: 0px;
+}
+.homepage .module-search {
+ padding: 0px;
+}
+/* Add a border line between the top and bottom halves of the front page. */
+.homepage [role="main"] {
+ border-top: 1px solid rgb(204, 204, 204);
+}
+
+
+/* ====================================
+ The footer at the bottom of the site
+ ==================================== */
+
+.site-footer,
+body {
+ background-color: rgb(40, 40, 40);
+}
+/* The text in the footer. */
+.site-footer,
+.site-footer label,
+.site-footer small {
+ color: rgba(255, 255, 255, 0.6);
+}
+/* The link texts in the footer. */
+.site-footer a {
+ color: rgba(255, 255, 255, 0.6);
+}
diff --git a/ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg b/ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
new file mode 120000
index 00000000000..242bd4b1873
--- /dev/null
+++ b/ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
@@ -0,0 +1 @@
+../../v13_custom_css/public/promoted-image.jpg
\ No newline at end of file
diff --git a/ckanext/example_theme/v14_more_custom_css/templates b/ckanext/example_theme/v14_more_custom_css/templates
new file mode 120000
index 00000000000..5ab3de686dd
--- /dev/null
+++ b/ckanext/example_theme/v14_more_custom_css/templates
@@ -0,0 +1 @@
+../v13_custom_css/templates
\ No newline at end of file
diff --git a/ckanext/example_theme/v15_fanstatic/__init__.py b/ckanext/example_theme/v15_fanstatic/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css b/ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
new file mode 100644
index 00000000000..65e08d70170
--- /dev/null
+++ b/ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
@@ -0,0 +1,103 @@
+/* =====================================================
+ The "account masthead" bar across the top of the site
+ ===================================================== */
+
+.account-masthead {
+ background-color: rgb(40, 40, 40);
+}
+/* The "bubble" containing the number of new notifications. */
+.account-masthead .account .notifications a span {
+ background-color: black;
+}
+/* The text and icons in the user account info. */
+.account-masthead .account ul li a {
+ color: rgba(255, 255, 255, 0.6);
+}
+/* The user account info text and icons, when the user's pointer is hovering
+ over them. */
+.account-masthead .account ul li a:hover {
+ color: rgba(255, 255, 255, 0.7);
+ background-color: black;
+}
+
+
+/* ========================================================================
+ The main masthead bar that contains the site logo, nav links, and search
+ ======================================================================== */
+
+.masthead {
+ background-color: #3d3d3d;
+}
+/* The "navigation pills" in the masthead (the links to Datasets,
+ Organizations, etc) when the user's pointer hovers over them. */
+.masthead .navigation .nav-pills li a:hover {
+ background-color: rgb(48, 48, 48);
+ color: white;
+}
+/* The "active" navigation pill (for example, when you're on the /dataset page
+ the "Datasets" link is active). */
+.masthead .navigation .nav-pills li.active a {
+ background-color: rgb(74, 74, 74);
+}
+/* The "box shadow" effect that appears around the search box when it
+ has the keyboard cursor's focus. */
+.masthead input[type="text"]:focus {
+ -webkit-box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+ box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.7);
+}
+
+
+/* ===========================================
+ The content in the middle of the front page
+ =========================================== */
+
+/* Remove the "box shadow" effect around various boxes on the page. */
+.box {
+ box-shadow: none;
+}
+/* Remove the borders around the "Welcome to CKAN" and "Search Your Data"
+ boxes. */
+.hero .box {
+ border: none;
+}
+/* Change the colors of the "Search Your Data" box. */
+.homepage .module-search .module-content {
+ color: rgb(68, 68, 68);
+ background-color: white;
+}
+/* Change the background color of the "Popular Tags" box. */
+.homepage .module-search .tags {
+ background-color: rgb(61, 61, 61);
+}
+/* Remove some padding. This makes the bottom edges of the "Welcome to CKAN"
+ and "Search Your Data" boxes line up. */
+.module-content:last-child {
+ padding-bottom: 0px;
+}
+.homepage .module-search {
+ padding: 0px;
+}
+/* Add a border line between the top and bottom halves of the front page. */
+.homepage [role="main"] {
+ border-top: 1px solid rgb(204, 204, 204);
+}
+
+
+/* ====================================
+ The footer at the bottom of the site
+ ==================================== */
+
+.site-footer,
+body {
+ background-color: rgb(40, 40, 40);
+}
+/* The text in the footer. */
+.site-footer,
+.site-footer label,
+.site-footer small {
+ color: rgba(255, 255, 255, 0.6);
+}
+/* The link texts in the footer. */
+.site-footer a {
+ color: rgba(255, 255, 255, 0.6);
+}
diff --git a/ckanext/example_theme/v15_fanstatic/plugin.py b/ckanext/example_theme/v15_fanstatic/plugin.py
new file mode 100644
index 00000000000..f1a82d96ac1
--- /dev/null
+++ b/ckanext/example_theme/v15_fanstatic/plugin.py
@@ -0,0 +1,53 @@
+import ckan.plugins as plugins
+import ckan.plugins.toolkit as toolkit
+
+
+def most_popular_groups():
+ '''Return a sorted list of the groups with the most datasets.'''
+
+ # Get a list of all the site's groups from CKAN, sorted by number of
+ # datasets.
+ groups = toolkit.get_action('group_list')(
+ data_dict={'sort': 'packages desc', 'all_fields': True})
+
+ # Truncate the list to the 10 most popular groups only.
+ groups = groups[:10]
+
+ return groups
+
+
+class ExampleThemePlugin(plugins.SingletonPlugin):
+ '''An example theme plugin.
+
+ '''
+ plugins.implements(plugins.IConfigurer)
+
+ # Declare that this plugin will implement ITemplateHelpers.
+ plugins.implements(plugins.ITemplateHelpers)
+
+ def update_config(self, config):
+
+ # Add this plugin's templates dir to CKAN's extra_template_paths, so
+ # that CKAN will use this plugin's custom templates.
+ toolkit.add_template_directory(config, 'templates')
+
+ # Add this plugin's public dir to CKAN's extra_public_paths, so
+ # that CKAN will use this plugin's custom static files.
+ toolkit.add_public_directory(config, 'public')
+
+ # Register this plugin's fanstatic directory with CKAN.
+ # Here, 'fanstatic' is the path to the fanstatic directory
+ # (relative to this plugin.py file), and 'example_theme' is the name
+ # that we'll use to refer to this fanstatic directory from CKAN
+ # templates.
+ toolkit.add_resource('fanstatic', 'example_theme')
+
+ def get_helpers(self):
+ '''Register the most_popular_groups() function above as a template
+ helper function.
+
+ '''
+ # Template helper function names should begin with the name of the
+ # extension they belong to, to avoid clashing with functions from
+ # other extensions.
+ return {'example_theme_most_popular_groups': most_popular_groups}
diff --git a/ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg b/ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
new file mode 120000
index 00000000000..28c5bf28cb0
--- /dev/null
+++ b/ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
@@ -0,0 +1 @@
+../../v14_more_custom_css/public/promoted-image.jpg
\ No newline at end of file
diff --git a/ckanext/example_theme/v15_fanstatic/templates/base.html b/ckanext/example_theme/v15_fanstatic/templates/base.html
new file mode 100644
index 00000000000..b8466ef9d41
--- /dev/null
+++ b/ckanext/example_theme/v15_fanstatic/templates/base.html
@@ -0,0 +1,12 @@
+{% ckan_extends %}
+
+{% block styles %}
+ {{ super() }}
+
+ {# Import example_theme.css using Fanstatic.
+ 'example_theme/' is the name that the example_theme/fanstatic directory
+ was registered with when the toolkit.add_resource() function was called.
+ 'example_theme.css' is the path to the CSS file, relative to the root of
+ the fanstatic directory. #}
+ {% resource 'example_theme/example_theme.css' %}
+{% endblock %}
diff --git a/ckanext/example_theme/v15_fanstatic/templates/home b/ckanext/example_theme/v15_fanstatic/templates/home
new file mode 120000
index 00000000000..ce6d4453982
--- /dev/null
+++ b/ckanext/example_theme/v15_fanstatic/templates/home
@@ -0,0 +1 @@
+../../v14_more_custom_css/templates/home
\ No newline at end of file
diff --git a/ckanext/example_theme/v15_fanstatic/templates/snippets b/ckanext/example_theme/v15_fanstatic/templates/snippets
new file mode 120000
index 00000000000..3a256bb7366
--- /dev/null
+++ b/ckanext/example_theme/v15_fanstatic/templates/snippets
@@ -0,0 +1 @@
+../../v14_more_custom_css/templates/snippets
\ No newline at end of file
diff --git a/ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js b/ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
new file mode 100644
index 00000000000..a3a142210e5
--- /dev/null
+++ b/ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
@@ -0,0 +1,8 @@
+ckan.module('favorite', function (jQuery, _) {
+ return {
+ initialize: function () {
+ console.log("I've been initialized for element: %o", this.el);
+ }
+ };
+});
+
diff --git a/ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py b/ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
new file mode 100644
index 00000000000..803fb73181a
--- /dev/null
+++ b/ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
@@ -0,0 +1,14 @@
+import ckan.plugins as plugins
+import ckan.plugins.toolkit as toolkit
+
+
+class ExampleThemePlugin(plugins.SingletonPlugin):
+ '''An example theme plugin.
+
+ '''
+ plugins.implements(plugins.IConfigurer)
+
+ def update_config(self, config):
+
+ toolkit.add_template_directory(config, 'templates')
+ toolkit.add_resource('fanstatic', 'example_theme')
diff --git a/ckanext/example_theme/v16_initialize_a_javascript_module/public b/ckanext/example_theme/v16_initialize_a_javascript_module/public
new file mode 120000
index 00000000000..f23890633ee
--- /dev/null
+++ b/ckanext/example_theme/v16_initialize_a_javascript_module/public
@@ -0,0 +1 @@
+../v14_more_custom_css/public
\ No newline at end of file
diff --git a/ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html b/ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
new file mode 100644
index 00000000000..4b534a2fe2b
--- /dev/null
+++ b/ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
@@ -0,0 +1,15 @@
+{% ckan_extends %}
+
+
+{% block content %}
+
+ {{ super() }}
+
+ {# Use Fanstatic to include our custom JavaScript module. #}
+ {% resource 'example_theme/favorite.js' %}
+
+
+
+{% endblock %}
diff --git a/ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html b/ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
new file mode 100644
index 00000000000..078659c9165
--- /dev/null
+++ b/ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
@@ -0,0 +1,22 @@
+{% ckan_extends %}
+
+{% block package_item_content %}
+ {{ super() }}
+
+ {# Use Fanstatic to include our custom JavaScript module.
+ A