"+"
| t |
","
"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d| t |
| t |
"+"
| t |
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
-{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c"+"
| t |
","
"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d| t |
","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d| t |
","
"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r| Source: | " + escapeText( source ) + " |
|---|
" + escapeText( document.title ) + "
" + - "" + - "" + - "" + - ""; - } - }, - - // Resets the test setup. Useful for tests that modify the DOM. - reset: function() { - var fixture = id( "qunit-fixture" ); - if ( fixture ) { - fixture.innerHTML = config.fixture; - } - }, - - // Trigger an event on an element. - // @example triggerEvent( document.body, "click" ); - triggerEvent: function( elem, type, event ) { - if ( document.createEvent ) { - event = document.createEvent( "MouseEvents" ); - event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView, - 0, 0, 0, 0, 0, false, false, false, false, 0, null); - - elem.dispatchEvent( event ); - } else if ( elem.fireEvent ) { - elem.fireEvent( "on" + type ); - } - }, - - // Safe object type checking - is: function( type, obj ) { - return QUnit.objectType( obj ) === type; - }, - - objectType: function( obj ) { - if ( typeof obj === "undefined" ) { - return "undefined"; - // consider: typeof null === object - } - if ( obj === null ) { - return "null"; - } - - var match = toString.call( obj ).match(/^\[object\s(.*)\]$/), - type = match && match[1] || ""; - - switch ( type ) { - case "Number": - if ( isNaN(obj) ) { - return "nan"; - } - return "number"; - case "String": - case "Boolean": - case "Array": - case "Date": - case "RegExp": - case "Function": - return type.toLowerCase(); - } - if ( typeof obj === "object" ) { - return "object"; - } - return undefined; - }, - - push: function( result, actual, expected, message ) { - if ( !config.current ) { - throw new Error( "assertion outside test context, was " + sourceFromStacktrace() ); - } - - var output, source, - details = { - module: config.current.module, - name: config.current.testName, - result: result, - message: message, - actual: actual, - expected: expected - }; - - message = escapeText( message ) || ( result ? "okay" : "failed" ); - message = ""; - output = message; - - if ( !result ) { - expected = escapeText( QUnit.jsDump.parse(expected) ); - actual = escapeText( QUnit.jsDump.parse(actual) ); - output += "
| Expected: | " + expected + " |
|---|---|
| Result: | " + actual + " |
| Diff: | " + QUnit.diff( expected, actual ) + " |
| Source: | " + escapeText( source ) + " |
| Result: | " + escapeText( actual ) + " |
|---|---|
| Source: | " + escapeText( source ) + " |
", - "", - passed, - " assertions of ", - config.stats.all, - " passed, ", - config.stats.bad, - " failed." - ].join( "" ); - - if ( banner ) { - banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" ); - } - - if ( tests ) { - id( "qunit-testresult" ).innerHTML = html; - } - - if ( config.altertitle && typeof document !== "undefined" && document.title ) { - // show ✖ for good, ✔ for bad suite result in title - // use escape sequences in case file gets loaded with non-utf-8-charset - document.title = [ - ( config.stats.bad ? "\u2716" : "\u2714" ), - document.title.replace( /^[\u2714\u2716] /i, "" ) - ].join( " " ); - } - - // clear own sessionStorage items if all tests passed - if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) { - // `key` & `i` initialized at top of scope - for ( i = 0; i < sessionStorage.length; i++ ) { - key = sessionStorage.key( i++ ); - if ( key.indexOf( "qunit-test-" ) === 0 ) { - sessionStorage.removeItem( key ); - } - } - } - - // scroll back to top to show results - if ( window.scrollTo ) { - window.scrollTo(0, 0); - } - - runLoggingCallbacks( "done", QUnit, { - failed: config.stats.bad, - passed: passed, - total: config.stats.all, - runtime: runtime - }); -} - -/** @return Boolean: true if this test should be ran */ -function validTest( test ) { - var include, - filter = config.filter && config.filter.toLowerCase(), - module = config.module && config.module.toLowerCase(), - fullName = (test.module + ": " + test.testName).toLowerCase(); - - // Internally-generated tests are always valid - if ( test.callback && test.callback.validTest === validTest ) { - delete test.callback.validTest; - return true; - } - - if ( config.testNumber ) { - return test.testNumber === config.testNumber; - } - - if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) { - return false; - } - - if ( !filter ) { - return true; - } - - include = filter.charAt( 0 ) !== "!"; - if ( !include ) { - filter = filter.slice( 1 ); - } - - // If the filter matches, we need to honour include - if ( fullName.indexOf( filter ) !== -1 ) { - return include; - } - - // Otherwise, do the opposite - return !include; -} - -// so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions) -// Later Safari and IE10 are supposed to support error.stack as well -// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack -function extractStacktrace( e, offset ) { - offset = offset === undefined ? 3 : offset; - - var stack, include, i; - - if ( e.stacktrace ) { - // Opera - return e.stacktrace.split( "\n" )[ offset + 3 ]; - } else if ( e.stack ) { - // Firefox, Chrome - stack = e.stack.split( "\n" ); - if (/^error$/i.test( stack[0] ) ) { - stack.shift(); - } - if ( fileName ) { - include = []; - for ( i = offset; i < stack.length; i++ ) { - if ( stack[ i ].indexOf( fileName ) !== -1 ) { - break; - } - include.push( stack[ i ] ); - } - if ( include.length ) { - return include.join( "\n" ); - } - } - return stack[ offset ]; - } else if ( e.sourceURL ) { - // Safari, PhantomJS - // hopefully one day Safari provides actual stacktraces - // exclude useless self-reference for generated Error objects - if ( /qunit.js$/.test( e.sourceURL ) ) { - return; - } - // for actual exceptions, this is useful - return e.sourceURL + ":" + e.line; - } -} -function sourceFromStacktrace( offset ) { - try { - throw new Error(); - } catch ( e ) { - return extractStacktrace( e, offset ); - } -} - -/** - * Escape text for attribute or text content. - */ -function escapeText( s ) { - if ( !s ) { - return ""; - } - s = s + ""; - // Both single quotes and double quotes (for attributes) - return s.replace( /['"<>&]/g, function( s ) { - switch( s ) { - case '\'': - return '''; - case '"': - return '"'; - case '<': - return '<'; - case '>': - return '>'; - case '&': - return '&'; - } - }); -} - -function synchronize( callback, last ) { - config.queue.push( callback ); - - if ( config.autorun && !config.blocking ) { - process( last ); - } -} - -function process( last ) { - function next() { - process( last ); - } - var start = new Date().getTime(); - config.depth = config.depth ? config.depth + 1 : 1; - - while ( config.queue.length && !config.blocking ) { - if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) { - config.queue.shift()(); - } else { - window.setTimeout( next, 13 ); - break; - } - } - config.depth--; - if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) { - done(); - } -} - -function saveGlobal() { - config.pollution = []; - - if ( config.noglobals ) { - for ( var key in window ) { - // in Opera sometimes DOM element ids show up here, ignore them - if ( !hasOwn.call( window, key ) || /^qunit-test-output/.test( key ) ) { - continue; - } - config.pollution.push( key ); - } - } -} - -function checkPollution() { - var newGlobals, - deletedGlobals, - old = config.pollution; - - saveGlobal(); - - newGlobals = diff( config.pollution, old ); - if ( newGlobals.length > 0 ) { - QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join(", ") ); - } - - deletedGlobals = diff( old, config.pollution ); - if ( deletedGlobals.length > 0 ) { - QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") ); - } -} - -// returns a new Array with the elements that are in a but not in b -function diff( a, b ) { - var i, j, - result = a.slice(); - - for ( i = 0; i < result.length; i++ ) { - for ( j = 0; j < b.length; j++ ) { - if ( result[i] === b[j] ) { - result.splice( i, 1 ); - i--; - break; - } - } - } - return result; -} - -function extend( a, b ) { - for ( var prop in b ) { - if ( b[ prop ] === undefined ) { - delete a[ prop ]; - - // Avoid "Member not found" error in IE8 caused by setting window.constructor - } else if ( prop !== "constructor" || a !== window ) { - a[ prop ] = b[ prop ]; - } - } - - return a; -} - -/** - * @param {HTMLElement} elem - * @param {string} type - * @param {Function} fn - */ -function addEvent( elem, type, fn ) { - // Standards-based browsers - if ( elem.addEventListener ) { - elem.addEventListener( type, fn, false ); - // IE - } else { - elem.attachEvent( "on" + type, fn ); - } -} - -/** - * @param {Array|NodeList} elems - * @param {string} type - * @param {Function} fn - */ -function addEvents( elems, type, fn ) { - var i = elems.length; - while ( i-- ) { - addEvent( elems[i], type, fn ); - } -} - -function hasClass( elem, name ) { - return (" " + elem.className + " ").indexOf(" " + name + " ") > -1; -} - -function addClass( elem, name ) { - if ( !hasClass( elem, name ) ) { - elem.className += (elem.className ? " " : "") + name; - } -} - -function removeClass( elem, name ) { - var set = " " + elem.className + " "; - // Class name may appear multiple times - while ( set.indexOf(" " + name + " ") > -1 ) { - set = set.replace(" " + name + " " , " "); - } - // If possible, trim it for prettiness, but not neccecarily - elem.className = window.jQuery ? jQuery.trim( set ) : ( set.trim ? set.trim() : set ); -} - -function id( name ) { - return !!( typeof document !== "undefined" && document && document.getElementById ) && - document.getElementById( name ); -} - -function registerLoggingCallback( key ) { - return function( callback ) { - config[key].push( callback ); - }; -} - -// Supports deprecated method of completely overwriting logging callbacks -function runLoggingCallbacks( key, scope, args ) { - var i, callbacks; - if ( QUnit.hasOwnProperty( key ) ) { - QUnit[ key ].call(scope, args ); - } else { - callbacks = config[ key ]; - for ( i = 0; i < callbacks.length; i++ ) { - callbacks[ i ].call( scope, args ); - } - } -} - -// Test for equality any JavaScript type. -// Author: Philippe Rathé
" : "\n" : this.HTML ? " " : " "; - }, - // extra can be a number, shortcut for increasing-calling-decreasing - indent: function( extra ) { - if ( !this.multiline ) { - return ""; - } - var chr = this.indentChar; - if ( this.HTML ) { - chr = chr.replace( /\t/g, " " ).replace( / /g, " " ); - } - return new Array( this._depth_ + (extra||0) ).join(chr); - }, - up: function( a ) { - this._depth_ += a || 1; - }, - down: function( a ) { - this._depth_ -= a || 1; - }, - setParser: function( name, parser ) { - this.parsers[name] = parser; - }, - // The next 3 are exposed so you can use them - quote: quote, - literal: literal, - join: join, - // - _depth_: 1, - // This is the list of parsers, to modify them, use jsDump.setParser - parsers: { - window: "[Window]", - document: "[Document]", - error: function(error) { - return "Error(\"" + error.message + "\")"; - }, - unknown: "[Unknown]", - "null": "null", - "undefined": "undefined", - "function": function( fn ) { - var ret = "function", - // functions never have name in IE - name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1]; - - if ( name ) { - ret += " " + name; - } - ret += "( "; - - ret = [ ret, QUnit.jsDump.parse( fn, "functionArgs" ), "){" ].join( "" ); - return join( ret, QUnit.jsDump.parse(fn,"functionCode" ), "}" ); - }, - array: array, - nodelist: array, - "arguments": array, - object: function( map, stack ) { - var ret = [ ], keys, key, val, i; - QUnit.jsDump.up(); - keys = []; - for ( key in map ) { - keys.push( key ); - } - keys.sort(); - for ( i = 0; i < keys.length; i++ ) { - key = keys[ i ]; - val = map[ key ]; - ret.push( QUnit.jsDump.parse( key, "key" ) + ": " + QUnit.jsDump.parse( val, undefined, stack ) ); - } - QUnit.jsDump.down(); - return join( "{", ret, "}" ); - }, - node: function( node ) { - var len, i, val, - open = QUnit.jsDump.HTML ? "<" : "<", - close = QUnit.jsDump.HTML ? ">" : ">", - tag = node.nodeName.toLowerCase(), - ret = open + tag, - attrs = node.attributes; - - if ( attrs ) { - for ( i = 0, len = attrs.length; i < len; i++ ) { - val = attrs[i].nodeValue; - // IE6 includes all attributes in .attributes, even ones not explicitly set. - // Those have values like undefined, null, 0, false, "" or "inherit". - if ( val && val !== "inherit" ) { - ret += " " + attrs[i].nodeName + "=" + QUnit.jsDump.parse( val, "attribute" ); - } - } - } - ret += close; - - // Show content of TextNode or CDATASection - if ( node.nodeType === 3 || node.nodeType === 4 ) { - ret += node.nodeValue; - } - - return ret + open + "/" + tag + close; - }, - // function calls it internally, it's the arguments part of the function - functionArgs: function( fn ) { - var args, - l = fn.length; - - if ( !l ) { - return ""; - } - - args = new Array(l); - while ( l-- ) { - // 97 is 'a' - args[l] = String.fromCharCode(97+l); - } - return " " + args.join( ", " ) + " "; - }, - // object calls it internally, the key part of an item in a map - key: quote, - // function calls it internally, it's the content of the function - functionCode: "[code]", - // node calls it internally, it's an html attribute value - attribute: quote, - string: quote, - date: quote, - regexp: literal, - number: literal, - "boolean": literal - }, - // if true, entities are escaped ( <, >, \t, space and \n ) - HTML: false, - // indentation unit - indentChar: " ", - // if true, items in a collection, are separated by a \n, else just a space. - multiline: true - }; - - return jsDump; -}()); - -// from jquery.js -function inArray( elem, array ) { - if ( array.indexOf ) { - return array.indexOf( elem ); - } - - for ( var i = 0, length = array.length; i < length; i++ ) { - if ( array[ i ] === elem ) { - return i; - } - } - - return -1; -} - -/* - * Javascript Diff Algorithm - * By John Resig (http://ejohn.org/) - * Modified by Chu Alan "sprite" - * - * Released under the MIT license. - * - * More Info: - * http://ejohn.org/projects/javascript-diff-algorithm/ - * - * Usage: QUnit.diff(expected, actual) - * - * QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the quick
' . check_plain($node->title) . '
' . $rendered; + } + } + return $text; +} diff --git a/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.info b/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.info index 40c2501a..3e8602db 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.info +++ b/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.info @@ -7,9 +7,9 @@ dependencies[] = i18n dependencies[] = i18n_menu files[] = entity_translation_i18n_menu.test -; Information added by Drupal.org packaging script on 2015-01-22 -version = "7.x-1.0-beta4" +; Information added by Drupal.org packaging script on 2016-05-07 +version = "7.x-1.0-beta5" core = "7.x" project = "entity_translation" -datestamp = "1421971088" +datestamp = "1462661041" diff --git a/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.module b/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.module index 60203693..572f0e05 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.module +++ b/sites/all/modules/contrib/localisation/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.module @@ -196,8 +196,8 @@ function entity_translation_i18n_menu_form_menu_edit_item_validate($form, &$form $item = $form_state['values']; // Localizable menu items should not be created when a translation set for the - // same path already exists. - if ($item['language'] == LANGUAGE_NONE) { + // same path already exists (exluding special paths starting by <). + if ($item['language'] == LANGUAGE_NONE && strpos($item['link_path'], '<') !== 0) { $count = db_select('menu_links', 'ml') ->condition('ml.link_path', $item['link_path']) ->condition('ml.i18n_tsid', 0, '<>') diff --git a/sites/all/modules/contrib/localisation/entity_translation/entity_translation_upgrade/entity_translation_upgrade.info b/sites/all/modules/contrib/localisation/entity_translation/entity_translation_upgrade/entity_translation_upgrade.info index a228c423..8ed343d8 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/entity_translation_upgrade/entity_translation_upgrade.info +++ b/sites/all/modules/contrib/localisation/entity_translation/entity_translation_upgrade/entity_translation_upgrade.info @@ -4,9 +4,9 @@ package = Multilingual - Entity Translation core = 7.x dependencies[] = entity_translation -; Information added by Drupal.org packaging script on 2015-01-22 -version = "7.x-1.0-beta4" +; Information added by Drupal.org packaging script on 2016-05-07 +version = "7.x-1.0-beta5" core = "7.x" project = "entity_translation" -datestamp = "1421971088" +datestamp = "1462661041" diff --git a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.inc b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.inc index cc0f6f3b..0e24de4e 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.inc +++ b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.inc @@ -441,10 +441,7 @@ class EntityTranslationDefaultHandler implements EntityTranslationHandlerInterfa $query->condition('revision_id', $revisions_ids, 'IN'); } - $results = $query - ->orderBy('entity_id') - ->orderBy('created') - ->execute(); + $results = $query->execute(); foreach ($results as $row) { $id = $row->entity_id; @@ -1615,9 +1612,12 @@ class EntityTranslationDefaultHandler implements EntityTranslationHandlerInterfa /** * Returns the title to be used for the entity form page. + * + * This may contain HTML markup and thus needs to be sanitized, since it will + * be used as page title as-is. */ protected function entityFormTitle() { - return $this->getLabel(); + return check_plain($this->getLabel()); } /** diff --git a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.node.inc b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.node.inc index fee63554..d967ada6 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.node.inc +++ b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.node.inc @@ -92,7 +92,9 @@ class EntityTranslationNodeHandler extends EntityTranslationDefaultHandler { if (!$this->isTranslationForm()) { // Inherit entity authoring information for the original values. - $values['name'] = $form_state['values']['name']; + if (isset($form_state['values']['name'])) { + $values['name'] = $form_state['values']['name']; + } if (!empty($form_state['values']['date'])) { $values['created'] = $form_state['values']['date']; } diff --git a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.taxonomy_term.inc b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.taxonomy_term.inc index 800e1068..0432bc02 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.taxonomy_term.inc +++ b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler.taxonomy_term.inc @@ -15,6 +15,22 @@ class EntityTranslationTaxonomyTermHandler extends EntityTranslationDefaultHandl parent::__construct('taxonomy_term', $entity_info, $entity); } + /** + * @see EntityTranslationDefaultHandler::getLanguage() + */ + public function getLanguage() { + if (isset($this->entity->vid) && module_exists('i18n_taxonomy')) { + $mode = i18n_taxonomy_vocabulary_mode($this->entity->vid); + if ($mode == I18N_MODE_NONE) { + $translations = $this->getTranslations(); + if (!empty($translations->original)) { + return $translations->original; + } + } + } + return parent::getLanguage(); + } + /** * @see EntityTranslationDefaultHandler::entityForm() */ diff --git a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler_factory.inc b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler_factory.inc index bdbcf9be..b3819c2c 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler_factory.inc +++ b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.handler_factory.inc @@ -112,9 +112,10 @@ class EntityTranslationHandlerFactory { */ public function getHandlerId($entity_type, $entity) { if (!isset($entity->entity_translation_handler_id)) { - list($id, $revision_id) = entity_extract_ids($entity_type, $entity); + list($id, $revision_id, $bundle) = entity_extract_ids($entity_type, $entity); $revision_id = isset($revision_id) ? $revision_id : 0; - $entity->entity_translation_handler_id = $entity_type . '-' . (!empty($id) ? 'eid-' . $id . '-' . $revision_id : 'new-' . self::$newId++); + $bundle = isset($bundle) ? $bundle : $entity_type; + $entity->entity_translation_handler_id = $entity_type . '-' . $bundle . '-' . (!empty($id) ? 'eid-' . $id . '-' . $revision_id : 'new-' . self::$newId++); } return $entity->entity_translation_handler_id; } diff --git a/sites/all/modules/contrib/localisation/entity_translation/includes/translation.migrate.inc b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.migrate.inc new file mode 100644 index 00000000..b3853069 --- /dev/null +++ b/sites/all/modules/contrib/localisation/entity_translation/includes/translation.migrate.inc @@ -0,0 +1,86 @@ +registerTypes(array('entity')); + } + + /** + * Handles Entity Translations. + * + * @param stdClass $entity + * @param stdClass $sourceRow + */ + public function prepare($entity, stdClass $row) { + $migration = Migration::currentMigration(); + $entity_type = $migration->getDestination()->getEntityType(); + + // Only continue if the entity type + bundle combination is enabled for + // entity_translation. + if (entity_translation_enabled($entity_type, $entity)) { + // Get the entity_translation handler and load any existing translations. + $handler = entity_translation_get_handler($entity_type, $entity); + $handler->loadTranslations(); + $original_language = $handler->getLanguage(); + + // Get the bundle of the entity. + list(, , $bundle) = entity_extract_ids($entity_type, $entity); + + // We need to get all of the possible translations to create. So we look + // for any translatable fields. + $translatable_fields = array(); + foreach (field_info_instances($entity_type, $bundle) as $instance) { + $field_name = $instance['field_name']; + $field = field_info_field($field_name); + + if ($field['translatable']) { + $translatable_fields[] = $field_name; + } + } + + // In those fields we look for translated values to build out an array + // of languages we need to set translations for. + $translate_languages = array(); + foreach ($translatable_fields as $translatable_field) { + if (!empty($entity->{$translatable_field})) { + $field_languages = array_keys($entity->{$translatable_field}); + foreach ($field_languages as $field_language) { + $translate_languages[$field_language] = $field_language; + } + } + } + + // Remove the LANGUAGE_NONE results. + unset($translate_languages[LANGUAGE_NONE]); + + // Remove the original language. + unset($translate_languages[$original_language]); + + // Anything we're left with is a translation that should be set. + foreach ($translate_languages as $translate_language) { + if (!isset($entity->translations->data[$translate_language])) { + // Add the new translation and store it. + $handler->setTranslation(array( + 'translate' => 0, + 'status' => 1, + 'language' => $translate_language, + 'source' => $original_language, + 'uid' => (empty($entity->uid)) ? 0 : $entity->uid, + 'changed' => (empty($entity->changed)) ? REQUEST_TIME : $entity->changed, + 'created' => (empty($entity->created)) ? REQUEST_TIME : $entity->created, + )); + } + } + } + } +} diff --git a/sites/all/modules/contrib/localisation/entity_translation/tests/entity_translation_test.info b/sites/all/modules/contrib/localisation/entity_translation/tests/entity_translation_test.info index 3ae19cbe..7539437f 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/tests/entity_translation_test.info +++ b/sites/all/modules/contrib/localisation/entity_translation/tests/entity_translation_test.info @@ -6,9 +6,9 @@ hidden = TRUE dependencies[] = entity_translation files[] = entity_translation_test.module -; Information added by Drupal.org packaging script on 2015-01-22 -version = "7.x-1.0-beta4" +; Information added by Drupal.org packaging script on 2016-05-07 +version = "7.x-1.0-beta5" core = "7.x" project = "entity_translation" -datestamp = "1421971088" +datestamp = "1462661041" diff --git a/sites/all/modules/contrib/localisation/entity_translation/views/entity_translation.views.inc b/sites/all/modules/contrib/localisation/entity_translation/views/entity_translation.views.inc index e6b5cf8a..3ff3deec 100644 --- a/sites/all/modules/contrib/localisation/entity_translation/views/entity_translation.views.inc +++ b/sites/all/modules/contrib/localisation/entity_translation/views/entity_translation.views.inc @@ -182,7 +182,7 @@ function entity_translation_views_data() { ); $data['entity_translation']['translation_exists'] = array( 'title' => t('Translation exists'), - 'help' => t('Link to translation overview page.'), + 'help' => t('Determines if a translation exists for a particular translation.'), 'filter' => array( 'handler' => 'entity_translation_handler_filter_translation_exists', ), diff --git a/sites/all/modules/contrib/localisation/i18n/i18n.info b/sites/all/modules/contrib/localisation/i18n/i18n.info index d4f5c430..882e650f 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n.info @@ -8,9 +8,9 @@ files[] = i18n_object.inc files[] = i18n.test configure = admin/config/regional/i18n -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n.test b/sites/all/modules/contrib/localisation/i18n/i18n.test index 491d7ef7..2a82e17a 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n.test +++ b/sites/all/modules/contrib/localisation/i18n/i18n.test @@ -11,7 +11,7 @@ class Drupali18nTestCase extends DrupalWebTestCase { function setUpLanguages($admin_permissions = array()) { // Setup admin user. - $this->admin_user = $this->drupalCreateUser(array_merge(array('bypass node access', 'administer nodes', 'administer languages', 'administer content types', 'administer blocks', 'access administration pages', 'translate interface'), $admin_permissions)); + $this->admin_user = $this->drupalCreateUser(array_merge(array('bypass node access', 'administer nodes', 'administer languages', 'administer content types', 'administer fields', 'administer blocks', 'access administration pages', 'translate interface'), $admin_permissions)); $this->drupalLogin($this->admin_user); @@ -362,6 +362,7 @@ class Drupali18nTestCase extends DrupalWebTestCase { function resetCaches() { drupal_static_reset('locale_url_outbound_alter'); drupal_static_reset('language_list'); + drupal_language_initialize(); } /** diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_block/i18n_block.info b/sites/all/modules/contrib/localisation/i18n/i18n_block/i18n_block.info index 0e599035..725e30c6 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_block/i18n_block.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_block/i18n_block.info @@ -8,9 +8,9 @@ files[] = i18n_block.inc files[] = i18n_block.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_contact/i18n_contact.info b/sites/all/modules/contrib/localisation/i18n/i18n_contact/i18n_contact.info index 7bad71d2..15f84d8d 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_contact/i18n_contact.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_contact/i18n_contact.info @@ -5,9 +5,9 @@ dependencies[] = i18n_string package = Multilingual - Internationalization core = 7.x -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_field/i18n_field.info b/sites/all/modules/contrib/localisation/i18n/i18n_field/i18n_field.info index 552eb392..6554eb18 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_field/i18n_field.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_field/i18n_field.info @@ -6,9 +6,9 @@ package = Multilingual - Internationalization core = 7.x files[] = i18n_field.inc files[] = i18n_field.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_forum/i18n_forum.info b/sites/all/modules/contrib/localisation/i18n/i18n_forum/i18n_forum.info index afd96583..972dff16 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_forum/i18n_forum.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_forum/i18n_forum.info @@ -7,9 +7,9 @@ package = Multilingual - Internationalization core = 7.x files[] = i18n_forum.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.info b/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.info index 7a6821c7..05e7d9cd 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.info @@ -10,9 +10,9 @@ core = 7.x files[] = i18n_menu.inc files[] = i18n_menu.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.module b/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.module index 8bcf6796..fecb6106 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.module +++ b/sites/all/modules/contrib/localisation/i18n/i18n_menu/i18n_menu.module @@ -180,6 +180,7 @@ function i18n_menu_menu_link_alter(&$item) { // We just make sure every link has a valid language property. if (!i18n_object_langcode($item)) { $item['language'] = LANGUAGE_NONE; + $item['i18n_tsid'] = 0; } } @@ -515,9 +516,11 @@ function _i18n_menu_link_description($link, $langcode = NULL) { * Check whether this link is to be processed by i18n_menu and start processing. */ function _i18n_menu_link_process(&$link) { - // Only visible links that have a language property and haven't been processed - // before. We also check that they belong to a menu with language options. - if (empty($link['i18n_menu']) && !empty($link['language']) && !empty($link['access']) && empty($link['hidden']) && i18n_menu_mode($link['menu_name'])) { + // Only links that have a language property and haven't been processed before. + // We also translate links marked as hidden because core breadcrumbs ignore + // that flag and excluding them would basically interfere with core behaviour. + // We also check that they belong to a menu with language options. + if (empty($link['i18n_menu']) && !empty($link['language']) && !empty($link['access']) && i18n_menu_mode($link['menu_name'])) { // Mark so it won't be processed twice. $link['i18n_menu'] = TRUE; // Skip if administering this menu or this menu item. @@ -588,7 +591,7 @@ function _i18n_menu_link_localizable_properties($link) { // If the title callback is 't' and the link title matches the router title // it will be localized by core, not by i18n_menu. if (!$router || - (empty($router['title_callback']) || $router['title_callback'] != 't') || + (empty($router['title_callback']) || ($router['title_callback'] != 't' || !empty($link['customized']))) || (empty($router['title']) || $router['title'] != $link['link_title']) ) { $props[] = 'title'; @@ -597,7 +600,7 @@ function _i18n_menu_link_localizable_properties($link) { if (!empty($link['options']['attributes']['title'])) { // If the description matches the router description, it will be localized // by core. - if (!$router || empty($router['description']) || $router['description'] != $link['options']['attributes']['title']) { + if (!$router || empty($router['description']) || ($router['description'] != $link['options']['attributes']['title']) || !empty($link['customized'])) { $props[] = 'description'; } } diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.info b/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.info index 4522510e..a637f0db 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_node/i18n_node.info @@ -9,9 +9,9 @@ configure = admin/config/regional/i18n/node files[]=i18n_node.test files[]=i18n_node.variable.inc -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_path/i18n_path.info b/sites/all/modules/contrib/localisation/i18n/i18n_path/i18n_path.info index 10f62e7c..30c8c3b9 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_path/i18n_path.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_path/i18n_path.info @@ -6,9 +6,9 @@ core = 7.x files[] = i18n_path.inc files[] = i18n_path.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_redirect/i18n_redirect.info b/sites/all/modules/contrib/localisation/i18n/i18n_redirect/i18n_redirect.info index 6f6ee43d..ad48edb7 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_redirect/i18n_redirect.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_redirect/i18n_redirect.info @@ -4,9 +4,9 @@ dependencies[] = i18n package = Multilingual - Internationalization core = 7.x -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.info b/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.info index 7c47197f..d24b3767 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.info @@ -6,9 +6,9 @@ core = 7.x configure = admin/config/regional/i18n/select files[] = i18n_select.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.module b/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.module index bcba5782..9063fe9d 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.module +++ b/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.module @@ -82,11 +82,11 @@ function i18n_select_mode($type = NULL) { } /** - * Check current path to enable selection + * Check current path to enable selection. * - * This works pretty much like block visibility + * This works pretty much like block visibility. * - * @return boolean + * @return bool * TRUE if content selection should be enabled for this page. */ function i18n_select_page() { @@ -100,8 +100,11 @@ function i18n_select_page() { // with different case. Ex: /Page, /page, /PAGE. $pages = drupal_strtolower($pages); if ($visibility < I18N_SELECT_PAGE_PHP) { - // Convert the Drupal path to lowercase - $path = drupal_strtolower(drupal_get_path_alias($_GET['q'])); + // @see views_ajax() + // @see I18NSelectAdminViewsAjax::testViewsAjaxWithoutSkippingTags() + $path = isset($_REQUEST['view_path']) ? $_REQUEST['view_path'] : $_GET['q']; + // Convert the Drupal path to lowercase. + $path = drupal_strtolower(drupal_get_path_alias($path)); // Compare the lowercase internal and lowercase path alias (if any). $page_match = drupal_match_path($path, $pages); if ($path != $_GET['q']) { @@ -109,8 +112,8 @@ function i18n_select_page() { } // When $visibility has a value of 0 (I18N_SELECT_PAGE_NOTLISTED), // the block is displayed on all pages except those listed in $pages. - // When set to 1 (I18N_SELECT_PAGE_LISTED), it is displayed only on those - // pages listed in $pages. + // When set to 1 (I18N_SELECT_PAGE_LISTED), it is displayed only on + // those pages listed in $pages. $mode = !($visibility xor $page_match); } elseif (module_exists('php')) { @@ -121,7 +124,7 @@ function i18n_select_page() { } } else { - // No pages defined, still respect the setting (unlike blocks) + // No pages defined, still respect the setting (unlike blocks). $mode = $visibility == I18N_SELECT_PAGE_NOTLISTED; } } diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.test b/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.test index b46fb986..5af85431 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.test +++ b/sites/all/modules/contrib/localisation/i18n/i18n_select/i18n_select.test @@ -84,3 +84,87 @@ class i18nSelectTestCase extends Drupali18nTestCase { } } } + +/** + * Test case for AJAX queries on "views/ajax" when view on admin page. + */ +class I18NSelectAdminViewsAjax extends Drupali18nTestCase { + + /** + * {@inheritdoc} + */ + public static function getInfo() { + return array( + 'name' => t('I18N select Admin Views (AJAX)'), + 'group' => 'Internationalization', + 'description' => t('Test AJAX requests to the "views/ajax" when view located on "admin/*" and list of skipping tags is empty.'), + // Skip this test when "admin_views" module does not exists. + 'dependencies' => array('admin_views'), + ); + } + + /** + * {@inheritdoc} + */ + protected function setUp() { + parent::setUp('translation', 'i18n_variable', 'i18n_select', 'admin_views'); + parent::setUpLanguages(array('access content overview')); + parent::setUpContentTranslation(); + } + + /** + * Test AJAX of a view without skipping tags for selection. + * + * @see i18n_select_page() + */ + public function testViewsAjaxWithoutSkippingTags() { + // If this variable will have the "views" value then this test will not + // have sense. For instance, we want apply language selection filter + // for views and remove "views" from "i18n_select_skip_tags" variable. + // In this case all AJAX for views, on administration part of the site, + // will be broken because the "i18n_select_page()" function will work + // with "views/ajax" path instead of, for example, "admin/content". + variable_set('i18n_select_skip_tags', ''); + + // Create one hundred of nodes. + for ($i = 1; $i <= 100; $i++) { + // Create every second node on Spanish language and + // every first - on English. + $node = $this->createNode('page', "Node $i", '', $i % 2 ? $this->default_language : $this->secondary_language); + + // Update "changed" in order to sort the content by updating date. In + // other case all nodes will be with the same date and not arranged in + // order. + db_update('node') + ->fields(array('changed' => strtotime("+ $i minute"))) + ->condition('nid', $node->nid) + ->execute(); + } + + $this->drupalGet('admin/content'); + + // Check that latest node exists at the top. + $this->assertText('Node 100'); + // Check that our page contains fifty nodes (the latest must be 51). + $this->assertNoText('Node 50'); + + // Test $_REQUEST['view_path']. There's no form to submit to, so + // drupalPost() won't work here. This just tests a direct $_POST + // request instead. + $this->curlExec(array( + CURLOPT_URL => $this->getAbsoluteUrl('views/ajax'), + CURLOPT_POST => TRUE, + CURLOPT_POSTFIELDS => http_build_query(array( + 'page' => 1, + 'view_path' => 'admin/content', + 'view_name' => 'admin_views_node', + 'view_display_id' => 'system_1', + )), + )); + + // Check that we are successfully switched to a new page of content. + $this->assertText('Node 50'); + $this->assertNoText('Node 100'); + } + +} diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.info b/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.info index 301a54ec..64ab698e 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.info @@ -10,9 +10,9 @@ files[] = i18n_string.inc files[] = i18n_string.test configure = admin/config/regional/i18n/strings -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.install b/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.install index 100d7c04..30e8cd26 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.install +++ b/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.install @@ -29,7 +29,9 @@ function i18n_string_install() { i18n_string_update_7001(); } // Create new index in {locales_source}, performance improvement in sites with i18n. - db_add_index('locales_source', 'textgroup_context', array('textgroup', 'context')); + if (!db_index_exists('locales_source', 'textgroup_context')) { + db_add_index('locales_source', 'textgroup_context', array('textgroup', array('context', 50))); + } } /** @@ -106,7 +108,7 @@ function i18n_string_schema() { ), 'primary key' => array('lid'), 'indexes' => array( - 'group_context' => array('textgroup', 'context'), + 'group_context' => array('textgroup', array('context', 50)), ), ); return $schema; @@ -238,7 +240,9 @@ function i18n_string_update_7001() { * Create new index in {locales_source}, performance improvement in sites with i18n. */ function i18n_string_update_7002() { - db_add_index('locales_source', 'textgroup_context', array('textgroup', 'context')); + if (!db_index_exists('locales_source', 'textgroup_context')) { + db_add_index('locales_source', 'textgroup_context', array('textgroup', array('context', 50))); + } } @@ -269,4 +273,4 @@ function i18n_string_update_7002() { * Node type * nodetype:type:[type]:[property] -> node:type:[type]:[property] * Property names: title -> title_label - */ \ No newline at end of file + */ diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.test b/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.test index f11c7564..d4563405 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.test +++ b/sites/all/modules/contrib/localisation/i18n/i18n_string/i18n_string.test @@ -53,6 +53,28 @@ class i18nStringTestCase extends Drupali18nTestCase { $this->assertEqual($translation, $translations[$key][$language->language], "The right $language->name ($language->language) translation has been retrieved for $name, $translation"); } } + + // Test that regular strings can be translated. Use 'Built-in interface' as + // filter, and translate first one. + $search = array( + 'language' => 'all', + 'translation' => 'all', + 'group' => 'default', + 'string' => '', + ); + $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter')); + $this->clickLink(t('edit')); + // Just add a random translation. + $translation = $this->randomString(); + $edit = array(); + foreach ($this->getOtherLanguages() as $language) { + $langcode = $language->language; + $edit["translations[$langcode]"] = $translation; + } + $this->drupalPost(NULL, $edit, t('Save translations')); + $this->assertText(t('The string has been saved.'), t('The string has been saved.')); + $this->assertEqual($this->getUrl(), url('admin/config/regional/translate/translate', array('absolute' => TRUE)), t('Correct page redirection.')); + } /** diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_sync/i18n_sync.info b/sites/all/modules/contrib/localisation/i18n/i18n_sync/i18n_sync.info index 2f1cd55e..c6b644b7 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_sync/i18n_sync.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_sync/i18n_sync.info @@ -10,9 +10,9 @@ files[] = i18n_sync.install files[] = i18n_sync.module.inc files[] = i18n_sync.node.inc files[] = i18n_sync.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.info b/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.info index 2412c40e..300b8407 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.info @@ -11,9 +11,9 @@ files[] = i18n_taxonomy.pages.inc files[] = i18n_taxonomy.admin.inc files[] = i18n_taxonomy.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.module b/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.module index 40533489..920e0105 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.module +++ b/sites/all/modules/contrib/localisation/i18n/i18n_taxonomy/i18n_taxonomy.module @@ -213,7 +213,12 @@ function i18n_taxonomy_field_formatter_view($entity_type, $entity, $field, $inst ); } else { - $term = $item['taxonomy_term']; + if (isset($item['taxonomy_term'])) { + $term = $item['taxonomy_term']; + } + else { + $term = taxonomy_term_load($item['tid']); + } $uri = entity_uri('taxonomy_term', $term); $element[$delta] = array( '#type' => 'link', @@ -1020,6 +1025,10 @@ function i18n_taxonomy_localize_terms($terms) { if (!i18n_string_translate_langcode()) { return $terms; } + // $terms is not a valid array or term. + if (empty($terms)) { + return $terms; + } $object_info = i18n_object_info('taxonomy_term'); $list = is_array($terms) ? $terms : array($terms); foreach ($list as $index => $term) { diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_translation/i18n_translation.info b/sites/all/modules/contrib/localisation/i18n/i18n_translation/i18n_translation.info index 190173c5..d09c7add 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_translation/i18n_translation.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_translation/i18n_translation.info @@ -6,9 +6,9 @@ core = 7.x files[] = i18n_translation.inc -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.info b/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.info index 7c6ee3ba..e784248e 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.info @@ -4,9 +4,9 @@ core = 7.x package = Multilingual - Internationalization dependencies[] = i18n_variable -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.module b/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.module index 4d13b3ba..9c61b814 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.module +++ b/sites/all/modules/contrib/localisation/i18n/i18n_user/i18n_user.module @@ -54,7 +54,7 @@ function i18n_user_user_mail_tokens(&$replacements, $data, $options) { */ function i18n_user_user_pass_reset_url($account) { $timestamp = REQUEST_TIME; - return url("user/reset/$account->uid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE, 'language' => i18n_language($account->language))); + return url("user/reset/$account->uid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid), array('absolute' => TRUE, 'language' => i18n_language($account->language))); } /** @@ -65,5 +65,5 @@ function i18n_user_user_pass_reset_url($account) { */ function i18n_user_user_cancel_url($account) { $timestamp = REQUEST_TIME; - return url("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE, 'language' => i18n_language($account->language))); + return url("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid), array('absolute' => TRUE, 'language' => i18n_language($account->language))); } diff --git a/sites/all/modules/contrib/localisation/i18n/i18n_variable/i18n_variable.info b/sites/all/modules/contrib/localisation/i18n/i18n_variable/i18n_variable.info index 6956a25d..3dbcd3c8 100644 --- a/sites/all/modules/contrib/localisation/i18n/i18n_variable/i18n_variable.info +++ b/sites/all/modules/contrib/localisation/i18n/i18n_variable/i18n_variable.info @@ -10,9 +10,9 @@ configure = admin/config/regional/i18n/variable files[] = i18n_variable.class.inc files[] = i18n_variable.test -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/localisation/i18n/tests/i18n_test.info b/sites/all/modules/contrib/localisation/i18n/tests/i18n_test.info index 9ccf441d..2f7a00c4 100644 --- a/sites/all/modules/contrib/localisation/i18n/tests/i18n_test.info +++ b/sites/all/modules/contrib/localisation/i18n/tests/i18n_test.info @@ -7,9 +7,9 @@ package = Testing core = 6.x hidden = TRUE -; Information added by Drupal.org packaging script on 2015-01-26 -version = "7.x-1.12" +; Information added by Drupal.org packaging script on 2016-10-22 +version = "7.x-1.14" core = "7.x" project = "i18n" -datestamp = "1422286982" +datestamp = "1477154943" diff --git a/sites/all/modules/contrib/menu/menu_admin_per_menu/LICENSE.txt b/sites/all/modules/contrib/menu/menu_admin_per_menu/LICENSE.txt index 2c095c8d..d159169d 100644 --- a/sites/all/modules/contrib/menu/menu_admin_per_menu/LICENSE.txt +++ b/sites/all/modules/contrib/menu/menu_admin_per_menu/LICENSE.txt @@ -1,274 +1,339 @@ -GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Version 2, June 1991 + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, -Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute -verbatim copies of this license document, but changing it is not allowed. + Preamble - Preamble + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. -The licenses for most software are designed to take away your freedom to -share and change it. By contrast, the GNU General Public License is -intended to guarantee your freedom to share and change free software--to -make sure the software is free for all its users. This General Public License -applies to most of the Free Software Foundation's software and to any other -program whose authors commit to using it. (Some other Free Software -Foundation software is covered by the GNU Library General Public License -instead.) You can apply it to your programs, too. + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the -freedom to distribute copies of free software (and charge for this service if -you wish), that you receive source code or can get it if you want it, that you -can change the software or use pieces of it in new free programs; and that -you know you can do these things. + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. -To protect your rights, we need to make restrictions that forbid anyone to -deny you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show -them these terms so they know their rights. + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients -to know that what they have is not the original, so that any problems -introduced by others will not reflect on the original authors' reputations. + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will individually -obtain patent licenses, in effect making the program proprietary. To prevent -this, we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. + The precise terms and conditions for copying, distribution and +modification follow. -The precise terms and conditions for copying, distribution and modification -follow. + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND - MODIFICATION + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms -of this General Public License. The "Program", below, refers to any such -program or work, and a "work based on the Program" means either the -Program or any derivative work under copyright law: that is to say, a work -containing the Program or a portion of it, either verbatim or with -modifications and/or translated into another language. (Hereinafter, translation -is included without limitation in the term "modification".) Each licensee is -addressed as "you". +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. -Activities other than copying, distribution and modification are not covered -by this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made -by running the Program). Whether that is true depends on what the Program -does. + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. -1. You may copy and distribute verbatim copies of the Program's source -code as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. -You may charge a fee for the physical act of transferring a copy, and you -may at your option offer warranty protection in exchange for a fee. + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: -2. You may modify your copy or copies of the Program or any portion of it, -thus forming a work based on the Program, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you -also meet all of these conditions: + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. -a) You must cause the modified files to carry prominent notices stating that -you changed the files and the date of any change. + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. -b) You must cause any work that you distribute or publish, that in whole or in -part contains or is derived from the Program or any part thereof, to be -licensed as a whole at no charge to all third parties under the terms of this -License. + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) -c) If the modified program normally reads commands interactively when run, -you must cause it, when started running for such interactive use in the most -ordinary way, to print or display an announcement including an appropriate -copyright notice and a notice that there is no warranty (or else, saying that -you provide a warranty) and that users may redistribute the program under -these conditions, and telling the user how to view a copy of this License. -(Exception: if the Program itself is interactive but does not normally print such -an announcement, your work based on the Program is not required to print -an announcement.) +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be -reasonably considered independent and separate works in themselves, then -this License, and its terms, do not apply to those sections when you distribute -them as separate works. But when you distribute the same sections as part -of a whole which is a work based on the Program, the distribution of the -whole must be on the terms of this License, whose permissions for other -licensees extend to the entire whole, and thus to each and every part -regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to -work written entirely by you; rather, the intent is to exercise the right to -control the distribution of derivative or collective works based on the -Program. +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of a -storage or distribution medium does not bring the other work under the scope -of this License. +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 -and 2 above provided that you also do one of the following: + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: -a) Accompany it with the complete corresponding machine-readable source -code, which must be distributed under the terms of Sections 1 and 2 above -on a medium customarily used for software interchange; or, + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, -b) Accompany it with a written offer, valid for at least three years, to give -any third party, for a charge no more than your cost of physically performing -source distribution, a complete machine-readable copy of the corresponding -source code, to be distributed under the terms of Sections 1 and 2 above on -a medium customarily used for software interchange; or, + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, -c) Accompany it with the information you received as to the offer to distribute -corresponding source code. (This alternative is allowed only for -noncommercial distribution and only if you received the program in object -code or executable form with such an offer, in accord with Subsection b -above.) + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source code -means all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation and -installation of the executable. However, as a special exception, the source -code distributed need not include anything that is normally distributed (in -either source or binary form) with the major components (compiler, kernel, -and so on) of the operating system on which the executable runs, unless that -component itself accompanies the executable. +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. -If distribution of executable or object code is made by offering access to -copy from a designated place, then offering equivalent access to copy the -source code from the same place counts as distribution of the source code, -even though third parties are not compelled to copy the source along with the -object code. +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, -modify, sublicense or distribute the Program is void, and will automatically -terminate your rights under this License. However, parties who have received -copies, or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the -Program or its derivative works. These actions are prohibited by law if you -do not accept this License. Therefore, by modifying or distributing the -Program (or any work based on the Program), you indicate your acceptance -of this License to do so, and all its terms and conditions for copying, -distributing or modifying the Program or works based on it. + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. -6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the original -licensor to copy, distribute or modify the Program subject to these terms and -conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties to this License. + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose -that choice. +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In such -case, this License incorporates the limitation as if written in the body of this -License. + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. -9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to address new -problems or concerns. + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. -Each version is given a distinguishing version number. If the Program specifies -a version number of this License which applies to it and "any later version", -you have the option of following the terms and conditions either of that -version or of any later version published by the Free Software Foundation. If -the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make -exceptions for this. Our decision will be guided by the two goals of -preserving the free status of all derivatives of our free software and of -promoting the sharing and reuse of software generally. + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT -PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL -NECESSARY SERVICING, REPAIR OR CORRECTION. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR -AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR -ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE -LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, -SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OR INABILITY TO USE THE -PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA -OR DATA BEING RENDERED INACCURATE OR LOSSES -SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE -PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN -IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF -THE POSSIBILITY OF SUCH DAMAGES. + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + +with link title "@title"', array( - '!mlid' => $mlid_text, + '!mlid' => $mlid_text, '@title' => $menu_item['link_title'], )); $txt = "
$txt
"; diff --git a/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.info b/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.info index 05e0477c..6eb7d937 100644 --- a/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.info +++ b/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.info @@ -6,9 +6,9 @@ dependencies[] = menu_editor ; xautoload for the crumbs plugin dependencies[] = xautoload -; Information added by drupal.org packaging script on 2013-10-01 -version = "7.x-1.0-beta3+0-dev" +; Information added by Drupal.org packaging script on 2016-11-06 +version = "7.x-1.0-beta4" core = "7.x" project = "menu_editor" -datestamp = "1380586819" +datestamp = "1478399941" diff --git a/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.module b/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.module index e4cfb469..ef3adf3a 100644 --- a/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.module +++ b/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.module @@ -1,6 +1,5 @@ array(2, 4), 'title' => 'Create a node', + /* @see me_node_creation_create_node() */ 'page callback' => 'me_node_creation_create_node', 'page arguments' => array(2, 4), 'file' => 'me_node_creation.create.inc', + /* @see me_node_creation_create_node_access() */ 'access callback' => 'me_node_creation_create_node_access', 'access arguments' => array(2), ); + /* @see menu_editor_menu_link_load() */ $items['mlid/%menu_editor_menu_link/under-construction'] = array( 'title' => 'Under Construction', + /* @see menu_editor_placeholder_title() */ 'title callback' => 'menu_editor_placeholder_title', 'title arguments' => array(1), + /* @see menu_editor_placeholder_page() */ 'page callback' => 'menu_editor_placeholder_page', 'page arguments' => array(1), 'file' => 'me_node_creation.placeholder.inc', @@ -40,11 +45,14 @@ function me_node_creation_menu() { return $items; } - /** * Implements hook_form_alter() + * + * @param array $form + * @param array $form_state + * @param string $form_id */ -function me_node_creation_form_alter(&$form, &$form_state, $form_id) { +function me_node_creation_form_alter(array &$form, array &$form_state, $form_id) { if (empty($form['#node_edit_form']) || empty($form['#node'])) { return; } @@ -53,12 +61,14 @@ function me_node_creation_form_alter(&$form, &$form_state, $form_id) { return; } module_load_include('create.inc', 'me_node_creation'); - return _me_node_creation_form_alter($form, $node); + form_load_include($form_state, 'inc', 'node', 'node.pages'); + _me_node_creation_form_alter($form, $node); } - /** * Implements hook_node_insert() + * + * @param object $node */ function me_node_creation_node_insert($node) { $menu_item = @$node->me_node_creation_menu_item; @@ -77,9 +87,10 @@ function me_node_creation_node_insert($node) { } } - /** * Implements hook_crumbs_plugins() + * + * @param crumbs_InjectedAPI_hookCrumbsPlugins $api */ function me_node_creation_crumbs_plugins($api) { $api->monoPlugin(); @@ -89,12 +100,15 @@ function me_node_creation_crumbs_plugins($api) { // Wildcard loaders // ----------------------------------------------------------------------------- - /** * Wildcard loader for %menu_editor_menu_link * This is similar to menu_link_load(), but we do some loop prevention. * * TODO: Test if the by-reference does not explode in some edge cases. + * + * @param int $mlid + * + * @return bool */ function menu_editor_menu_link_load($mlid) { static $_cache = array(); @@ -124,10 +138,9 @@ function menu_editor_menu_link_load($mlid) { // Title callbacks // ----------------------------------------------------------------------------- - /** * Title callback for mlid/%menu_link/under-construction - * + * * @param array $item * The menu link, as returned by menu_link_load() * @return string @@ -138,30 +151,38 @@ function menu_editor_placeholder_title($item) { return $item['link_title']; } - /** * Title for menu links or tabs. * The page title can be different! - * - * @param $type_arg - * @param $item + * + * @param string $type_arg + * @param array|mixed $item + * + * @return string + * + * @todo This is currently not in use anywhere, and not useful as-is. */ function me_node_creation_title($type_arg, $item) { + // @todo This is a stupid way to get a node type label. foreach (node_type_get_types() as $type_name => $type_object) { - if ($type_name == $type_arg) { + if ($type_name === $type_arg) { + // @todo This should use t() with @placeholder. return "New $type_object->name"; } } - return $type->name; + return t('Create node of unknown type'); } // Access callbacks // ----------------------------------------------------------------------------- - /** * Access callback for node/add/%node_type/mlid/%menu_editor_mlid + * + * @param object|mixed $type + * + * @return bool */ function me_node_creation_create_node_access($type) { if (!is_object($type)) { @@ -175,9 +196,8 @@ function me_node_creation_create_node_access($type) { // Utility // ----------------------------------------------------------------------------- - /** - * @return array + * @return string[] * Array of placeholders */ function me_node_creation_menu_editor_placeholders() { diff --git a/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.placeholder.inc b/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.placeholder.inc index 5bcdc9e8..8793ab33 100644 --- a/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.placeholder.inc +++ b/sites/all/modules/contrib/menu/menu_editor/me_node_creation/me_node_creation.placeholder.inc @@ -1,11 +1,11 @@ 'Menu path autocomplete', 'description' => 'Autocomplete callback for menu path autocomplete', + /* @see me_path_autocomplete() */ 'page callback' => 'me_path_autocomplete', 'access callback' => 'user_access', 'access arguments' => array('access content'), @@ -30,76 +32,142 @@ function me_path_autocomplete_menu() { } /** - * Find nodes and URL aliases based on title. - * @param $string + * Page callback for 'mepac/autocomplete'. + * + * Finds nodes and URL aliases based on title. + * Sets a http header, and prints json output. + * + * @param string $string * Title of element to find. - * @return - * List of elements with path as key. + * + * @see mpac_autocomplete() */ function me_path_autocomplete($string = NULL) { $args = func_get_args(); $string = implode('/', $args); - $string = strtolower($string); - $title = filter_xss_admin($string); - $matches = array(); - // $matches[$string] = $string; + $matches = _me_path_autocomplete_get_matches($string); + + drupal_json_output($matches); +} + +/** + * @param string $string + * + * @return string[] + */ +function _me_path_autocomplete_get_matches($string) { + $string = strtolower($string); + + // @todo Do we need to filter this? + // See https://www.drupal.org/node/2785261 in mpac issue queue. + # $title = filter_xss_admin($string); + + $matches = _me_path_autocomplete_get_matches_for_placeholders($string); + + if ($string === '') { + return $matches; + } + + $like_placeholder = (strlen($string) > 3) ? "%" . db_like($string) . "%" : db_like($string) . "%"; + + $matches += _me_path_autocomplete_get_matches_for_nodes($like_placeholder); + $matches += _me_path_autocomplete_get_matches_for_aliases($like_placeholder); + + return $matches; +} + +/** + * @param string $string + * + * @return string[] + * + * @see _mpac_get_matches_for_nodes() + */ +function _me_path_autocomplete_get_matches_for_placeholders($string) { + + $matches = array(); + /* @see hook_menu_editor_placeholders() */ foreach (module_invoke_all('menu_editor_placeholders') as $placeholder_code => $placeholder_path) { - if (!strlen($string) || count(explode($string, $placeholder_code)) > 1) { + if ($string === '' || false !== strpos($placeholder_code, $string)) { $matches[$placeholder_code] = htmlentities($placeholder_code); } } - - // Get a list of all nodes where the title matches the given string. - if (strlen($string) > 1) { - $like_placeholder = (strlen($string) > 3) ? "%" . db_like($string) . "%" : db_like($string) . "%"; - $nodes = db_select('node', 'n') - ->fields('n') - ->condition('title', $like_placeholder, 'LIKE') - ->range(0, 8) - ->execute(); + return $matches; +} - foreach ($nodes as $node) { - // Add node path and title to list. - if (node_access('view', $node) && $node->status) { - $node_title = check_plain($node->title); - $nid = $node->nid; - $lang = $node->language != LANGUAGE_NONE ? ($node->language . ': ') : ''; - $matches['node/'. $node->nid] = $lang . "$node_title [nid:$nid]"; - } - } - if (module_exists('path')) { - // Get a list of all URL aliases where the destination matches the given - // string. - $aliases = db_select('url_alias') - ->fields('url_alias') - ->condition('alias', $like_placeholder, 'LIKE') - ->range(0, 8) - ->execute(); +/** + * @param string $like_placeholder + * + * @return string[] + * + * @see _mpac_get_matches_for_nodes() + */ +function _me_path_autocomplete_get_matches_for_nodes($like_placeholder) { - foreach ($aliases as $alias) { - // Add alias source and destination to list (and add a special marker to - // the item). - $lang = $alias->language != LANGUAGE_NONE ? ($alias->language . ': ') : ''; - $src = check_plain($alias->source); - $dst = check_plain($alias->alias); - $matches[$alias->source] = $lang . "$dst | $src"; - } + $q = db_select('node', 'n'); + $q->fields('n'); + $q->condition('title', $like_placeholder, 'LIKE'); + $q->range(0, 8); + + $matches = array(); + foreach ($q->execute() as $node) { + // Add node path and title to list. + if (node_access('view', $node) && $node->status) { + $node_title = check_plain($node->title); + $nid = $node->nid; + $lang = $node->language !== LANGUAGE_NONE ? ($node->language . ': ') : ''; + $matches['node/'. $node->nid] = $lang . "$node_title [nid:$nid]"; } } - - drupal_json_output($matches); + + return $matches; +} + +/** + * @param string $like_placeholder + * + * @return string[] + * + * @see _mpac_get_matches_for_aliases() + */ +function _me_path_autocomplete_get_matches_for_aliases($like_placeholder) { + + if (!module_exists('path')) { + return array(); + } + + // Get a list of all URL aliases where the destination matches the given + // string. + $q = db_select('url_alias'); + $q->fields('url_alias'); + $q->condition('alias', $like_placeholder, 'LIKE'); + $q->range(0, 8); + + $matches = array(); + foreach ($q->execute() as $alias) { + // Add alias source and destination to list (and add a special marker to + // the item). + $lang = $alias->language !== LANGUAGE_NONE ? ($alias->language . ': ') : ''; + $src = check_plain($alias->source); + $dst = check_plain($alias->alias); + $matches[$alias->source] = $lang . "$dst | $src"; + } + + return $matches; } /** * Implements hook_form_FORM_ID_alter(). * * Change path field to autocomplete field. + * + * @param array $form + * @param array $form_state */ -function me_path_autocomplete_form_menu_editor_overview_form_alter(&$form, &$form_state) { +function me_path_autocomplete_form_menu_editor_overview_form_alter(array &$form, array &$form_state) { foreach (element_children($form) as $element_key) { $form[$element_key]['link_path']['#autocomplete_path'] = 'mepac/autocomplete'; } } - diff --git a/sites/all/modules/contrib/menu/menu_editor/menu_editor.admin.inc b/sites/all/modules/contrib/menu/menu_editor/menu_editor.admin.inc index c81ff8ae..5f5c8fc4 100644 --- a/sites/all/modules/contrib/menu/menu_editor/menu_editor.admin.inc +++ b/sites/all/modules/contrib/menu/menu_editor/menu_editor.admin.inc @@ -1,14 +1,23 @@ TRUE); $form['#multilingual_menu'] = FALSE; @@ -34,12 +43,12 @@ function menu_editor_overview_form($form, &$form_state, $menu) { $max_root_weight = _menu_editor_overview_tree_form($form, $form_state, $tree); - // default values for all new menu items.. + // default form values for all new menu items.. $default_values = array( 'link_title' => '', 'link_path' => '"; @@ -94,9 +293,12 @@ function theme_login_destination_triggers($variables) { return $output; } +/** + * Render a page type of login destination rule. + */ function theme_login_destination_pages($variables) { $type = $variables['pages_type']; - + if ($type == LOGIN_DESTINATION_REDIRECT_PHP) { return nl2br(check_plain($variables['pages'])); } @@ -120,11 +322,14 @@ function theme_login_destination_pages($variables) { $output .= "~ "; } $output .= $page . "
"; - } + } return $output; } +/** + * Render a roles of login destination rule. + */ function theme_login_destination_roles($variables) { $items = array_values(array_intersect_key(_login_destination_role_options(), $variables['items'])); @@ -139,7 +344,7 @@ function theme_login_destination_roles($variables) { * Category edit page. */ function login_destination_edit_form($form, &$form_state, array $rule = array()) { - // default values + // Default values. $rule += array( 'triggers' => array(), 'roles' => array(), @@ -167,18 +372,28 @@ function login_destination_edit_form($form, &$form_state, array $rule = array()) } else { $options = array( - LOGIN_DESTINATION_STATIC => t('Internal page or external URL'), - ); - $description = t("Specify page by using its path. Example path is %blog for the blog page. %front is the front page. %current is the current page. Precede with http:// for an external URL. Leave empty to redirect to a default page.", array('%blog' => 'blog', '%front' => '
TRUE (experts only)'));
- $description .= ' ' . t('If the PHP option is chosen, enter PHP code between %php. Note that executing incorrect PHP code can break your Drupal site.', array('%php' => ''));
+ $description .= ' ' .
+ t('If the PHP option is chosen, enter PHP code between %php. Note that executing incorrect PHP code can break your Drupal site.', array('%php' => ''));
}
$form['pages_type'] = array(
@@ -249,14 +475,7 @@ function login_destination_edit_form($form, &$form_state, array $rule = array())
'#title' => t('Redirect users with roles'),
'#options' => _login_destination_role_options(),
'#default_value' => $default_role_options,
- '#description' => 'Redirect only the selected role(s). If you select no roles, all users will be redirected.',
- );
-
- $form['weight'] = array(
- '#type' => 'weight',
- '#title' => t('Weight'),
- '#default_value' => $rule['weight'],
- '#description' => t('When evaluating login destination rules, those with lighter (smaller) weights get evaluated before rules with heavier (larger) weights.'),
+ '#description' => t('Redirect only the selected role(s). If you select no roles, all users will be redirected.'),
);
$form['actions'] = array('#type' => 'actions');
@@ -279,6 +498,26 @@ function login_destination_edit_form($form, &$form_state, array $rule = array())
* Validate the contact category edit page form submission.
*/
function login_destination_edit_form_validate($form, &$form_state) {
+ $destination = $form_state['values']['destination'];
+ $destination_type = $form_state['values']['destination_type'];
+
+ // Check user has enter any path.
+ $available_urls = array('+ A new permission called "Administer Login Destination settings" has now been + added.
Previously the access to the Login Destination\'s settings page was + managed by the "Administer Users" permission.
That\'s why all roles with + that old permission have been just automatically given the new dedicated + "Administer Login Destination settings" permission.
If you want to + duoble-check things, you can go to the + Permissions page now.')); + + $roles = user_roles(TRUE, 'administer users'); + foreach ($roles as $rid => $role_name) { + user_role_grant_permissions($rid, array('administer login destination settings')); + } +} diff --git a/sites/all/modules/contrib/users/login_destination/login_destination.module b/sites/all/modules/contrib/users/login_destination/login_destination.module old mode 100755 new mode 100644 index 2ad42624..8757ea38 --- a/sites/all/modules/contrib/users/login_destination/login_destination.module +++ b/sites/all/modules/contrib/users/login_destination/login_destination.module @@ -5,30 +5,46 @@ * Control where users are directed to, once they login */ -// Page constants +// Page constants. define('LOGIN_DESTINATION_REDIRECT_NOTLISTED', 0); define('LOGIN_DESTINATION_REDIRECT_LISTED', 1); define('LOGIN_DESTINATION_REDIRECT_PHP', 2); -// Destination constants +// Destination constants. define('LOGIN_DESTINATION_STATIC', 0); define('LOGIN_DESTINATION_SNIPPET', 1); /** - * Implement hook_help(). + * Implements hook_help(). */ function login_destination_help($path, $arg) { switch ($path) { case 'admin/help#login_destination': $output = ''; $output .= '
' . t('About') . '
'; - $output .= '' . t('The Login Destination module allows you to customize the destination that the user is redirected to after logging in, registering to the site, using a one-time login link or logging out. The destination can be an internal page or an external URL. You may specify certain conditions like pages or user roles and make the destination depend upon them. You may also use a PHP snippets to provide custom conditions and destinations. Note that PHP Filter module has to be enabled and you have to be granted the "Use PHP for settings" permissions to be able to enter PHP code.') . '
'; + $output .= '' . + t('The Login Destination module allows you to customize the destination that the user is redirected to after logging in, registering to the site, using a one-time login link or logging out. The destination can be an internal page or an external URL. You may specify certain conditions like pages or user roles and make the destination depend upon them. You may also use a PHP snippets to provide custom conditions and destinations. Note that PHP Filter module has to be enabled and you have to be granted the "Use PHP for settings" permissions to be able to enter PHP code.') . + '
'; return $output; + case 'admin/config/people/login-destination': - return '' . t('Login destination rules are evaluated each time a user logs in, registers to the site, uses a one-time login link or logs out. Each rule consists of the destination, path conditions and user roles conditions. First matching rule gets executed.') . '
'; + return '' . + t('Login destination rules are evaluated each time a user logs in, registers to the site, uses a one-time login link or logs out. Each rule consists of the destination, path conditions and user roles conditions. First matching rule gets executed.') . + '
'; } } +/** + * Implements hook_permission(). + */ +function login_destination_permission() { + return array( + 'administer login destination settings' => array( + 'title' => t('Administer Login Destination settings'), + ), + ); +} + /** * Implements hook_menu(). */ @@ -36,8 +52,9 @@ function login_destination_menu() { $items['admin/config/people/login-destination'] = array( 'title' => 'Login destinations', 'description' => 'Customize the destination that the user is redirected to after login.', - 'page callback' => 'login_destination_overview', - 'access arguments' => array('administer users'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('login_destination_overview_form'), + 'access arguments' => array('administer login destination settings'), 'file' => 'login_destination.admin.inc', 'weight' => 10, ); @@ -45,7 +62,7 @@ function login_destination_menu() { 'title' => 'Add login destination rule', 'page callback' => 'drupal_get_form', 'page arguments' => array('login_destination_edit_form'), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer login destination settings'), 'type' => MENU_LOCAL_ACTION, 'weight' => 1, 'file' => 'login_destination.admin.inc', @@ -54,14 +71,14 @@ function login_destination_menu() { 'title' => 'Edit login destination rule', 'page callback' => 'drupal_get_form', 'page arguments' => array('login_destination_edit_form', 5), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer login destination settings'), 'file' => 'login_destination.admin.inc', ); $items['admin/config/people/login-destination/delete/%login_destination'] = array( 'title' => 'Delete login destination rule', 'page callback' => 'drupal_get_form', 'page arguments' => array('login_destination_delete_form', 5), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer login destination settings'), 'file' => 'login_destination.admin.inc', ); $items['admin/config/people/login-destination/list'] = array( @@ -74,7 +91,7 @@ function login_destination_menu() { 'description' => 'Change Login Destination settings.', 'page callback' => 'drupal_get_form', 'page arguments' => array('login_destination_settings'), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer login destination settings'), 'type' => MENU_LOCAL_TASK, 'file' => 'login_destination.admin.inc', 'weight' => 10, @@ -102,12 +119,12 @@ function login_destination_load($id) { if (empty($result['roles'])) { $result['roles'] = array(); } - + return $result; } /** - * Implements hook_theme + * Implements hook_theme(). */ function login_destination_theme() { return array( @@ -127,22 +144,26 @@ function login_destination_theme() { 'variables' => array('items' => NULL), 'file' => 'login_destination.admin.inc', ), + 'login_destination_overview_form' => array( + 'file' => 'login_destination.admin.inc', + 'render element' => 'form', + ), ); } /** - * Implements hook_form_alter + * Implements hook_form_alter(). */ function login_destination_form_alter(&$form, &$form_state, $form_id) { // We redirect by using the drupal_goto_alter hook. If we simply - // call drupal_goto() it may break compability with other modules. If we set + // call drupal_goto() it may break compatibility with other modules. If we set // the $_GET['destination'] variable we will loose the possibility to redirect // to an external URL. // Please note the the system_goto_action() calls drupal_goto() // More on this issue http://drupal.org/node/732542. - // If we add the $form_state['redirect'] here it will be overriden by the + // If we add the $form_state['redirect'] here it will be overridden by the // user_login_submit(). So we add a submit handler instead and will set the // redirect later. Our submit handler will be executed after the execution // of user_login_submit(). This is because form_submit() functions are @@ -152,14 +173,16 @@ function login_destination_form_alter(&$form, &$form_state, $form_id) { // original submit function from user module. switch ($form_id) { - case 'user_register_form': // user register page - case 'user_login': // user login page + // User register page and user login page. + case 'user_register_form': + case 'user_login': $form['#validate'][] = 'login_destination_validate'; break; } switch ($form_id) { - case 'user_profile_form': // one-time login, password reset + // One-time login, password reset. + case 'user_profile_form': if (isset($_GET['pass-reset-token'])) { // Redirect only from user_pass_reset // You have to explicitally turn on the option to always redirect from @@ -181,20 +204,20 @@ function login_destination_validate($form, &$form_state) { $_GET['q'] = 'user/register'; } break; + case 'user_login': if (drupal_match_path($_GET['q'], 'user/register')) { $_GET['q'] = 'user'; } break; } - + // Fix the current page in case of 403 page. if ($form['#form_id'] == 'user_login') { - if(drupal_get_http_header('Status') == '403 Forbidden') { + if (drupal_get_http_header('Status') == '403 Forbidden') { $_GET['current'] = $_GET['destination']; } } - } /** @@ -205,7 +228,7 @@ function login_destination_submit($form, &$form_state) { } /** - * Implements hook_menu_link_alter + * Implements hook_menu_link_alter(). */ function login_destination_menu_link_alter(&$item) { // Flag a link to be altered by hook_translated_menu_link_alter(). @@ -218,24 +241,29 @@ function login_destination_menu_link_alter(&$item) { } /** - * Implements hook_translated_menu_link_alter + * Implements hook_translated_menu_link_alter(). */ function login_destination_translated_menu_link_alter(&$item, $map) { - global $user; $paths = array('user/login', 'user'); // Append the current path to URL. - if ($item['link_path'] == 'user/logout' || (in_array($item['link_path'], $paths) && user_is_anonymous())) { - $item['localized_options']['query'] = array('current' => $_GET['q']); + if ($item['link_path'] == 'user/logout' || + (in_array($item['link_path'], $paths) && user_is_anonymous()) + ) { + $current = $_GET['q']; + if ($current == '',
@@ -97,6 +52,4 @@ class views_handler_field_contextual_links extends views_handler_field {
return '';
}
}
-
- function query() { }
}
diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_field_ctools_dropdown.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_field_ctools_dropdown.inc
new file mode 100644
index 00000000..8964f88d
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/handlers/views_handler_field_ctools_dropdown.inc
@@ -0,0 +1,55 @@
+ TRUE, 'bool' => TRUE);
+
+ return $options;
+ }
+
+ function options_form(&$form, &$form_state) {
+ parent::options_form($form, $form_state);
+ $form['fields']['#description'] = t('Fields to be included as ctools dropdown button.');
+ $form['destination']['#description'] = t('Include a "destination" parameter in the link to return the user to the original view upon completing a link action.');
+
+ $form['views_admin_css'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Include Views admin CSS'),
+ '#description' => t("Add additional css to match the style of the Views admin screen."),
+ '#default_value' => $this->options['views_admin_css'],
+ );
+ }
+
+ /**
+ * Render the dropdown button.
+ */
+ function render($values) {
+ static $added_admin_css;
+ $links = $this->get_links();
+
+ if (!empty($links)) {
+ if (!empty($this->options['views_admin_css']) && !$added_admin_css) {
+ views_include('admin');
+ views_ui_add_admin_css();
+ $added_admin_css = TRUE;
+ }
+
+ return theme('links__ctools_dropbutton', array('links' => $links, 'attributes' => array('class' => array('links', 'inline'))));
+ }
+ else {
+ return '';
+ }
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_field_links.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_field_links.inc
new file mode 100644
index 00000000..15f64607
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/handlers/views_handler_field_links.inc
@@ -0,0 +1,155 @@
+ array());
+ $options['check_access'] = array('default' => FALSE);
+ $options['destination'] = array('default' => TRUE, 'bool' => TRUE);
+
+ return $options;
+ }
+
+ /**
+ * Overrides views_handler_field::options_form().
+ */
+ function options_form(&$form, &$form_state) {
+ parent::options_form($form, $form_state);
+
+ $all_fields = $this->view->display_handler->get_field_labels();
+ // Offer to include only those fields that follow this one.
+ $field_options = array_slice($all_fields, 0, array_search($this->options['id'], array_keys($all_fields)));
+ $form['fields'] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Fields'),
+ '#description' => t('Fields to be included as links.'),
+ '#options' => $field_options,
+ '#default_value' => $this->options['fields'],
+ '#required' => TRUE,
+ );
+
+ $form['check_access'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Evaluate router path for access'),
+ '#default_value' => $this->options['check_access'],
+ '#description' => t('Will check if the path exists and is accessible for the current user. Might be useful, might be slow.'),
+ );
+
+ $form['destination'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Include destination'),
+ '#description' => t('Include a "destination" parameter in the link to return the user to the original view upon completing the link action.'),
+ '#default_value' => $this->options['destination'],
+ );
+ }
+
+ /**
+ * Overrides views_handler_field::options_form().
+ */
+ function options_submit(&$form, &$form_state) {
+ // Remove unselected options.
+ $form_state['values']['options']['fields'] = array_filter($form_state['values']['options']['fields']);
+ }
+
+ /**
+ * Return the list of links of this field.
+ *
+ * @return array
+ * The links which are used by the render function.
+ */
+ function get_links() {
+ $links = array();
+ foreach ($this->options['fields'] as $field) {
+ if (empty($this->view->field[$field]->last_render_text)) {
+ continue;
+ }
+
+ $title = $this->view->field[$field]->last_render_text;
+ // Use the alter settings for the link field source not this links field.
+ $alter = $this->view->field[$field]->options['alter'];
+ $url = array('query' => array());
+
+ // Copy code from views_handler_field::render_as_link().
+ $path = $alter['path'];
+ if (!empty($path) && $path != '') {
+ // Leave path alone on as strip_tags() would remove this.
+ // Replace tokens and strip any HTML tags in the path.
+ $tokens = $this->get_render_tokens(array());
+ $path = strip_tags(decode_entities(strtr($path, $tokens)));
+
+ if (!empty($alter['path_case']) && $alter['path_case'] != 'none') {
+ $path = $this->case_transform($path, $alter['path_case']);
+ }
+
+ if (!empty($alter['replace_spaces'])) {
+ $path = str_replace(' ', '-', $path);
+ }
+
+ $url = drupal_parse_url($path);
+ if (empty($url)) {
+ // Seriously malformed URLs may return FALSE or empty arrays.
+ continue;
+ }
+ $path = $url['path'];
+
+ // Check router menu item access for the current user.
+ if ($this->options['check_access']) {
+ $menu_item = menu_get_item($path);
+ if (!$menu_item || empty($menu_item['access'])) {
+ continue;
+ }
+ }
+
+ if (!empty($this->options['destination']) && empty($alter['external'])) {
+ // Override any destination argument included in URL.
+ $url['query'] = array_merge($url['query'], drupal_get_destination());
+ }
+
+ // Omit tweaks of query, fragment, and link_class.
+
+ $alt = strtr($alter['alt'], $tokens);
+ if ($alt && $alt != $title) {
+ // Set the title attribute only if it improves accessibility.
+ $url['attributes']['title'] = decode_entities($alt);
+ }
+
+ if (!empty($alter['rel']) && $rel = strtr($alter['rel'], $tokens)) {
+ $url['attributes']['rel'] = $rel;
+ }
+
+ $target = check_plain(trim(strtr($alter['target'], $tokens)));
+ if (!empty($target)) {
+ $url['attributes']['target'] = $target;
+ }
+ }
+
+ $links[$field] = array(
+ 'href' => $path,
+ 'title' => $title,
+ ) + $url;
+ }
+
+ return $links;
+ }
+
+ /**
+ * Overrides views_handler_field::query().
+ */
+ function query() { }
+
+}
diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_field_math.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_field_math.inc
index 08fba060..50a948ae 100644
--- a/sites/all/modules/contrib/views/views/handlers/views_handler_field_math.inc
+++ b/sites/all/modules/contrib/views/views/handlers/views_handler_field_math.inc
@@ -26,7 +26,7 @@ class views_handler_field_math extends views_handler_field_numeric {
$form['expression'] = array(
'#type' => 'textarea',
'#title' => t('Expression'),
- '#description' => t('Enter mathematical expressions such as 2 + 2 or sqrt(5). You may assign variables and create mathematical functions and evaluate them. Use the ; to separate these. For example: f(x) = x + 2; f(2).'),
+ '#description' => t("Enter mathematical expressions such as 2 + 2 or sqrt(5). You may assign variables and create mathematical functions and evaluate them. Use the ; to separate these. For example: f(x) = x + 2; f(2). The result of the previous row's mathematical expression can be accessed by using the [expression] token itself."),
'#default_value' => $this->options['expression'],
);
diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_field_numeric.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_field_numeric.inc
index d10d3d0b..843f4c95 100644
--- a/sites/all/modules/contrib/views/views/handlers/views_handler_field_numeric.inc
+++ b/sites/all/modules/contrib/views/views/handlers/views_handler_field_numeric.inc
@@ -107,6 +107,12 @@ class views_handler_field_numeric extends views_handler_field {
function render($values) {
$value = $this->get_value($values);
+
+ // Hiding should happen before rounding or adding prefix/suffix.
+ if ($this->options['hide_empty'] && empty($value) && ($value !== 0 || $this->options['empty_zero'])) {
+ return '';
+ }
+
if (!empty($this->options['set_precision'])) {
$value = number_format($value, $this->options['precision'], $this->options['decimal'], $this->options['separator']);
}
@@ -120,11 +126,6 @@ class views_handler_field_numeric extends views_handler_field {
}
}
- // Check to see if hiding should happen before adding prefix and suffix.
- if ($this->options['hide_empty'] && empty($value) && ($value !== 0 || $this->options['empty_zero'])) {
- return '';
- }
-
// Should we format as a plural.
if (!empty($this->options['format_plural'])) {
$value = format_plural($value, $this->options['format_plural_singular'], $this->options['format_plural_plural']);
diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_filter_combine.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_filter_combine.inc
index 915924b8..c1afcf5c 100644
--- a/sites/all/modules/contrib/views/views/handlers/views_handler_filter_combine.inc
+++ b/sites/all/modules/contrib/views/views/handlers/views_handler_filter_combine.inc
@@ -54,6 +54,11 @@ class views_handler_filter_combine extends views_handler_filter_string {
$fields = array();
// Only add the fields if they have a proper field and table alias.
foreach ($this->options['fields'] as $id) {
+ // Field access checks may have removed this handler.
+ if (!isset($this->view->field[$id])) {
+ continue;
+ }
+
$field = $this->view->field[$id];
// Always add the table of the selected fields to be sure a table alias
// exists.
diff --git a/sites/all/modules/contrib/views/views/handlers/views_handler_filter_date.inc b/sites/all/modules/contrib/views/views/handlers/views_handler_filter_date.inc
index 4ef61b47..38313274 100644
--- a/sites/all/modules/contrib/views/views/handlers/views_handler_filter_date.inc
+++ b/sites/all/modules/contrib/views/views/handlers/views_handler_filter_date.inc
@@ -158,13 +158,11 @@ class views_handler_filter_date extends views_handler_filter_numeric {
}
function op_between($field) {
- $a = intval(strtotime($this->value['min'], 0));
- $b = intval(strtotime($this->value['max'], 0));
+ // Use the substitutions to ensure a consistent timestamp.
+ $query_substitutions = views_views_query_substitutions($this->view);
+ $a = intval(strtotime($this->value['min'], $query_substitutions['***CURRENT_TIME***']));
+ $b = intval(strtotime($this->value['max'], $query_substitutions['***CURRENT_TIME***']));
- if ($this->value['type'] == 'offset') {
- $a = '***CURRENT_TIME***' . sprintf('%+d', $a); // keep sign
- $b = '***CURRENT_TIME***' . sprintf('%+d', $b); // keep sign
- }
// This is safe because we are manually scrubbing the values.
// It is necessary to do it this way because $a and $b are formulas when using an offset.
$operator = strtoupper($this->operator);
@@ -172,10 +170,10 @@ class views_handler_filter_date extends views_handler_filter_numeric {
}
function op_simple($field) {
- $value = intval(strtotime($this->value['value'], 0));
- if (!empty($this->value['type']) && $this->value['type'] == 'offset') {
- $value = '***CURRENT_TIME***' . sprintf('%+d', $value); // keep sign
- }
+ // Use the substitutions to ensure a consistent timestamp.
+ $query_substitutions = views_views_query_substitutions($this->view);
+ $value = intval(strtotime($this->value['value'], $query_substitutions['***CURRENT_TIME***']));
+
// This is safe because we are manually scrubbing the value.
// It is necessary to do it this way because $value is a formula when using an offset.
$this->query->add_where_expression($this->options['group'], "$field $this->operator $value");
diff --git a/sites/all/modules/contrib/views/views/includes/admin.inc b/sites/all/modules/contrib/views/views/includes/admin.inc
index 1643b34f..237a05d5 100644
--- a/sites/all/modules/contrib/views/views/includes/admin.inc
+++ b/sites/all/modules/contrib/views/views/includes/admin.inc
@@ -4961,6 +4961,13 @@ function views_ui_admin_settings_advanced() {
'#description' => t('Select a translation method to use for Views data like header, footer, and empty text.'),
);
+ $form['locale']['views_localize_all'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use same translation method for exported views'),
+ '#description' => t('Exported views will use Core translation by default. Enable this to always use the configured translation method.'),
+ '#default_value' => variable_get('views_localize_all', FALSE),
+ );
+
$regions = array();
$regions['watchdog'] = t('Watchdog');
if (module_exists('devel')) {
diff --git a/sites/all/modules/contrib/views/views/includes/ajax.inc b/sites/all/modules/contrib/views/views/includes/ajax.inc
index cd633605..bef3c05d 100644
--- a/sites/all/modules/contrib/views/views/includes/ajax.inc
+++ b/sites/all/modules/contrib/views/views/includes/ajax.inc
@@ -48,12 +48,12 @@ function views_ajax() {
// Add all $_POST data, because AJAX is always a post and many things,
// such as tablesorts, exposed filters and paging assume $_GET.
- $_GET = $_POST + $_GET;
+ $_GET = $_POST + drupal_get_query_parameters($_GET, array('page'));
// Overwrite the destination.
// @see drupal_get_destination()
$origin_destination = $path;
- $query = drupal_http_build_query($_REQUEST);
+ $query = drupal_http_build_query(drupal_get_query_parameters());
if ($query != '') {
$origin_destination .= '?' . $query;
}
diff --git a/sites/all/modules/contrib/views/views/includes/cache.inc b/sites/all/modules/contrib/views/views/includes/cache.inc
index b74752f1..b836db41 100644
--- a/sites/all/modules/contrib/views/views/includes/cache.inc
+++ b/sites/all/modules/contrib/views/views/includes/cache.inc
@@ -67,12 +67,11 @@ function _views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
}
else {
if (!$fully_loaded) {
- $data = views_cache_get('views_data', TRUE);
- if (!empty($data->data)) {
+ if ($data = views_cache_get('views_data', TRUE)) {
$cache = $data->data;
}
-
- if (empty($cache)) {
+ else {
+ // No cache entry, rebuild.
$cache = _views_fetch_data_build();
}
$fully_loaded = TRUE;
@@ -127,12 +126,25 @@ function _views_data_process_entity_types(&$data) {
function _views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE) {
static $cache = NULL;
if (!isset($cache) || $reset) {
- $start = microtime(TRUE);
- views_include('plugins');
- views_include_handlers();
-
- $cache = views_discover_plugins();
-
+ // Load necessary code once.
+ if (!isset($cache)) {
+ views_include('plugins');
+ views_include_handlers();
+ }
+ // Because plugin data contains translated strings, and as such can be
+ // expensive to build, the results are cached per language.
+ global $language;
+ $cache_key = 'views:plugin_data:' . $language->language;
+ if (!$reset) {
+ if ($cache = cache_get($cache_key)) {
+ $cache = $cache->data;
+ }
+ }
+ // If not available in the cache, build it and cache it.
+ if (!$cache || $reset) {
+ $cache = views_discover_plugins();
+ cache_set($cache_key, $cache);
+ }
}
if (!$type && !$plugin) {
diff --git a/sites/all/modules/contrib/views/views/includes/handlers.inc b/sites/all/modules/contrib/views/views/includes/handlers.inc
index 43461331..6c1e8879 100644
--- a/sites/all/modules/contrib/views/views/includes/handlers.inc
+++ b/sites/all/modules/contrib/views/views/includes/handlers.inc
@@ -758,7 +758,7 @@ class views_many_to_one_helper {
*/
public $placeholders = array();
- function views_many_to_one_helper(&$handler) {
+ function __construct(&$handler) {
$this->handler = &$handler;
}
@@ -1547,7 +1547,6 @@ class views_join {
if (is_array($this->extra)) {
$extras = array();
foreach ($this->extra as $info) {
- $extra = '';
// Figure out the table name. Remember, only use aliases provided
// if at all possible.
$join_table = '';
@@ -1565,36 +1564,63 @@ class views_join {
}
}
- // Convert a single-valued array of values to the single-value case,
- // and transform from IN() notation to = notation
- if (is_array($info['value']) && count($info['value']) == 1) {
- if (empty($info['operator'])) {
- $operator = '=';
+ // If left_field is set use it for a field-to-field condition.
+ if (!empty($info['left_field'])) {
+ $operator = !empty($info['operator']) ? $info['operator'] : '=';
+ $left_table = (isset($info['left_table'])) ? $info['left_table'] : $left['alias'];
+ $extras[] = "$join_table$info[field] $operator $left_table.$info[left_field]";
+ }
+ // Else if formula is set, us it for a flexible on clause.
+ elseif (!empty($info['formula'])) {
+ // If a field is given, we build a "$field $op $formula".
+ // Without it would only be "$formula".
+ $extra = '';
+ if (isset($info['field'])) {
+ // With a single value, the '=' operator is implicit.
+ $operator = !empty($info['operator']) ? $info['operator'] : '=';
+ $extra .= "$join_table$info[field] $operator ";
+ }
+ $extra .= $info['formula'];
+ // Add placeholder arguments.
+ if (isset($info['formula_arguments']) && is_array($info['formula_arguments'])) {
+ $arguments = array_merge($arguments, $info['formula_arguments']);
+ }
+ $extras[] = $extra;
+ }
+ // Otherwise - and if we have a value - use it for a field-to-value condition.
+ elseif (!empty($info['value'])) {
+ // Convert a single-valued array of values to the single-value case,
+ // and transform from IN() notation to = notation
+ if (is_array($info['value']) && count($info['value']) == 1) {
+ if (empty($info['operator'])) {
+ $operator = '=';
+ }
+ else {
+ $operator = $info['operator'] == 'NOT IN' ? '!=' : '=';
+ }
+ $info['value'] = array_shift($info['value']);
+ }
+
+ if (is_array($info['value'])) {
+ // With an array of values, we need multiple placeholders and the
+ // 'IN' operator is implicit.
+ foreach ($info['value'] as $value) {
+ $placeholder_i = ':views_join_condition_' . $select_query->nextPlaceholder();
+ $arguments[$placeholder_i] = $value;
+ }
+
+ $operator = !empty($info['operator']) ? $info['operator'] : 'IN';
+ $placeholder = '( ' . implode(', ', array_keys($arguments)) . ' )';
}
else {
- $operator = $info['operator'] == 'NOT IN' ? '!=' : '=';
- }
- $info['value'] = array_shift($info['value']);
- }
-
- if (is_array($info['value'])) {
- // With an array of values, we need multiple placeholders and the
- // 'IN' operator is implicit.
- foreach ($info['value'] as $value) {
- $placeholder_i = $view_query->placeholder('views_join_condition_');
- $arguments[$placeholder_i] = $value;
+ // With a single value, the '=' operator is implicit.
+ $operator = !empty($info['operator']) ? $info['operator'] : '=';
+ $placeholder = ':views_join_condition_' . $select_query->nextPlaceholder();
+ $arguments[$placeholder] = $info['value'];
}
- $operator = !empty($info['operator']) ? $info['operator'] : 'IN';
- $placeholder = '( ' . implode(', ', array_keys($arguments)) . ' )';
+ $extras[] = "$join_table$info[field] $operator $placeholder";
}
- else {
- // With a single value, the '=' operator is implicit.
- $operator = !empty($info['operator']) ? $info['operator'] : '=';
- $placeholder = $view_query->placeholder('views_join_condition_');
- $arguments[$placeholder] = $info['value'];
- }
- $extras[] = "$join_table$info[field] $operator $placeholder";
}
if ($extras) {
@@ -1660,7 +1686,6 @@ class views_join_subquery extends views_join {
if (is_array($this->extra)) {
$extras = array();
foreach ($this->extra as $info) {
- $extra = '';
// Figure out the table name. Remember, only use aliases provided
// if at all possible.
$join_table = '';
diff --git a/sites/all/modules/contrib/views/views/includes/plugins.inc b/sites/all/modules/contrib/views/views/includes/plugins.inc
index bf095732..4b689825 100644
--- a/sites/all/modules/contrib/views/views/includes/plugins.inc
+++ b/sites/all/modules/contrib/views/views/includes/plugins.inc
@@ -408,7 +408,7 @@ function views_views_plugins() {
*/
function views_discover_plugins() {
$cache = array('display' => array(), 'style' => array(), 'row' => array(), 'argument default' => array(), 'argument validator' => array(), 'access' => array(), 'cache' => array(), 'exposed_form' => array());
- // Get plugins from all mdoules.
+ // Get plugins from all modules.
foreach (module_implements('views_plugins') as $module) {
$function = $module . '_views_plugins';
$result = $function();
@@ -526,6 +526,9 @@ class views_plugin extends views_object {
* Provide a full list of possible theme templates used by this style.
*/
function theme_functions() {
+ if (empty($this->definition['theme'])) {
+ $this->definition['theme'] = 'views_view';
+ }
return views_theme_functions($this->definition['theme'], $this->view, $this->display);
}
diff --git a/sites/all/modules/contrib/views/views/includes/view.inc b/sites/all/modules/contrib/views/views/includes/view.inc
index d082a0b6..d9fb43fd 100644
--- a/sites/all/modules/contrib/views/views/includes/view.inc
+++ b/sites/all/modules/contrib/views/views/includes/view.inc
@@ -812,8 +812,6 @@ class view extends views_db_object {
if (isset($arg)) {
$this->args[$position] = $arg;
}
- // remember that this argument was computed, not passed on the URL.
- $argument->is_default = TRUE;
}
// Set the argument, which will also validate that the argument can be set.
@@ -1150,7 +1148,7 @@ class view extends views_db_object {
$cache = $this->display_handler->get_plugin('cache');
}
if ($cache && $cache->cache_get('results')) {
- if($this->query->pager->use_pager()) {
+ if($this->query->pager->use_pager() || !empty($this->get_total_rows)) {
$this->query->pager->total_items = $this->total_rows;
$this->query->pager->update_page_info();
}
@@ -1593,7 +1591,7 @@ class view extends views_db_object {
$position = 0;
if (!empty($this->argument)) {
foreach ($this->argument as $argument_id => $argument) {
- if (!empty($argument->is_default) && !empty($argument->options['default_argument_skip_url'])) {
+ if (!empty($argument->options['default_argument_skip_url'])) {
unset($args[$position]);
}
$position++;
@@ -1818,6 +1816,9 @@ class view extends views_db_object {
$this->vid = $vid ? $vid : NULL;
}
+ // Let modules modify the view just prior to saving it.
+ module_invoke_all('views_view_presave', $this);
+
$transaction = db_transaction();
try {
@@ -1848,6 +1849,9 @@ class view extends views_db_object {
// Clear caches.
views_invalidate_cache();
+
+ // Notify modules that this view has been saved.
+ module_invoke_all('views_view_save', $this);
}
/**
@@ -1887,6 +1891,9 @@ class view extends views_db_object {
// Clear caches.
views_invalidate_cache();
}
+
+ // Notify modules that this view has been deleted.
+ module_invoke_all('views_view_delete', $this);
}
/**
@@ -2076,25 +2083,26 @@ class view extends views_db_object {
}
/**
- * Find and initialize the localizer plugin.
+ * Find and initialize the localization plugin.
*/
function init_localization() {
- if (isset($this->localization_plugin) && is_object($this->localization_plugin)) {
- return TRUE;
+ // If the translate attribute isn't set, init the localization plugin.
+ if (!isset($this->localization_plugin->translate)) {
+ $this->localization_plugin = views_get_plugin('localization', views_get_localization_plugin());
+
+ // If the plugin is still not set, turn off all localization by using the
+ // views_plugin_localization_none plugin. This plugin has the translate
+ // property set to FALSE, signifying localization should not occur.
+ if (empty($this->localization_plugin)) {
+ $this->localization_plugin = views_get_plugin('localization', 'none');
+ }
+
+ // Init the plugin.
+ $this->localization_plugin->init($this);
}
- $this->localization_plugin = views_get_plugin('localization', views_get_localization_plugin());
-
- if (empty($this->localization_plugin)) {
- $this->localization_plugin = views_get_plugin('localization', 'none');
- return FALSE;
- }
-
- /**
- * Figure out whether there should be options.
- */
- $this->localization_plugin->init($this);
-
+ // Return the value of the translate property. This is set to FALSE if
+ // localization is off.
return $this->localization_plugin->translate;
}
@@ -2102,6 +2110,10 @@ class view extends views_db_object {
* Determine whether a view supports admin string translation.
*/
function is_translatable() {
+ // Use translation no matter what type of view.
+ if (variable_get('views_localize_all', FALSE)) {
+ return TRUE;
+ }
// If the view is normal or overridden, use admin string translation.
// A newly created view won't have a type. Accept this.
return (!isset($this->type) || in_array($this->type, array(t('Normal'), t('Overridden')))) ? TRUE : FALSE;
@@ -2566,7 +2578,7 @@ class views_display extends views_db_object {
var $display_options;
var $db_table = 'views_display';
- function views_display($init = TRUE) {
+ function __construct($init = TRUE) {
parent::init($init);
}
diff --git a/sites/all/modules/contrib/views/views/js/ajax_view.js b/sites/all/modules/contrib/views/views/js/ajax_view.js
index 7d54c676..ce6cc52d 100644
--- a/sites/all/modules/contrib/views/views/js/ajax_view.js
+++ b/sites/all/modules/contrib/views/views/js/ajax_view.js
@@ -57,7 +57,7 @@ Drupal.views.ajaxView = function(settings) {
this.settings = settings;
// Add the ajax to exposed forms.
- this.$exposed_form = this.$view.children('.view-filters').children('form');
+ this.$exposed_form = $('#views-exposed-form-'+ settings.view_name.replace(/_/g, '-') + '-' + settings.view_display_id.replace(/_/g, '-'));
this.$exposed_form.once(jQuery.proxy(this.attachExposedFormAjax, this));
// Add the ajax to pagers.
diff --git a/sites/all/modules/contrib/views/views/js/views-admin.js b/sites/all/modules/contrib/views/views/js/views-admin.js
index 2b4ccf33..3d91fae4 100644
--- a/sites/all/modules/contrib/views/views/js/views-admin.js
+++ b/sites/all/modules/contrib/views/views/js/views-admin.js
@@ -352,7 +352,7 @@ Drupal.viewsUi.OptionsSearch.prototype.handleKeyup = function (event) {
// Determine the user's search query. The search text has been converted to
// lowercase.
- search = this.$searchBox.val().toLowerCase();
+ search = (this.$searchBox.val() || '').toLowerCase();
words = search.split(' ');
wordsLength = words.length;
diff --git a/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc b/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc
index d287b8e7..e349590d 100644
--- a/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc
+++ b/sites/all/modules/contrib/views/views/modules/comment/views_plugin_row_comment_rss.inc
@@ -107,7 +107,7 @@ class views_plugin_row_comment_rss extends views_plugin_row {
),
array(
'key' => 'dc:creator',
- 'value' => $comment->name,
+ 'value' => format_username($comment),
),
array(
'key' => 'guid',
diff --git a/sites/all/modules/contrib/views/views/modules/field.views.inc b/sites/all/modules/contrib/views/views/modules/field.views.inc
index 0bf1ad2b..eae7f6d4 100644
--- a/sites/all/modules/contrib/views/views/modules/field.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/field.views.inc
@@ -435,45 +435,6 @@ function field_views_field_default_views_data($field) {
'field_name' => $field['field_name'],
);
}
-
- // Expose additional language column for translatable fields.
- if (!empty($field['translatable'])) {
- $title_language = t('@label (!name:language)', array('@label' => $label, '!name' => $field['field_name']));
- $title_short_language = t('@label:language', array('@label' => $label));
-
- $data[$table]['language'] = array(
- 'group' => $group,
- 'title' => $title_language,
- 'title short' => $title_short_language,
- 'help' => t('Language - Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
- );
- $data[$table]['language']['field'] = array(
- 'handler' => 'views_handler_field_locale_language',
- );
- $data[$table]['language']['argument'] = array(
- 'field' => 'language',
- 'table' => $table,
- 'handler' => 'views_handler_argument_locale_language',
- 'additional fields' => $additional_fields,
- 'empty field name' => t(''),
- 'field_name' => $field['field_name'],
- );
- $data[$table]['language']['filter'] = array(
- 'field' => 'language',
- 'table' => $table,
- 'handler' => 'views_handler_filter_locale_language',
- 'additional fields' => $additional_fields,
- 'field_name' => $field['field_name'],
- 'allow empty' => TRUE,
- );
- $data[$table]['language']['sort'] = array(
- 'field' => 'language',
- 'table' => $table,
- 'handler' => 'views_handler_sort',
- 'additional fields' => $additional_fields,
- 'field_name' => $field['field_name'],
- );
- }
}
}
diff --git a/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc b/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc
index a91e13a0..e30a1e83 100644
--- a/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc
+++ b/sites/all/modules/contrib/views/views/modules/field/views_handler_field_field.inc
@@ -383,6 +383,10 @@ class views_handler_field_field extends views_handler_field {
'default' => FALSE,
'bool' => TRUE,
);
+ $options['delta_random'] = array(
+ 'default' => FALSE,
+ 'bool' => TRUE,
+ );
$options['multi_type'] = array(
'default' => 'separator'
@@ -576,6 +580,14 @@ class views_handler_field_field extends views_handler_field {
'#title' => t('First and last only'),
'#type' => 'checkbox',
'#default_value' => $this->options['delta_first_last'],
+ '#suffix' => $suffix,
+ '#dependency' => array('edit-options-group-rows' => array(TRUE)),
+ '#fieldset' => 'multiple_field_settings',
+ );
+ $form['delta_random'] = array(
+ '#title' => t('Random order'),
+ '#type' => 'checkbox',
+ '#default_value' => $this->options['delta_random'],
'#suffix' => '
',
'#dependency' => array('edit-options-group-rows' => array(TRUE)),
'#fieldset' => 'multiple_field_settings',
@@ -716,6 +728,10 @@ class views_handler_field_field extends views_handler_field {
}
function get_value($values, $field = NULL) {
+ if (!isset($values->_field_data[$this->field_alias]['entity']) || !is_object($values->_field_data[$this->field_alias]['entity'])) {
+ return array();
+ }
+
// Go ahead and render and store in $this->items.
$entity = clone $values->_field_data[$this->field_alias]['entity'];
@@ -757,6 +773,11 @@ class views_handler_field_field extends views_handler_field {
return array();
}
+ // If requested, randomize the order of the deltas.
+ if ($this->options['delta_random'] && !empty($entity->{$this->definition['field_name']})) {
+ shuffle($entity->{$this->definition['field_name']}[$langcode]);
+ }
+
// We are supposed to show only certain deltas.
if ($this->limit_values && !empty($entity->{$this->definition['field_name']})) {
$all_values = !empty($entity->{$this->definition['field_name']}[$langcode]) ? $entity->{$this->definition['field_name']}[$langcode] : array();
diff --git a/sites/all/modules/contrib/views/views/modules/locale.views.inc b/sites/all/modules/contrib/views/views/modules/locale.views.inc
index 3bff7dbd..fe6d0509 100644
--- a/sites/all/modules/contrib/views/views/modules/locale.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale.views.inc
@@ -218,4 +218,11 @@ function locale_views_data_alter(&$data) {
'handler' => 'views_handler_sort',
),
);
+ $data['node']['specific_language'] = array(
+ 'title' => t('Specific language'),
+ 'help' => t('Sort by a specific language that the content is in.'),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort_node_language',
+ ),
+ );
}
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc
index 37893551..811bcb27 100644
--- a/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_field_locale_link_edit.inc
@@ -52,7 +52,7 @@ class views_handler_field_locale_link_edit extends views_handler_field {
$text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
$this->options['alter']['make_link'] = TRUE;
- $this->options['alter']['path'] = 'admin/build/translate/edit/' . $data;
+ $this->options['alter']['path'] = 'admin/config/regional/translate/edit/' . $data;
$this->options['alter']['query'] = drupal_get_destination();
return $text;
diff --git a/sites/all/modules/contrib/views/views/modules/locale/views_handler_sort_node_language.inc b/sites/all/modules/contrib/views/views/modules/locale/views_handler_sort_node_language.inc
new file mode 100644
index 00000000..b4298917
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/locale/views_handler_sort_node_language.inc
@@ -0,0 +1,107 @@
+options['language'])) {
+ $langcode = $this->get_system_langcode($this->options['language']);
+ // Validate the langcode.
+ if (preg_match('/^[a-z0-9\-]+$/i', $langcode)) {
+ $this->ensure_my_table();
+ // See https://stackoverflow.com/questions/14104055/ordering-by-specific-field-value-first
+ $formula = "{$this->table_alias}_language = '{$langcode}'";
+ $this->query->add_orderby($this->table_alias, NULL, $this->options['order'], $formula);
+ }
+ }
+ }
+
+ /**
+ * Converts a views language code into a Drupal language code.
+ */
+ function get_system_langcode($langcode) {
+ global $language_content;
+ $default_language = language_default('language');
+ $system_langcode = str_replace(array(
+ '***CURRENT_LANGUAGE***',
+ '***DEFAULT_LANGUAGE***',
+ ),
+ array(
+ $language_content->language,
+ $default_language,
+ ),
+ $langcode);
+ return $system_langcode;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function option_definition() {
+ $options = parent::option_definition();
+ $options['language'] = array('default' => '***CURRENT_LANGUAGE***');
+ return $options;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function admin_summary() {
+ $summary = parent::admin_summary();
+ if ($this->options['language']) {
+ $language_options = $this->get_language_options();
+ $summary = t('@order, @language', array(
+ '@order' => $summary,
+ '@language' => $language_options[$this->options['language']],
+ ));
+ }
+ return $summary;
+ }
+
+ /**
+ * Returns languages to sort by.
+ *
+ * @return array
+ * All the languages.
+ */
+ function get_language_options() {
+ $languages = array(
+ '***CURRENT_LANGUAGE***' => t("Current user's language"),
+ '***DEFAULT_LANGUAGE***' => t("Default site language"),
+ LANGUAGE_NONE => t('No language')
+ );
+ $languages = array_merge($languages, views_language_list());
+ return $languages;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ function show_sort_form(&$form, &$form_state) {
+ parent::show_sort_form($form, $form_state);
+
+ $form['language'] = array(
+ '#type' => 'radios',
+ '#title' => t("Specific language"),
+ '#description' => t("Choose which specific language to sort by. Not to be confused with the 'Language' sort handler, which sorts by language."),
+ '#options' => $this->get_language_options(),
+ '#default_value' => $this->options['language'],
+ );
+ }
+
+}
+
diff --git a/sites/all/modules/contrib/views/views/modules/node.views.inc b/sites/all/modules/contrib/views/views/modules/node.views.inc
index 71a10237..1a9c76bd 100644
--- a/sites/all/modules/contrib/views/views/modules/node.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/node.views.inc
@@ -406,6 +406,23 @@ function node_views_data() {
),
);
+ $data['node']['version_count'] = array(
+ 'title' => t('Version Count'),
+ 'help' => t('The total count of versions/revisions of a certain node.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_node_version_count',
+ 'field' => 'nid',
+ 'click sortable' => TRUE,
+ ),
+ 'filter' => array(
+ 'handler' => 'views_handler_filter_node_version_count',
+ 'allow empty' => FALSE,
+ ),
+ 'sort' => array(
+ 'handler' => 'views_handler_sort_node_version_count',
+ ),
+ );
+
// ----------------------------------------------------------------------
// Content revision table
@@ -413,6 +430,7 @@ function node_views_data() {
// have a group defined will go into this field by default.
$data['node_revisions']['moved to'] = 'node_revision';
$data['node_revision']['table']['entity type'] = 'node';
+ $data['node_revision']['table']['revision'] = TRUE;
$data['node_revision']['table']['group'] = t('Content revision');
// Support the conversion of the field body
$data['node_revisions']['body']['moved to'] = array('field_revision_data', 'body-revision_id');
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_version_count.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_version_count.inc
new file mode 100644
index 00000000..73c2925d
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_field_node_version_count.inc
@@ -0,0 +1,21 @@
+ensure_my_table();
+ // Add the field.
+ $params = $this->options['group_type'] != 'group' ? array('function' => $this->options['group_type']) : array();
+ $this->field_alias = $this->query->add_field(NULL, '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {node}.nid)', 'node_version_count', $params);
+
+ $this->add_additional_fields();
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc
index 4d3d9a70..f8f4000c 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_uid_revision.inc
@@ -18,7 +18,7 @@ class views_handler_filter_node_uid_revision extends views_handler_filter_user_n
$args = array_values($this->value);
- $this->query->add_where_expression($this->options['group'], "$this->table_alias.uid IN($placeholder) " . $condition . " OR
+ $this->query->add_where_expression($this->options['group'], "$this->table_alias.uid IN($placeholder) " . "OR
((SELECT COUNT(*) FROM {node_revision} nr WHERE nr.uid IN($placeholder) AND nr.nid = $this->table_alias.nid) > 0)", array($placeholder => $args),
$args);
}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_version_count.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_version_count.inc
new file mode 100644
index 00000000..c39f1d9f
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_filter_node_version_count.inc
@@ -0,0 +1,36 @@
+operator == 'between') {
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) BETWEEN :min AND :max', array(':min' => $this->value['min'], ':max' => $this->value['max']));
+ }
+ else {
+ $this->query->add_where_expression($this->options['group'], '((SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) <= :min OR (SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) >= :max)', array(':min' => $this->value['min'], ':max' => $this->value['max']));
+ }
+ }
+
+ function op_simple($field) {
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid)' . $this->operator . ' :value', array(':value' => $this->value['value']));
+ }
+
+ function op_empty($field) {
+ if ($this->operator == 'empty') {
+ $operator = "IS NULL";
+ }
+ else {
+ $operator = "IS NOT NULL";
+ }
+
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) ' . $this->operator);
+ }
+
+ function op_regex($field) {
+ $this->query->add_where_expression($this->options['group'], '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid) RLIKE :value', array(':value' => $this->value['value']));
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_handler_sort_node_version_count.inc b/sites/all/modules/contrib/views/views/modules/node/views_handler_sort_node_version_count.inc
new file mode 100644
index 00000000..a8e1cf6e
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/node/views_handler_sort_node_version_count.inc
@@ -0,0 +1,19 @@
+ensure_my_table();
+
+ $this->query->add_orderby(NULL, '(SELECT COUNT(vid) FROM {node_revision} WHERE nid = {' . $this->table_alias . '}.nid)', $this->options['order'], 'sort_node_version_count');
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc b/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc
index 5da746b2..66718925 100644
--- a/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc
+++ b/sites/all/modules/contrib/views/views/modules/node/views_plugin_row_node_rss.inc
@@ -117,7 +117,7 @@ class views_plugin_row_node_rss extends views_plugin_row {
),
array(
'key' => 'dc:creator',
- 'value' => $node->name,
+ 'value' => format_username($node),
),
array(
'key' => 'guid',
diff --git a/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc b/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc
index f0a4a448..959a25af 100644
--- a/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc
+++ b/sites/all/modules/contrib/views/views/modules/search/views_handler_argument_search.inc
@@ -56,7 +56,7 @@ class views_handler_argument_search extends views_handler_argument {
$join->construct('search_total', $search_index, 'word', 'word');
$search_total = $this->query->add_relationship('search_total', $join, $search_index);
- $this->search_score = $this->query->add_field('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE));
+ $this->search_score = $this->query->add_field('', "$search_index.score * $search_total.count", 'score', array('aggregate' => TRUE, 'function' => 'sum'));
if (empty($this->query->relationships[$this->relationship])) {
$base_table = $this->query->base_table;
diff --git a/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc b/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc
index 16515a76..0b93031c 100644
--- a/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc
+++ b/sites/all/modules/contrib/views/views/modules/search/views_handler_filter_search.inc
@@ -150,7 +150,7 @@ class views_handler_filter_search extends views_handler_filter {
$join->construct('search_total', $search_index, 'word', 'word');
$search_total = $this->query->add_relationship('search_total', $join, $search_index);
- $this->search_score = $this->query->add_field('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE));
+ $this->search_score = $this->query->add_field('', "$search_index.score * $search_total.count", 'score', array('aggregate' => TRUE, 'function' => 'sum'));
}
if (empty($this->query->relationships[$this->relationship])) {
diff --git a/sites/all/modules/contrib/views/views/modules/statistics.views.inc b/sites/all/modules/contrib/views/views/modules/statistics.views.inc
index d6637f3e..6d99c5e6 100644
--- a/sites/all/modules/contrib/views/views/modules/statistics.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/statistics.views.inc
@@ -32,7 +32,7 @@ function statistics_views_data() {
'help' => t('The total number of times the node has been viewed.'),
'field' => array(
- 'handler' => 'views_handler_field_numeric',
+ 'handler' => 'views_handler_field_statistics_numeric',
'click sortable' => TRUE,
),
'filter' => array(
@@ -49,7 +49,7 @@ function statistics_views_data() {
'help' => t('The total number of times the node has been viewed today.'),
'field' => array(
- 'handler' => 'views_handler_field_numeric',
+ 'handler' => 'views_handler_field_statistics_numeric',
'click sortable' => TRUE,
),
'filter' => array(
@@ -66,7 +66,7 @@ function statistics_views_data() {
'help' => t('The most recent time the node has been viewed.'),
'field' => array(
- 'handler' => 'views_handler_field_date',
+ 'handler' => 'views_handler_field_node_counter_timestamp',
'click sortable' => TRUE,
),
'filter' => array(
diff --git a/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_node_counter_timestamp.inc b/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_node_counter_timestamp.inc
new file mode 100644
index 00000000..d665519b
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/statistics/views_handler_field_node_counter_timestamp.inc
@@ -0,0 +1,21 @@
+ t('Display content if it has the selected taxonomy terms, or children of the selected terms. Due to additional complexity, this has fewer options than the versions without depth.'),
+ 'real field' => 'nid',
+ 'argument' => array(
+ 'title' => t('Has taxonomy term ID with depth (using joins)'),
+ 'handler' => 'views_handler_argument_term_node_tid_depth_join',
+ 'accept depth modifier' => TRUE,
+ ),
+ 'filter' => array(
+ 'title' => t('Has taxonomy terms with depth (using joins)'),
+ 'handler' => 'views_handler_filter_term_node_tid_depth_join',
+ ),
+ );
+
$data['node']['term_node_tid_depth_modifier'] = array(
'title' => t('Has taxonomy term ID depth modifier'),
'help' => t('Allows the "depth" for Taxonomy: Term ID (with depth) to be modified via an additional contextual filter value.'),
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc
new file mode 100644
index 00000000..23ac62d1
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc
@@ -0,0 +1,191 @@
+ 0);
+ $options['break_phrase'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['set_breadcrumb'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['use_taxonomy_term_path'] = array('default' => FALSE, 'bool' => TRUE);
+
+ return $options;
+ }
+
+ function options_form(&$form, &$form_state) {
+ $form['depth'] = array(
+ '#type' => 'weight',
+ '#title' => t('Depth'),
+ '#default_value' => $this->options['depth'],
+ '#description' => t('The depth will match nodes tagged with terms in the hierarchy. For example, if you have the term "fruit" and a child term "apple", with a depth of 1 (or higher) then filtering for the term "fruit" will get nodes that are tagged with "apple" as well as "fruit". If negative, the reverse is true; searching for "apple" will also pick up nodes tagged with "fruit" if depth is -1 (or lower).'),
+ );
+
+ $form['break_phrase'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Allow multiple values'),
+ '#description' => t('If selected, users can enter multiple values in the form of 1+2+3. Due to the number of JOINs it would require, AND will be treated as OR with this filter.'),
+ '#default_value' => !empty($this->options['break_phrase']),
+ );
+
+ $form['set_breadcrumb'] = array(
+ '#type' => 'checkbox',
+ '#title' => t("Set the breadcrumb for the term parents"),
+ '#description' => t('If selected, the breadcrumb trail will include all parent terms, each one linking to this view. Note that this only works if just one term was received.'),
+ '#default_value' => !empty($this->options['set_breadcrumb']),
+ );
+
+ $form['use_taxonomy_term_path'] = array(
+ '#type' => 'checkbox',
+ '#title' => t("Use Drupal's taxonomy term path to create breadcrumb links"),
+ '#description' => t('If selected, the links in the breadcrumb trail will be created using the standard drupal method instead of the custom views method. This is useful if you are using modules like taxonomy redirect to modify your taxonomy term links.'),
+ '#default_value' => !empty($this->options['use_taxonomy_term_path']),
+ '#dependency' => array('edit-options-set-breadcrumb' => array(TRUE)),
+ );
+ parent::options_form($form, $form_state);
+ }
+
+ function set_breadcrumb(&$breadcrumb) {
+ if (empty($this->options['set_breadcrumb']) || !is_numeric($this->argument)) {
+ return;
+ }
+
+ return views_taxonomy_set_breadcrumb($breadcrumb, $this);
+ }
+
+ /**
+ * Override default_actions() to remove summary actions.
+ */
+ function default_actions($which = NULL) {
+ if ($which) {
+ if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) {
+ return parent::default_actions($which);
+ }
+ return;
+ }
+ $actions = parent::default_actions();
+ unset($actions['summary asc']);
+ unset($actions['summary desc']);
+ unset($actions['summary asc by count']);
+ unset($actions['summary desc by count']);
+ return $actions;
+ }
+
+ function query($group_by = FALSE) {
+ $this->ensure_my_table();
+
+ if (!empty($this->options['break_phrase'])) {
+ $tids = new stdClass();
+ $tids->value = $this->argument;
+ $tids = views_break_phrase($this->argument, $tids);
+ if ($tids->value == array(-1)) {
+ return FALSE;
+ }
+
+ if (count($tids->value) > 1) {
+ $operator = 'IN';
+ }
+ else {
+ $operator = '=';
+ }
+
+ $tids = $tids->value;
+ }
+ else {
+ $operator = "=";
+ $tids = $this->argument;
+ }
+
+ // The tids variable can be an integer or an array of integers.
+ $tids = is_array($tids) ? $tids : array($tids);
+
+ if ($this->options['depth'] > 0) {
+ // When the depth is positive search the children.
+ foreach ($tids as $tid) {
+ // The term must be loaded to get vid for use in taxonomy_get_tree().
+ if ($term = taxonomy_term_load($tid)) {
+ // For every tid argument find all the children down to the depth set
+ // in the options and save the tids for the condition.
+ $tree = taxonomy_get_tree($term->vid, $term->tid, (int) $this->options['depth']);
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $tree));
+ }
+ }
+ }
+ elseif ($this->options['depth'] < 0) {
+ // When the depth is negative search the parents.
+ foreach ($tids as $tid) {
+ // For every tid argument find all the parents up to the depth set
+ // in the options and add the tids into the array. Since there is
+ // no taxonomy function to get all parents with a depth limit it
+ // is done here building a multidimensional array.
+ if ($term = taxonomy_term_load($tid)) {
+ // A variable is needed to track the current depth level.
+ $n = 0;
+ // Initialise our depth based parents array with the leaf term.
+ $parents[$n--][] = $term;
+ while ($n >= $this->options['depth']) {
+ // At each depth find the parents of the current terms.
+ // It is important to note that it is possible for a term to have
+ // multiple parents so get the parents of every parent and so on.
+ $parents[$n] = array();
+ foreach ($parents[$n + 1] as $term) {
+ $parents[$n] += taxonomy_get_parents($term->tid);
+ }
+ // Save all the tids for the condition.
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $parents[$n]));
+ $n--;
+ }
+ }
+ }
+ }
+
+ // Check the size of the array and set the operator accordingly.
+ if (count($tids) > 1) {
+ $operator = 'IN';
+ }
+ else {
+ $tids = current($tids);
+ $operator = '=';
+ }
+
+ // Join on taxonomy index table.
+ $join = new views_join();
+ $join->table = 'taxonomy_index';
+ $join->field = 'nid';
+ $join->left_table = $this->table_alias;
+ $join->left_field = $this->real_field;
+ $join->type = 'INNER';
+ $join->extra = array(
+ array(
+ 'field' => 'tid',
+ 'value' => $tids,
+ 'operator' => $operator,
+ )
+ );
+ $taxonomy_index_alias = $this->query->add_relationship('taxonomy_index', $join, 'node');
+
+ // Distinct is required to prevent duplicate rows.
+ $this->query->distinct = TRUE;
+ }
+
+ function title() {
+ $term = taxonomy_term_load($this->argument);
+ if (!empty($term)) {
+ return check_plain($term->name);
+ }
+
+ return t('No name');
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
index 8938ca9f..ca2b3449 100644
--- a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -206,6 +206,9 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
if (empty($form_state['exposed'])) {
// Retain the helper option
$this->helper->options_form($form, $form_state);
+
+ // Show help text if not exposed to end users.
+ $form['value']['#description'] = t('Leave blank for all. Otherwise, the first selected term will be the default instead of "Any".');
}
}
@@ -228,12 +231,25 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
return TRUE;
}
+ // We need to know the operator, which is normally set in
+ // views_handler_filter::accept_exposed_input(), before we actually call
+ // the parent version of ourselves.
+ if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']) && isset($input[$this->options['expose']['operator_id']])) {
+ $this->operator = $input[$this->options['expose']['operator_id']];
+ }
+
// If view is an attachment and is inheriting exposed filters, then assume
// exposed input has already been validated
if (!empty($this->view->is_attachment) && $this->view->display_handler->uses_exposed()) {
$this->validated_exposed_input = (array) $this->view->exposed_raw_input[$this->options['expose']['identifier']];
}
+ // If we're checking for EMPTY or NOT, we don't need any input, and we can
+ // say that our input conditions are met by just having the right operator.
+ if ($this->operator == 'empty' || $this->operator == 'not empty') {
+ return TRUE;
+ }
+
// If it's non-required and there's no value don't bother filtering.
if (!$this->options['expose']['required'] && empty($this->validated_exposed_input)) {
return FALSE;
diff --git a/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc
new file mode 100644
index 00000000..8139b8d0
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc
@@ -0,0 +1,142 @@
+ t('Is one of'),
+ );
+ }
+
+ function option_definition() {
+ $options = parent::option_definition();
+
+ $options['depth'] = array('default' => 0);
+
+ return $options;
+ }
+
+ function extra_options_form(&$form, &$form_state) {
+ parent::extra_options_form($form, $form_state);
+
+ $form['depth'] = array(
+ '#type' => 'weight',
+ '#title' => t('Depth'),
+ '#default_value' => $this->options['depth'],
+ '#description' => t('The depth will match nodes tagged with terms in the hierarchy. For example, if you have the term "fruit" and a child term "apple", with a depth of 1 (or higher) then filtering for the term "fruit" will get nodes that are tagged with "apple" as well as "fruit". If negative, the reverse is true; searching for "apple" will also pick up nodes tagged with "fruit" if depth is -1 (or lower).'),
+ );
+ }
+
+ function query() {
+ // If no filter values are present, then do nothing.
+ if (count($this->value) == 0) {
+ return;
+ }
+ elseif (count($this->value) == 1) {
+ // Somethis $this->value is an array with a single element so convert it.
+ if (is_array($this->value)) {
+ $this->value = current($this->value);
+ }
+ $operator = '=';
+ }
+ else {
+ $operator = 'IN';# " IN (" . implode(', ', array_fill(0, sizeof($this->value), '%d')) . ")";
+ }
+
+ // The normal use of ensure_my_table() here breaks Views.
+ // So instead we trick the filter into using the alias of the base table.
+ // See http://drupal.org/node/271833
+ // If a relationship is set, we must use the alias it provides.
+ if (!empty($this->relationship)) {
+ $this->table_alias = $this->relationship;
+ }
+ // If no relationship, then use the alias of the base table.
+ elseif (isset($this->query->table_queue[$this->query->base_table]['alias'])) {
+ $this->table_alias = $this->query->table_queue[$this->query->base_table]['alias'];
+ }
+ // This should never happen, but if it does, we fail quietly.
+ else {
+ return;
+ }
+
+ // The tids variable can be an integer or an array of integers.
+ $tids = is_array($this->value) ? $this->value : array($this->value);
+
+ if ($this->options['depth'] > 0) {
+ // When the depth is positive search the children.
+ foreach ($tids as $tid) {
+ // The term must be loaded to get vid for use in taxonomy_get_tree().
+ if ($term = taxonomy_term_load($tid)) {
+ // For every tid argument find all the children down to the depth set
+ // in the options and save the tids for the condition.
+ $tree = taxonomy_get_tree($term->vid, $term->tid, (int) $this->options['depth']);
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $tree));
+ }
+ }
+ }
+ elseif ($this->options['depth'] < 0) {
+ // When the depth is negative search the parents.
+ foreach ($tids as $tid) {
+ // For every tid argument find all the parents up to the depth set
+ // in the options and add the tids into the array. Since there is
+ // no taxonomy function to get all parents with a depth limit it
+ // is done here building a multidimensional array.
+ if ($term = taxonomy_term_load($tid)) {
+ // A variable is needed to track the current depth level.
+ $n = 0;
+ // Initialise our depth based parents array with the leaf term.
+ $parents[$n--][] = $term;
+ while ($n >= $this->options['depth']) {
+ // At each depth find the parents of the current terms.
+ // It is important to note that it is possible for a term to have
+ // multiple parents so get the parents of every parent and so on.
+ $parents[$n] = array();
+ foreach ($parents[$n + 1] as $term) {
+ $parents[$n] += taxonomy_get_parents($term->tid);
+ }
+ // Save all the tids for the condition.
+ $tids = array_merge($tids, array_map('_taxonomy_get_tid_from_term', $parents[$n]));
+ $n--;
+ }
+ }
+ }
+ }
+
+ // Check the size of the array and set the operator accordingly.
+ if (count($tids) > 1) {
+ $operator = 'IN';
+ }
+ else {
+ $tids = current($tids);
+ $operator = '=';
+ }
+
+ // Join on taxonomy index table.
+ $join = new views_join();
+ $join->table = 'taxonomy_index';
+ $join->field = 'nid';
+ $join->left_table = $this->table_alias;
+ $join->left_field = $this->real_field;
+ $join->type = 'INNER';
+ $join->extra = array(
+ array(
+ 'field' => 'tid',
+ 'value' => $tids,
+ 'operator' => $operator,
+ )
+ );
+ $taxonomy_index_alias = $this->query->add_relationship('taxonomy_index', $join, 'node');
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/modules/translation.views.inc b/sites/all/modules/contrib/views/views/modules/translation.views.inc
index b36c7a78..584c63f9 100644
--- a/sites/all/modules/contrib/views/views/modules/translation.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/translation.views.inc
@@ -51,7 +51,7 @@ function translation_views_data_alter(&$data) {
),
);
- // The source translation.
+ // All translations.
$data['node']['translation'] = array(
'group' => t('Content translation'),
'title' => t('Translations'),
@@ -62,7 +62,7 @@ function translation_views_data_alter(&$data) {
'base' => 'node',
'base field' => 'tnid',
'relationship table' => 'node',
- 'relationship field' => 'nid',
+ 'relationship field' => 'tnid',
'handler' => 'views_handler_relationship_translation',
'label' => t('Translations'),
),
@@ -78,7 +78,7 @@ function translation_views_data_alter(&$data) {
),
);
- // The source translation.
+ // Child translation.
$data['node']['child_translation'] = array(
'group' => t('Node translation'),
'title' => t('Child translation'),
diff --git a/sites/all/modules/contrib/views/views/modules/views.views.inc b/sites/all/modules/contrib/views/views/modules/views.views.inc
index 7c3f4db9..ce3aad38 100644
--- a/sites/all/modules/contrib/views/views/modules/views.views.inc
+++ b/sites/all/modules/contrib/views/views/modules/views.views.inc
@@ -99,6 +99,14 @@ function views_views_data() {
);
}
+ $data['views']['ctools_dropdown'] = array(
+ 'title' => t('Dropdown links'),
+ 'help' => t('Displays fields in a dropdown list, like on the views listing page.'),
+ 'field' => array(
+ 'handler' => 'views_handler_field_ctools_dropdown',
+ ),
+ );
+
$data['views']['combine'] = array(
'title' => t('Combine fields filter'),
'help' => t('Combine two fields together and search by them.'),
diff --git a/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php b/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php
index 9d801382..6f87e401 100644
--- a/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php
+++ b/sites/all/modules/contrib/views/views/plugins/export_ui/views_ui.class.php
@@ -385,8 +385,8 @@ class views_ui extends ctools_export_ui {
$output = parent::list_page($js, $input);
if (is_string($output)) {
$output = '' . $output . '
';
- return $output;
}
+ return $output;
}
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc
index 07b49eeb..350cb439 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_argument_validate.inc
@@ -86,7 +86,7 @@ class views_plugin_argument_validate extends views_plugin {
/**
* Process the summary arguments for displaying.
*
- * Some plugins alter the argument so it uses something else interal.
+ * Some plugins alter the argument so it uses something else internally.
* For example the user validation set's the argument to the uid,
* for a faster query. But there are use cases where you want to use
* the old value again, for example the summary.
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc
index 81f71bfb..0dfc9114 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache.inc
@@ -206,14 +206,14 @@ class views_plugin_cache extends views_plugin {
// Slightly less simple for CSS:
$css = drupal_add_css();
$css_start = isset($this->storage['css']) ? $this->storage['css'] : array();
- $this->storage['css'] = $array_mapping_func($css, $css_start);
+ $this->storage['css'] = $this->assetDiff($css, $css_start, $array_mapping_func);
// Get javascript after/before views renders.
$js = drupal_add_js();
$js_start = isset($this->storage['js']) ? $this->storage['js'] : array();
// If there are any differences between the old and the new javascript then
// store them to be added later.
- $this->storage['js'] = $array_mapping_func($js, $js_start);
+ $this->storage['js'] = $this->assetDiff($js, $js_start, $array_mapping_func);
// Special case the settings key and get the difference of the data.
$settings = isset($js['settings']['data']) ? $js['settings']['data'] : array();
@@ -224,6 +224,38 @@ class views_plugin_cache extends views_plugin {
$this->storage['headers'] = $array_mapping_func(drupal_get_http_header(), $this->storage['headers']);
}
+ /**
+ * Computes the differences between two JS/CSS asset arrays.
+ *
+ * @param array $assets
+ * The current asset array.
+ * @param array $start_assets
+ * The original asset array.
+ * @param string $diff_function
+ * The function that should be used for computing the diff.
+ *
+ * @return array
+ * A CSS or JS asset array that contains all entries that are new/different
+ * in $assets.
+ */
+ protected function assetDiff(array $assets, array $start_assets, $diff_function) {
+ $diff = $diff_function($assets, $start_assets);
+
+ // Cleanup the resulting array since drupal_array_diff_assoc_recursive() can
+ // leave half populated arrays behind.
+ foreach ($diff as $key => $entry) {
+ // If only the weight was different we can remove this entry.
+ if (count($entry) == 1 && isset($entry['weight'])) {
+ unset($diff[$key]);
+ }
+ // If there are other differences we override with the latest entry.
+ elseif ($entry != $assets[$key]) {
+ $diff[$key] = $assets[$key];
+ }
+ }
+ return $diff;
+ }
+
/**
* Restore out of band data saved to cache. Copied from Panels.
*/
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc
index 25245ea4..d3ab7f92 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_cache_time.inc
@@ -107,4 +107,21 @@ class views_plugin_cache_time extends views_plugin_cache {
return CACHE_PERMANENT;
}
}
+
+ function cache_set($type) {
+ $lifespan = $this->get_lifespan($type);
+ if ($lifespan >= 0) {
+ parent::cache_set($type);
+ }
+ }
+
+ function cache_get($type) {
+ $lifespan = $this->get_lifespan($type);
+ if ($lifespan >= 0) {
+ return parent::cache_get($type);
+ }
+ else {
+ return FALSE;
+ }
+ }
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc
index db124de0..a4b732e8 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_display.inc
@@ -53,7 +53,7 @@ class views_plugin_display extends views_plugin {
$this->extender[$extender] = $plugin;
}
else {
- vpr('Invalid display extender @extender', array('@handler' => $extender));
+ vpr('Invalid display extender @extender', array('@extender' => $extender));
}
}
}
@@ -739,7 +739,7 @@ class views_plugin_display extends views_plugin {
function uses_link_display() { return !$this->has_path(); }
/**
- * Check to see if the display can put the exposed formin a block.
+ * Check to see if the display can put the exposed form in a block.
*
* By default, displays that do not have a path cannot disconnect
* the exposed form and put it in a block, because the form has no
@@ -1150,7 +1150,7 @@ class views_plugin_display extends views_plugin {
);
}
- $display_comment = check_plain(drupal_substr($this->get_option('display_comment'), 0, 10));
+ $display_comment = check_plain(views_ui_truncate($this->get_option('display_comment'), 80));
$options['display_comment'] = array(
'category' => 'other',
'title' => t('Comment'),
@@ -1419,7 +1419,7 @@ class views_plugin_display extends views_plugin {
}
$form['#title'] = check_plain($this->display->display_title) . ': ';
- // Set the 'section' to hilite on the form.
+ // Set the 'section' to highlight on the form.
// If it's the item we're looking at is pulling from the default display,
// reflect that. Don't use is_defaulted since we want it to show up even
// on the default display.
@@ -1573,8 +1573,12 @@ class views_plugin_display extends views_plugin {
$plugin = $this->get_plugin('access');
$form['#title'] .= t('Access options');
if ($plugin) {
- $form['#help_topic'] = $plugin->definition['help topic'];
- $form['#help_module'] = $plugin->definition['module'];
+ if (!empty($plugin->definition['help topic'])) {
+ $form['#help_topic'] = $plugin->definition['help topic'];
+ }
+ if (!empty($plugin->definition['module'])) {
+ $form['#help_module'] = $plugin->definition['module'];
+ }
$form['access_options'] = array(
'#tree' => TRUE,
@@ -1615,8 +1619,12 @@ class views_plugin_display extends views_plugin {
$plugin = $this->get_plugin('cache');
$form['#title'] .= t('Caching options');
if ($plugin) {
- $form['#help_topic'] = $plugin->definition['help topic'];
- $form['#help_module'] = $plugin->definition['module'];
+ if (!empty($plugin->definition['help topic'])) {
+ $form['#help_topic'] = $plugin->definition['help topic'];
+ }
+ if (!empty($plugin->definition['module'])) {
+ $form['#help_module'] = $plugin->definition['module'];
+ }
$form['cache_options'] = array(
'#tree' => TRUE,
@@ -1635,11 +1643,10 @@ class views_plugin_display extends views_plugin {
$form['#title'] .= t('Query options');
$this->view->init_query();
if ($this->view->query) {
- if (isset($this->view->query->definition['help topic'])) {
+ if (!empty($this->view->query->definition['help topic'])) {
$form['#help_topic'] = $this->view->query->definition['help topic'];
}
-
- if (isset($this->view->query->definition['module'])) {
+ if (!empty($this->view->query->definition['module'])) {
$form['#help_module'] = $this->view->query->definition['module'];
}
@@ -1734,8 +1741,10 @@ class views_plugin_display extends views_plugin {
}
$plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
if ($plugin) {
- if (isset($plugin->definition['help topic'])) {
+ if (!empty($plugin->definition['help topic'])) {
$form['#help_topic'] = $plugin->definition['help topic'];
+ }
+ if (!empty($plugin->definition['module'])) {
$form['#help_module'] = $plugin->definition['module'];
}
$form[$form_state['section']] = array(
@@ -2117,7 +2126,12 @@ class views_plugin_display extends views_plugin {
$plugin = $this->get_plugin('exposed_form');
$form['#title'] .= t('Exposed form options');
if ($plugin) {
- $form['#help_topic'] = $plugin->definition['help topic'];
+ if (!empty($plugin->definition['help topic'])) {
+ $form['#help_topic'] = $plugin->definition['help topic'];
+ }
+ if (!empty($plugin->definition['module'])) {
+ $form['#help_module'] = $plugin->definition['module'];
+ }
$form['exposed_form_options'] = array(
'#tree' => TRUE,
@@ -2140,7 +2154,7 @@ class views_plugin_display extends views_plugin {
'#default_value' => $pager['type'],
);
- $pager_plugin = views_fetch_plugin_data('pager', $pager['type'], array($this->view->base_table));
+ $pager_plugin = views_fetch_plugin_data('pager', $pager['type']);
if (!empty($pager_plugin['uses options'])) {
$form['markup'] = array(
'#prefix' => '',
@@ -2154,7 +2168,12 @@ class views_plugin_display extends views_plugin {
$plugin = $this->get_plugin('pager');
$form['#title'] .= t('Pager options');
if ($plugin) {
- $form['#help_topic'] = $plugin->definition['help topic'];
+ if (!empty($plugin->definition['help topic'])) {
+ $form['#help_topic'] = $plugin->definition['help topic'];
+ }
+ if (!empty($plugin->definition['module'])) {
+ $form['#help_module'] = $plugin->definition['module'];
+ }
$form['pager_options'] = array(
'#tree' => TRUE,
@@ -2556,6 +2575,23 @@ class views_plugin_display extends views_plugin {
$url_options['query'] = $this->view->exposed_raw_input;
}
$theme = views_theme_functions('views_more', $this->view, $this->display);
+
+ $parsed_url = drupal_parse_url($path);
+ // Preserve the query string from url.
+ if (!empty($parsed_url['query'])) {
+ if (!empty($url_options['query'])) {
+ $url_options['query'] = array_merge($parsed_url['query'], $url_options['query']);
+ }
+ else {
+ $url_options['query'] = $parsed_url['query'];
+ }
+ $path = $parsed_url['path'];
+ }
+ // Add fragment if applicable.
+ if (!empty($parsed_url['fragment'])) {
+ $url_options['fragment'] = $parsed_url['fragment'];
+ }
+
$path = check_url(url($path, $url_options));
return theme($theme, array('more_url' => $path, 'link_text' => check_plain($this->use_more_text()), 'view' => $this->view));
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc
index 91c8d1f9..8608cfc8 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_attachment.inc
@@ -227,6 +227,8 @@ class views_plugin_display_attachment extends views_plugin_display {
$args = $this->get_option('inherit_arguments') ? $this->view->args : array();
$view->set_arguments($args);
+ $exposed_input = $this->get_option('inherit_exposed_filters') ? $this->view->exposed_input : array();
+ $view->set_exposed_input($exposed_input);
$view->set_display($this->display->id);
if ($this->get_option('inherit_pager')) {
$view->display_handler->use_pager = $this->view->display[$display_id]->handler->use_pager();
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_block.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_block.inc
index c903a9b6..d581a16a 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_display_block.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_display_block.inc
@@ -222,8 +222,8 @@ class views_plugin_display_block extends views_plugin_display {
}
/**
- * Save the block cache setting in the blocks table if this block allready
- * exists in the blocks table. Dirty fix untill http://drupal.org/node/235673 gets in.
+ * Save the block cache setting in the blocks table if this block already
+ * exists in the blocks table. Dirty fix until http://drupal.org/node/235673 gets in.
*/
function save_block_cache($delta, $cache_setting) {
if (strlen($delta) >= 32) {
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc
index 8a15e8dc..7468dd95 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_query_default.inc
@@ -143,7 +143,7 @@ class views_plugin_query_default extends views_plugin_query {
);
/**
- * -- we no longer want the base field to appear automatigically.
+ * -- we no longer want the base field to appear automatically.
if ($base_field) {
$this->fields[$base_field] = array(
'table' => $base_table,
@@ -888,7 +888,7 @@ class views_plugin_query_default extends views_plugin_query {
/**
* Add a complex WHERE clause to the query.
*
- * The caller is reponsible for ensuring that all fields are fully qualified
+ * The caller is responsible for ensuring that all fields are fully qualified
* (TABLE.FIELD) and that the table already exists in the query.
* Internally the dbtng method "where" is used.
*
@@ -1322,6 +1322,10 @@ class views_plugin_query_default extends views_plugin_query {
if (count($this->having)) {
$this->has_aggregate = TRUE;
}
+ elseif (!$this->has_aggregate) {
+ // Allow 'GROUP BY' even no aggregation function has been set.
+ $this->has_aggregate = $this->view->display_handler->get_option('group_by');
+ }
if ($this->has_aggregate && (!empty($this->groupby) || !empty($non_aggregates))) {
$groupby = array_unique(array_merge($this->groupby, $non_aggregates));
foreach ($groupby as $field) {
@@ -1588,7 +1592,7 @@ class views_plugin_query_default extends views_plugin_query {
'sort' => 'views_handler_sort_group_by_numeric',
),
)
- );
+ ) + views_fetch_plugin_data('query_aggregate');
}
/**
@@ -1616,7 +1620,8 @@ class views_plugin_query_default extends views_plugin_query {
}
$entity_type = $table_data['table']['entity type'];
$info = entity_get_info($entity_type);
- $id_alias = $this->get_field_alias($base_table_alias, $info['entity keys']['id']);
+ $is_revision = !empty($table_data['table']['revision']);
+ $id_alias = $this->get_field_alias($base_table_alias, $info['entity keys'][$is_revision ? 'revision' : 'id']);
// Assemble the ids of the entities to load.
$ids = array();
@@ -1626,12 +1631,34 @@ class views_plugin_query_default extends views_plugin_query {
}
}
- $entities = entity_load($entity_type, $ids);
- // Re-key the array by row-index.
- $result = array();
- foreach ($ids as $key => $id) {
- $result[$key] = isset($entities[$id]) ? $entities[$id] : FALSE;
+ if (!$is_revision) {
+ $entities = entity_load($entity_type, $ids);
+
+ // Re-key the array by row-index.
+ $result = array();
+ foreach ($ids as $key => $id) {
+ $result[$key] = isset($entities[$id]) ? $entities[$id] : FALSE;
+ }
}
+ else {
+ // There's no way in core to load revisions in bulk.
+ $result = array();
+ foreach ($ids as $key => $id) {
+ // Nodes can be dealt with in core.
+ if ($entity_type == 'node') {
+ $result[$key] = node_load(NULL, $id);
+ }
+ // Otherwise see if entity is enabled.
+ elseif (module_exists('entity')) {
+ $result[$key] = entity_revision_load($entity_type, $id);
+ }
+ else {
+ // Otherwise this isn't supported.
+ watchdog('views', 'Attempt to load a revision on an unsupported entity type @entity_type.', array('@entity_type' => $entity_type), WATCHDOG_WARNING);
+ }
+ }
+ }
+
return array($entity_type, $result);
}
}
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc
index d355e1bc..fe126071 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_style.inc
@@ -123,13 +123,23 @@ class views_plugin_style extends views_plugin {
function get_row_class($row_index) {
if ($this->uses_row_class()) {
$class = $this->options['row_class'];
+
if ($this->uses_fields() && $this->view->field) {
- $class = strip_tags($this->tokenize_value($class, $row_index));
+ $classes = array();
+
+ // Explode the value by whitespace, this allows the function to handle
+ // a single class name and multiple class names that are then tokenized.
+ foreach(explode(' ', $class) as $token_class) {
+ $classes[] = strip_tags($this->tokenize_value($token_class, $row_index));
+ }
+ }
+ else {
+ $classes = explode(' ', $class);
}
- $classes = explode(' ', $class);
+ // Convert whatever the result is to a nice clean class name
foreach ($classes as &$class) {
- $class = drupal_clean_css_identifier($class);
+ $class = drupal_html_class($class);
}
return implode(' ', $classes);
}
@@ -182,7 +192,7 @@ class views_plugin_style extends views_plugin {
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
// Only fields-based views can handle grouping. Style plugins can also exclude
- // themselves from being groupable by setting their "use grouping" definiton
+ // themselves from being groupable by setting their "use grouping" definition
// key to FALSE.
// @TODO: Document "uses grouping" in docs.php when docs.php is written.
if ($this->uses_fields() && $this->definition['uses grouping']) {
@@ -191,7 +201,7 @@ class views_plugin_style extends views_plugin {
$options += $field_labels;
// If there are no fields, we can't group on them.
if (count($options) > 1) {
- // This is for backward compability, when there was just a single select form.
+ // This is for backward compatibility, when there was just a single select form.
if (is_string($this->options['grouping'])) {
$grouping = $this->options['grouping'];
$this->options['grouping'] = array();
@@ -419,7 +429,7 @@ class views_plugin_style extends views_plugin {
* @endcode
*/
function render_grouping($records, $groupings = array(), $group_rendered = NULL) {
- // This is for backward compability, when $groupings was a string containing
+ // This is for backward compatibility, when $groupings was a string containing
// the ID of a single field.
if (is_string($groupings)) {
$rendered = $group_rendered === NULL ? TRUE : $group_rendered;
@@ -486,7 +496,7 @@ class views_plugin_style extends views_plugin {
);
}
- // If this parameter isn't explicitely set modify the output to be fully
+ // If this parameter isn't explicitly set modify the output to be fully
// backward compatible to code before Views 7.x-3.0-rc2.
// @TODO Remove this as soon as possible e.g. October 2020
if ($group_rendered === NULL) {
diff --git a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_rss.inc b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_rss.inc
index 27106a89..79fef3d0 100644
--- a/sites/all/modules/contrib/views/views/plugins/views_plugin_style_rss.inc
+++ b/sites/all/modules/contrib/views/views/plugins/views_plugin_style_rss.inc
@@ -71,6 +71,36 @@ class views_plugin_style_rss extends views_plugin_style {
return array();
}
+ /**
+ * Return an atom:link XHTML element to add to the channel to comply with
+ * the RSS 2.0 specification.
+ *
+ * @see http://validator.w3.org/feed/docs/warning/MissingAtomSelfLink.html
+ *
+ * @return
+ * An array that can be passed to format_xml_elements().
+ */
+ function get_channel_elements_atom_link() {
+ $url_options = array('absolute' => TRUE);
+ $input = $this->view->get_exposed_input();
+ if ($input) {
+ $url_options['query'] = $input;
+ }
+ $url = url($this->view->get_url(), $url_options);
+
+ return array(
+ array(
+ 'namespace' => array('xmlns:atom' => 'http://www.w3.org/2005/Atom'),
+ 'key' => 'atom:link',
+ 'attributes' => array(
+ 'href' => $url,
+ 'rel' => 'self',
+ 'type' => 'application/rss+xml',
+ ),
+ ),
+ );
+ }
+
/**
* Get RSS feed description.
*
@@ -99,7 +129,10 @@ class views_plugin_style_rss extends views_plugin_style {
// Fetch any additional elements for the channel and merge in their
// namespaces.
- $this->channel_elements = $this->get_channel_elements();
+ $this->channel_elements = array_merge(
+ $this->get_channel_elements(),
+ $this->get_channel_elements_atom_link()
+ );
foreach ($this->channel_elements as $element) {
if (isset($element['namespace'])) {
$this->namespaces = array_merge($this->namespaces, $element['namespace']);
diff --git a/sites/all/modules/contrib/views/views/test_templates/README.txt b/sites/all/modules/contrib/views/views/test_templates/README.txt
new file mode 100644
index 00000000..551f738f
--- /dev/null
+++ b/sites/all/modules/contrib/views/views/test_templates/README.txt
@@ -0,0 +1,11 @@
+Workaround for:
+
+- https://www.drupal.org/node/2450447
+- https://www.drupal.org/node/2415991
+
+
+Files of this folder cannot be included inside the views/tests directory because
+they are included as tests cases and make testbot crash.
+
+This files could be moved to tests/templates once
+https://www.drupal.org/node/2415991 be properly fixed.
diff --git a/sites/all/modules/contrib/views/views/tests/templates/views-view--frontpage.tpl.php b/sites/all/modules/contrib/views/views/test_templates/views-view--frontpage.tpl.php
similarity index 100%
rename from sites/all/modules/contrib/views/views/tests/templates/views-view--frontpage.tpl.php
rename to sites/all/modules/contrib/views/views/test_templates/views-view--frontpage.tpl.php
diff --git a/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_date.test b/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_date.test
index 34ccba66..8b92ccb5 100644
--- a/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_date.test
+++ b/sites/all/modules/contrib/views/views/tests/handlers/views_handler_filter_date.test
@@ -50,6 +50,21 @@ class ViewsHandlerFilterDateTest extends ViewsSqlTest {
$this->assertIdenticalResultset($view, $expected_result, $this->map);
$view->destroy();
+ // Test "first day of" type of relative dates for simple operator.
+ $view->set_display('default');
+ $view->init_handlers();
+ $view->filter['created']->operator = '<';
+ $view->filter['created']->value['type'] = 'offset';
+ $view->filter['created']->value['value'] = 'last day of January 1970';
+ $view->execute_display('default');
+ $expected_result = array(
+ array('nid' => $this->nodes[0]->nid),
+ array('nid' => $this->nodes[1]->nid),
+ array('nid' => $this->nodes[2]->nid),
+ );
+ $this->assertIdenticalResultset($view, $expected_result, $this->map);
+ $view->destroy();
+
// Test offset for between operator.
$view->set_display('default');
$view->init_handlers();
@@ -63,6 +78,22 @@ class ViewsHandlerFilterDateTest extends ViewsSqlTest {
);
$this->assertIdenticalResultset($view, $expected_result, $this->map);
$view->destroy();
+
+ // Test "first day of" type of relative dates for between operator.
+ $view->set_display('default');
+ $view->init_handlers();
+ $view->filter['created']->operator = 'between';
+ $view->filter['created']->value['type'] = 'offset';
+ $view->filter['created']->value['max'] = 'last day of January 1970';
+ $view->filter['created']->value['min'] = 'first day of January 1970';
+ $view->execute_display('default');
+ $expected_result = array(
+ array('nid' => $this->nodes[0]->nid),
+ array('nid' => $this->nodes[1]->nid),
+ array('nid' => $this->nodes[2]->nid),
+ );
+ $this->assertIdenticalResultset($view, $expected_result, $this->map);
+ $view->destroy();
}
diff --git a/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test b/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test
index dfc5413a..2bb28574 100644
--- a/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test
+++ b/sites/all/modules/contrib/views/views/tests/styles/views_plugin_style.test
@@ -241,7 +241,7 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
// Setup some random css class.
$view->init_display();
$view->init_style();
- $random_name = $this->randomName();
+ $random_name = drupal_html_class($this->randomName());
$view->style_plugin->options['row_class'] = $random_name . " test-token-[name]";
$rendered_output = $view->preview();
@@ -255,7 +255,7 @@ class ViewsPluginStyleTestCase extends ViewsPluginStyleTestBase {
$this->assertTrue(strpos($class, $random_name) !== FALSE, 'Take sure that a custom css class is added to the output.');
// Check token replacement.
- $name = $view->field['name']->get_value($view->result[$count]);
+ $name = drupal_html_class($view->field['name']->get_value($view->result[$count]));
$this->assertTrue(strpos($class, "test-token-$name") !== FALSE, 'Take sure that a token in custom css class is replaced.');
$count++;
diff --git a/sites/all/modules/contrib/views/views/tests/views_groupby.test b/sites/all/modules/contrib/views/views/tests/views_groupby.test
index 718d8dc0..4e092565 100644
--- a/sites/all/modules/contrib/views/views/tests/views_groupby.test
+++ b/sites/all/modules/contrib/views/views/tests/views_groupby.test
@@ -108,11 +108,14 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
}
/**
- * @param $group_by
- * Which group_by function should be used, for example sum or count.
+ * @param string|null $group_by
+ * (optional) Which group_by function should be used, for example sum or
+ * count. If omitted, the aggregation is tested with no group function.
+ * @param array|null $values
+ * (optional) Expected values.
*/
- function GroupByTestHelper($group_by, $values) {
- // Create 2 nodes of type1 and 3 nodes of type2
+ function GroupByTestHelper($group_by = NULL, $values = NULL) {
+ // Create 4 nodes of type1 and 3 nodes of type2
$type1 = $this->drupalCreateContentType();
$type2 = $this->drupalCreateContentType();
@@ -136,6 +139,19 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$output = $view->execute_display();
$this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
+
+ $results = array();
+ // There's no need for a function in order to have aggregation.
+ if (empty($group_by)) {
+ $types = array($type1->type, $type2->type);
+ $results = array_map(function ($item) { return $item->node_type; }, $view->result);
+ sort($types);
+ sort($results);
+ $this->assertIdentical($results, $types);
+ // Exit here with no aggregation function.
+ return;
+ }
+
// Group by nodetype to identify the right count.
foreach ($view->result as $item) {
$results[$item->node_type] = $item->nid;
@@ -144,7 +160,7 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$this->assertEqual($results[$type2->type], $values[1]);
}
- function viewsGroupByViewHelper($group_by) {
+ function viewsGroupByViewHelper($group_by = NULL) {
$view = new view;
$view->name = 'group_by_count';
$view->description = '';
@@ -164,21 +180,27 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$handler->display->display_options['pager']['type'] = 'some';
$handler->display->display_options['style_plugin'] = 'default';
$handler->display->display_options['row_plugin'] = 'fields';
- /* Field: Content: Nid */
- $handler->display->display_options['fields']['nid']['id'] = 'nid';
- $handler->display->display_options['fields']['nid']['table'] = 'node';
- $handler->display->display_options['fields']['nid']['field'] = 'nid';
- $handler->display->display_options['fields']['nid']['group_type'] = $group_by;
- $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
- $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
- $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
- $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
- $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
- $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
- $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+
+ // The test view has 2 fields ('nid' and 'type'). Don't add 'nid' when
+ // having no aggregation function. We just want to aggregate on node type.
+ if (!empty($group_by)) {
+ /* Field: Content: Nid */
+ $handler->display->display_options['fields']['nid']['id'] = 'nid';
+ $handler->display->display_options['fields']['nid']['table'] = 'node';
+ $handler->display->display_options['fields']['nid']['field'] = 'nid';
+ $handler->display->display_options['fields']['nid']['group_type'] = $group_by;
+ $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
+ $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
+ $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
+ $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
+ $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
+ $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
+ $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+ }
+
/* Field: Content: Type */
$handler->display->display_options['fields']['type']['id'] = 'type';
$handler->display->display_options['fields']['type']['table'] = 'node';
@@ -218,6 +240,10 @@ class ViewsQueryGroupByTest extends ViewsSqlTest {
$this->GroupByTestHelper('max', array(4, 7));
}
+ function testGroupByNone() {
+ $this->GroupByTestHelper();
+ }
+
public function testGroupByCountOnlyFilters() {
// Check if GROUP BY and HAVING are included when a view
// Doesn't display SUM, COUNT, MAX... functions in SELECT statment
diff --git a/sites/all/modules/contrib/views/views/tests/views_module.test b/sites/all/modules/contrib/views/views/tests/views_module.test
index 6a27443a..e160964a 100644
--- a/sites/all/modules/contrib/views/views/tests/views_module.test
+++ b/sites/all/modules/contrib/views/views/tests/views_module.test
@@ -194,6 +194,30 @@ class ViewsModuleTest extends ViewsSqlTest {
$this->assertEqual(variable_get('views_test_views_data_count', 0), 1, 'Views data rebuilt once');
$this->assertFalse(drupal_static('_views_fetch_data_fully_loaded'), 'Views data is not fully loaded');
+
+ // Test if the cache consistency is ensured. There was an issue where
+ // calling _views_fetch_data() first with a table would prevent the function
+ // from properly rebuilt a missing the general cache entry.
+ // See https://www.drupal.org/node/2475669 for details.
+ // Make sure we start with a empty cache.
+ $this->resetStaticViewsDataCache();
+ cache_clear_all('*', 'cache_views', TRUE);
+
+ // Prime the static cache of _views_fetch_data() by calling it with a table
+ // first.
+ views_fetch_data('views_test');
+ // Now remove the general cache.
+ cache_clear_all('views_data:en', 'cache_views');
+ // Reset the static cache to see if fetches from the persistent cache
+ // properly rebuild the static cache.
+ $this->resetStaticViewsDataCache();
+ // Prime the static cache of _views_fetch_data() by calling it with a table
+ // first.
+ views_fetch_data('views_test');
+ // Fetch the general cache, which was deleted, an see if it is rebuild
+ // properly.
+ views_fetch_data();
+ $this->assertTrue(cache_get('views_data:en', 'cache_views'), 'Cache for all tables was properly rebuild.');
}
/**
diff --git a/sites/all/modules/contrib/views/views/tests/views_query.test b/sites/all/modules/contrib/views/views/tests/views_query.test
index 735df0ea..db7d6569 100644
--- a/sites/all/modules/contrib/views/views/tests/views_query.test
+++ b/sites/all/modules/contrib/views/views/tests/views_query.test
@@ -132,7 +132,6 @@ abstract class ViewsSqlTest extends ViewsTestCase {
variable_set('views_test_schema', $this->schemaDefinition());
variable_set('views_test_views_data', $this->viewsData());
variable_set('views_test_views_plugins', $this->viewsPlugins());
-
module_enable(array('views_test'));
$this->resetAll();
diff --git a/sites/all/modules/contrib/views/views/tests/views_test.info b/sites/all/modules/contrib/views/views/tests/views_test.info
index b090daa1..6e9008ed 100644
--- a/sites/all/modules/contrib/views/views/tests/views_test.info
+++ b/sites/all/modules/contrib/views/views/tests/views_test.info
@@ -5,9 +5,9 @@ core = 7.x
dependencies[] = views
hidden = TRUE
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2016-06-15
+version = "7.x-3.14"
core = "7.x"
project = "views"
-datestamp = "1423648085"
+datestamp = "1466019588"
diff --git a/sites/all/modules/contrib/views/views/tests/views_test.module b/sites/all/modules/contrib/views/views/tests/views_test.module
index a7460690..be533e0c 100644
--- a/sites/all/modules/contrib/views/views/tests/views_test.module
+++ b/sites/all/modules/contrib/views/views/tests/views_test.module
@@ -23,7 +23,7 @@ function views_test_permission() {
function views_test_views_api() {
return array(
'api' => 3.0,
- 'template path' => drupal_get_path('module', 'views_test') . '/templates',
+ 'template path' => drupal_get_path('module', 'views') . '/test_templates',
);
}
diff --git a/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php b/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php
index 4fec9fa9..b3443fcc 100644
--- a/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php
+++ b/sites/all/modules/contrib/views/views/theme/views-view-table.tpl.php
@@ -27,7 +27,7 @@
$label): ?>
- >
+ scope="col">
diff --git a/sites/all/modules/contrib/views/views/views.api.php b/sites/all/modules/contrib/views/views/views.api.php
index 70c5dc83..1c7b32b2 100644
--- a/sites/all/modules/contrib/views/views/views.api.php
+++ b/sites/all/modules/contrib/views/views/views.api.php
@@ -143,7 +143,7 @@
* responsible for building the query. Instead, they are objects that are used
* to display the view or make other modifications.
*
- * There are 10 types of plugins in Views:
+ * There are several types of plugins in Views:
* - Display: Display plugins are responsible for controlling *where* a view
* lives; that is, how they are being exposed to other parts of Drupal. Page
* and block are the most common displays, as well as the ubiquitous 'master'
@@ -431,7 +431,7 @@ function hook_views_data() {
'label' => t('Published'),
// This setting is used by the boolean filter handler, as possible option.
'type' => 'yes-no',
- // use boolean_field = 1 instead of boolean_field <> 0 in WHERE statment.
+ // use boolean_field = 1 instead of boolean_field <> 0 in WHERE statement.
'use equal' => TRUE,
),
'sort' => array(
@@ -602,7 +602,7 @@ function hook_field_views_data_views_data_alter(&$data, $field) {
* must be one of row, display, display_extender, style, argument default,
* argument validator, access, query, cache, pager, exposed_form or
* localization. The plugin name should be prefixed with your module name.
- * The value for each entry is an associateive array that may contain the
+ * The value for each entry is an associative array that may contain the
* following entries:
* - Used by all plugin types:
* - title (required): The name of the plugin, as shown in Views. Wrap in
@@ -723,7 +723,7 @@ function hook_views_plugins_alter(&$plugins) {
* - path: (optional) If includes are stored somewhere other than within the
* root module directory, specify its path here.
* - template path: (optional) A path where the module has stored it's views
- * template files. When you have specificed this key views automatically
+ * template files. When you have specified this key views automatically
* uses the template files for the views. You can use the same naming
* conventions like for normal views template files.
*/
@@ -859,7 +859,7 @@ function hook_views_default_views_alter(&$views) {
* The View being executed.
* @return
* An array with keys being the strings to replace, and the values the strings
- * to replace them with. The strings to replace are ofted surrounded with
+ * to replace them with. The strings to replace are often surrounded with
* '***', as illustrated in the example implementation.
*/
function hook_views_query_substitutions($view) {
@@ -924,7 +924,7 @@ function hook_views_pre_view(&$view, &$display_id, &$args) {
* The view object about to be processed.
*/
function hook_views_pre_build(&$view) {
- // Because of some unexplicable business logic, we should remove all
+ // Because of some inexplicable business logic, we should remove all
// attachments from all views on Mondays.
// (This alter could be done later in the execution process as well.)
if (date('D') == 'Mon') {
@@ -1075,7 +1075,7 @@ function hook_views_query_alter(&$view, &$query) {
// Traverse through the 'where' part of the query.
foreach ($query->where as &$condition_group) {
foreach ($condition_group['conditions'] as &$condition) {
- // If this is the part of the query filtering on title, chang the
+ // If this is the part of the query filtering on title, change the
// condition to filter on node ID.
if ($condition['field'] == 'node.title') {
$condition = array(
@@ -1153,8 +1153,8 @@ function hook_views_ajax_data_alter(&$commands, $view) {
// Replace Views' method for scrolling to the top of the element with your
// custom scrolling method.
foreach ($commands as &$command) {
- if ($command['method'] == 'viewsScrollTop') {
- $command['method'] .= 'myScrollTop';
+ if ($command['command'] == 'viewsScrollTop') {
+ $command['command'] .= 'myScrollTop';
}
}
}
@@ -1171,6 +1171,32 @@ function hook_views_invalidate_cache() {
cache_clear_all('views:*', 'cache_mymodule', TRUE);
}
+/**
+ * Allow modules to alter a view prior to being saved.
+ */
+function hook_views_view_presave($view) {
+ // Do some adjustments to the view. Handle with care.
+ if (mymodule_check_view($view)) {
+ mymodule_do_some_voodoo($view);
+ }
+}
+
+/**
+ * Allow modules to respond to a view being saved.
+ */
+function hook_views_view_save($view) {
+ // Make a watchdog entry.
+ watchdog('views', 'The view @name was deleted by @user at @time', array('@name' => $view->name, '@user' => $GLOBALS['user']->name, '@time' => format_date(time())));
+}
+
+/**
+ * Allow modules to respond to a view being deleted or reverted.
+ */
+function hook_views_view_delete($view) {
+ // Make a watchdog entry.
+ watchdog('views', 'The view @name was deleted by @user at @time', array('@name' => $view->name, '@user' => $GLOBALS['user']->name, '@time' => format_date(time())));
+}
+
/**
* @}
*/
diff --git a/sites/all/modules/contrib/views/views/views.info b/sites/all/modules/contrib/views/views/views.info
index 87b01b98..0b425f17 100644
--- a/sites/all/modules/contrib/views/views/views.info
+++ b/sites/all/modules/contrib/views/views/views.info
@@ -27,9 +27,11 @@ files[] = handlers/views_handler_field.inc
files[] = handlers/views_handler_field_counter.inc
files[] = handlers/views_handler_field_boolean.inc
files[] = handlers/views_handler_field_contextual_links.inc
+files[] = handlers/views_handler_field_ctools_dropdown.inc
files[] = handlers/views_handler_field_custom.inc
files[] = handlers/views_handler_field_date.inc
files[] = handlers/views_handler_field_entity.inc
+files[] = handlers/views_handler_field_links.inc
files[] = handlers/views_handler_field_markup.inc
files[] = handlers/views_handler_field_math.inc
files[] = handlers/views_handler_field_numeric.inc
@@ -116,6 +118,7 @@ files[] = modules/locale/views_handler_field_locale_link_edit.inc
files[] = modules/locale/views_handler_filter_locale_group.inc
files[] = modules/locale/views_handler_filter_locale_language.inc
files[] = modules/locale/views_handler_filter_locale_version.inc
+files[] = modules/locale/views_handler_sort_node_language.inc
files[] = modules/node/views_handler_argument_dates_various.inc
files[] = modules/node/views_handler_argument_node_language.inc
files[] = modules/node/views_handler_argument_node_nid.inc
@@ -133,11 +136,14 @@ files[] = modules/node/views_handler_field_node_revision_link_delete.inc
files[] = modules/node/views_handler_field_node_revision_link_revert.inc
files[] = modules/node/views_handler_field_node_path.inc
files[] = modules/node/views_handler_field_node_type.inc
+files[] = modules/node/views_handler_field_node_version_count.inc
files[] = modules/node/views_handler_filter_history_user_timestamp.inc
files[] = modules/node/views_handler_filter_node_access.inc
files[] = modules/node/views_handler_filter_node_status.inc
files[] = modules/node/views_handler_filter_node_type.inc
files[] = modules/node/views_handler_filter_node_uid_revision.inc
+files[] = modules/node/views_handler_filter_node_version_count.inc
+files[] = modules/node/views_handler_sort_node_version_count.inc
files[] = modules/node/views_plugin_argument_default_node.inc
files[] = modules/node/views_plugin_argument_validate_node.inc
files[] = modules/node/views_plugin_row_node_rss.inc
@@ -151,6 +157,8 @@ files[] = modules/search/views_handler_filter_search.inc
files[] = modules/search/views_handler_sort_search_score.inc
files[] = modules/search/views_plugin_row_search_view.inc
files[] = modules/statistics/views_handler_field_accesslog_path.inc
+files[] = modules/statistics/views_handler_field_node_counter_timestamp.inc
+files[] = modules/statistics/views_handler_field_statistics_numeric.inc
files[] = modules/system/views_handler_argument_file_fid.inc
files[] = modules/system/views_handler_field_file.inc
files[] = modules/system/views_handler_field_file_extension.inc
@@ -161,6 +169,7 @@ files[] = modules/system/views_handler_filter_file_status.inc
files[] = modules/taxonomy/views_handler_argument_taxonomy.inc
files[] = modules/taxonomy/views_handler_argument_term_node_tid.inc
files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
+files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc
files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
files[] = modules/taxonomy/views_handler_argument_vocabulary_vid.inc
files[] = modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
@@ -169,6 +178,7 @@ files[] = modules/taxonomy/views_handler_field_term_node_tid.inc
files[] = modules/taxonomy/views_handler_field_term_link_edit.inc
files[] = modules/taxonomy/views_handler_filter_term_node_tid.inc
files[] = modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
+files[] = modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc
files[] = modules/taxonomy/views_handler_filter_vocabulary_vid.inc
files[] = modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
files[] = modules/taxonomy/views_handler_relationship_node_term_data.inc
@@ -318,9 +328,9 @@ files[] = tests/views_cache.test
files[] = tests/views_view.test
files[] = tests/views_ui.test
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2016-06-15
+version = "7.x-3.14"
core = "7.x"
project = "views"
-datestamp = "1423648085"
+datestamp = "1466019588"
diff --git a/sites/all/modules/contrib/views/views/views.install b/sites/all/modules/contrib/views/views/views.install
index b69f4105..ca10d69a 100644
--- a/sites/all/modules/contrib/views/views/views.install
+++ b/sites/all/modules/contrib/views/views/views.install
@@ -402,7 +402,7 @@ function views_update_6008() {
}
/**
- * Enlarge the views_display.display_options field to accomodate a larger set
+ * Enlarge the views_display.display_options field to accommodate a larger set
* of configurations (e. g. fields, filters, etc.) on a display.
*/
function views_schema_6009() {
@@ -631,3 +631,17 @@ function views_update_7301() {
);
db_change_field('views_view', 'name', 'name', $new_field);
}
+
+/**
+ * Remove headers field from cache tables
+ *
+ * @see system_update_7054().
+ */
+function views_update_7302() {
+ if (db_field_exists('cache_views', 'headers')) {
+ db_drop_field('cache_views', 'headers');
+ }
+ if (db_field_exists('cache_views_data', 'headers')) {
+ db_drop_field('cache_views_data', 'headers');
+ }
+}
diff --git a/sites/all/modules/contrib/views/views/views.module b/sites/all/modules/contrib/views/views/views.module
index 9cdcfb58..aab3812d 100644
--- a/sites/all/modules/contrib/views/views/views.module
+++ b/sites/all/modules/contrib/views/views/views.module
@@ -1020,8 +1020,21 @@ function views_access() {
* permissions. If the $account argument is omitted, the current user
* is used.
*/
-function views_check_perm($perm, $account = NULL) {
- return user_access($perm, $account) || user_access('access all views', $account);
+function views_check_perm($perms, $account = NULL) {
+ // Backward compatibility to ensure also a single permission string is
+ // properly processed.
+ $perms = is_array($perms) ? $perms : array($perms);
+ if (user_access('access all views', $account)) {
+ return TRUE;
+ }
+ // Perms are handled as OR, as soon one permission allows access TRUE is
+ // returned.
+ foreach ($perms as $perm) {
+ if (user_access($perm, $account)) {
+ return TRUE;
+ }
+ }
+ return FALSE;
}
/**
@@ -1298,7 +1311,7 @@ function views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE) {
* Either 'display', 'style' or 'row'
* @param $key
* For style plugins, this is an optional type to restrict to. May be 'normal',
- * 'summary', 'feed' or others based on the neds of the display.
+ * 'summary', 'feed' or others based on the needs of the display.
* @param $base
* An array of possible base tables.
*
@@ -2413,7 +2426,7 @@ function views_process_check_options($element, &$form_state) {
* Trim the field down to the specified length.
*
* @param $alter
- * - max_length: Maximum lenght of the string, the rest gets truncated.
+ * - max_length: Maximum length of the string, the rest gets truncated.
* - word_boundary: Trim only on a word boundary.
* - ellipsis: Show an ellipsis (...) at the end of the trimmed string.
* - html: Take sure that the html is correct.
diff --git a/sites/all/modules/contrib/views/views/views_ui.info b/sites/all/modules/contrib/views/views/views_ui.info
index d8be6e4d..cbe65b06 100644
--- a/sites/all/modules/contrib/views/views/views_ui.info
+++ b/sites/all/modules/contrib/views/views/views_ui.info
@@ -7,9 +7,9 @@ dependencies[] = views
files[] = views_ui.module
files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php
-; Information added by Drupal.org packaging script on 2015-02-11
-version = "7.x-3.10"
+; Information added by Drupal.org packaging script on 2016-06-15
+version = "7.x-3.14"
core = "7.x"
project = "views"
-datestamp = "1423648085"
+datestamp = "1466019588"
diff --git a/sites/all/modules/contrib/views/views/views_ui.module b/sites/all/modules/contrib/views/views/views_ui.module
index 5366f778..f35d099f 100644
--- a/sites/all/modules/contrib/views/views/views_ui.module
+++ b/sites/all/modules/contrib/views/views/views_ui.module
@@ -248,7 +248,7 @@ function views_ui_theme() {
}
/**
- * Impements hook_custom_theme()
+ * Implements hook_custom_theme().
*/
function views_ui_custom_theme() {
$theme = variable_get('views_ui_custom_theme', '_default');
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/LICENSE.txt b/sites/all/modules/contrib/views/views_bulk_operations/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc
index 7667e493..f0055274 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/archive.action.inc
@@ -18,6 +18,7 @@ function views_bulk_operations_archive_action_info() {
// "Create an advanced action" dropdown on admin/config/system/actions.
'configurable' => FALSE,
'vbo_configurable' => TRUE,
+ 'behavior' => array('views_property'),
'triggers' => array('any'),
);
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc
index add893ef..ad8fa9c4 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/book.action.inc
@@ -13,11 +13,13 @@ function views_bulk_operations_book_action_info() {
'label' => t('Move to book'),
'configurable' => TRUE,
'behavior' => array('changes_property'),
+ 'triggers' => array('any'),
);
$actions['views_bulk_operations_remove_from_book_action'] = array(
'type' => 'node',
'label' => t('Remove from book'),
'configurable' => FALSE,
+ 'triggers' => array('any'),
);
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc
index 1106ab04..52c72d2f 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/delete.action.inc
@@ -19,6 +19,7 @@ function views_bulk_operations_delete_action_info() {
'label' => t('Delete revision'),
'configurable' => FALSE,
'behavior' => array('deletes_property'),
+ 'triggers' => array('any'),
),
);
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc
index 71b6181c..301b17b2 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/modify.action.inc
@@ -82,6 +82,11 @@ function views_bulk_operations_modify_action($entity, $context) {
// The wrapper will automatically modify $entity itself.
$wrapper = entity_metadata_wrapper($context['entity_type'], $entity);
foreach ($context['selected']['properties'] as $key) {
+ if (!$wrapper->$key->access('update')) {
+ // No access.
+ continue;
+ }
+
if (in_array($key, $context['append']['properties'])) {
$old_values = $wrapper->$key->value();
$wrapper->$key->set($context['properties'][$key]);
@@ -134,7 +139,7 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
if (!empty($properties)) {
$form['properties'] = array(
'#type' => 'fieldset',
- '#title' => 'Properties',
+ '#title' => t('Properties'),
);
$form['properties']['show_value'] = array(
'#suffix' => '',
@@ -298,7 +303,7 @@ function views_bulk_operations_modify_action_form($context, &$form_state) {
$token_type = str_replace('_', '-', $entity_type);
$form['tokens'] = array(
'#type' => 'fieldset',
- '#title' => 'Available tokens',
+ '#title' => t('Available tokens'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
'#weight' => 998,
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc
index ea8e8ee1..147d2920 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_cancel.action.inc
@@ -10,6 +10,7 @@ function views_bulk_operations_user_cancel_action_info() {
'label' => t('Cancel user account'),
'configurable' => TRUE,
'behavior' => array('deletes_property'),
+ 'triggers' => array('any'),
));
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc
index 394597c3..616f13ce 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions/user_roles.action.inc
@@ -45,24 +45,19 @@ function views_bulk_operations_user_roles_action_submit($form, $form_state) {
);
}
-function views_bulk_operations_user_roles_action(&$user, $context) {
- $roles = $user->roles;
- $selected = (is_array($context['add_roles']) ? $context['add_roles'] : array()) +
- (is_array($context['remove_roles']) ? $context['remove_roles'] : array());
- $result = db_query("SELECT rid, name FROM {role} WHERE rid IN (:selected)", array(':selected' => array_keys($selected)));
- foreach ($result as $role) {
- if (isset($context['add_roles'][$role->rid])) {
- $add_roles[$role->rid] = $role->name;
- }
- if (isset($context['remove_roles'][$role->rid])) {
- $remove_roles[$role->rid] = $role->name;
- }
+function views_bulk_operations_user_roles_action($user, $context) {
+ $wrapper = entity_metadata_wrapper('user', $user);
+ if (!$wrapper->roles->access("update")) {
+ // No access.
+ return;
}
- if (!empty($add_roles)) {
- $roles += $add_roles;
+ $roles = $wrapper->roles->value();
+ if (is_array($context['add_roles'])) {
+ $roles = array_merge($roles, $context['add_roles']);
}
- if (!empty($remove_roles)) {
- $roles = array_diff($roles, $remove_roles);
+ if (is_array($context['remove_roles'])) {
+ $roles = array_diff($roles, $context['remove_roles']);
}
- user_save($user, array('roles' => $roles));
+ $wrapper->roles->set($roles);
+ $wrapper->save();
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info b/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info
index e57077b0..658d1adc 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info
+++ b/sites/all/modules/contrib/views/views_bulk_operations/actions_permissions.info
@@ -3,9 +3,9 @@ description = Provides permission-based access control for actions. Used by View
package = Administration
core = 7.x
-; Information added by Drupal.org packaging script on 2013-12-23
-version = "7.x-3.2"
+; Information added by Drupal.org packaging script on 2015-07-01
+version = "7.x-3.3"
core = "7.x"
project = "views_bulk_operations"
-datestamp = "1387798183"
+datestamp = "1435764542"
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js b/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js
index aeeecc6f..ca76df86 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js
+++ b/sites/all/modules/contrib/views/views_bulk_operations/js/views_bulk_operations.js
@@ -46,21 +46,23 @@
});
// Set up the ability to click anywhere on the row to select it.
- $('.views-table tbody tr', form).click(function(event) {
- if (event.target.tagName.toLowerCase() != 'input' && event.target.tagName.toLowerCase() != 'a') {
- $('input[id^="edit-views-bulk-operations"]:not(:disabled)', this).each(function() {
- var checked = this.checked;
- // trigger() toggles the checkmark *after* the event is set,
- // whereas manually clicking the checkbox toggles it *beforehand*.
- // that's why we manually set the checkmark first, then trigger the
- // event (so that listeners get notified), then re-set the checkmark
- // which the trigger will have toggled. yuck!
- this.checked = !checked;
- $(this).trigger('click');
- this.checked = !checked;
- });
- }
- });
+ if (Drupal.settings.vbo.row_clickable) {
+ $('.views-table tbody tr', form).click(function(event) {
+ if (event.target.tagName.toLowerCase() != 'input' && event.target.tagName.toLowerCase() != 'a') {
+ $('input[id^="edit-views-bulk-operations"]:not(:disabled)', this).each(function() {
+ var checked = this.checked;
+ // trigger() toggles the checkmark *after* the event is set,
+ // whereas manually clicking the checkbox toggles it *beforehand*.
+ // that's why we manually set the checkmark first, then trigger the
+ // event (so that listeners get notified), then re-set the checkmark
+ // which the trigger will have toggled. yuck!
+ this.checked = !checked;
+ $(this).trigger('click');
+ this.checked = !checked;
+ });
+ }
+ });
+ }
}
Drupal.vbo.tableSelectAllPages = function(form) {
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php
index c74d90c3..f3e60a30 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php
+++ b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/action.class.php
@@ -20,7 +20,7 @@ class ViewsBulkOperationsAction extends ViewsBulkOperationsBaseOperation {
*/
public function getAccessMask() {
// Assume edit by default.
- if (!isset($this->operationInfo['behavior'])) {
+ if (empty($this->operationInfo['behavior'])) {
$this->operationInfo['behavior'] = array('changes_property');
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php
index 624c850b..c40da8b2 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php
+++ b/sites/all/modules/contrib/views/views_bulk_operations/plugins/operation_types/rules_component.class.php
@@ -124,6 +124,8 @@ class ViewsBulkOperationsRulesComponent extends ViewsBulkOperationsBaseOperation
else {
$element = rules_action('component_' . $this->operationInfo['parameters']['component_key']);
}
- $element->execute($data);
+ $wrapper_type = is_array($data) ? "list<{$this->entityType}>" : $this->entityType;
+ $wrapper = entity_metadata_wrapper($wrapper_type, $data);
+ $element->execute($wrapper);
}
}
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc b/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
index 9bb983f7..61886d48 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views/views_bulk_operations_handler_field_operations.inc
@@ -55,6 +55,7 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
'contains' => array(
'display_type' => array('default' => 0),
'enable_select_all_pages' => array('default' => TRUE),
+ 'row_clickable' => array('default' => TRUE),
'force_single' => array('default' => FALSE),
'entity_load_capacity' => array('default' => 10),
'skip_batching' => array('default' => 0),
@@ -63,11 +64,26 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
$options['vbo_operations'] = array(
'default' => array(),
'unpack_translatable' => 'unpack_operations',
+ 'export' => 'export_vbo_operations',
);
return $options;
}
+ function export_vbo_operations($indent, $prefix, $storage, $option, $definition, $parents) {
+ // Anti-recursion, since we use the parent export helper.
+ unset($definition['export']);
+
+ // Find and remove all unselected/disabled operations.
+ foreach ($storage['vbo_operations'] as $operation_id => $operation) {
+ if (empty($operation['selected'])) {
+ unset($storage['vbo_operations'][$operation_id]);
+ }
+ }
+
+ return parent::export_option($indent, $prefix, $storage, $option, $definition, $parents);
+ }
+
function unpack_operations(&$translatable, $storage, $option, $definition, $parents, $keys) {
$translatable[] = array(
'value' => t('- Choose an operation -'),
@@ -107,6 +123,12 @@ class views_bulk_operations_handler_field_operations extends views_handler_field
'#default_value' => $this->options['vbo_settings']['enable_select_all_pages'],
'#description' => t('Check this box to enable the ability to select all items on all pages.'),
);
+ $form['vbo_settings']['row_clickable'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Make the whole row clickable'),
+ '#default_value' => $this->options['vbo_settings']['row_clickable'],
+ '#description' => t('Check this box to select an item when its row has been clicked. Requires JavaScript.'),
+ );
$form['vbo_settings']['force_single'] = array(
'#type' => 'checkbox',
'#title' => t('Force single'),
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info
index 2f03a14a..8fbdffaa 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.info
@@ -9,9 +9,9 @@ php = 5.2.9
files[] = plugins/operation_types/base.class.php
files[] = views/views_bulk_operations_handler_field_operations.inc
-; Information added by Drupal.org packaging script on 2013-12-23
-version = "7.x-3.2"
+; Information added by Drupal.org packaging script on 2015-07-01
+version = "7.x-3.3"
core = "7.x"
project = "views_bulk_operations"
-datestamp = "1387798183"
+datestamp = "1435764542"
diff --git a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module
index b25b661c..e74eeb1d 100644
--- a/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module
+++ b/sites/all/modules/contrib/views/views_bulk_operations/views_bulk_operations.module
@@ -41,21 +41,20 @@ function views_bulk_operations_load_action_includes() {
// The list of VBO actions is fairly static, so it's hardcoded for better
// performance (hitting the filesystem with file_scan_directory(), and then
// caching the result has its cost).
- $path = drupal_get_path('module', 'views_bulk_operations') . '/actions/';
$files = array(
- 'archive.action.inc',
- 'argument_selector.action.inc',
- 'book.action.inc',
- 'delete.action.inc',
- 'modify.action.inc',
- 'script.action.inc',
- 'user_roles.action.inc',
- 'user_cancel.action.inc',
+ 'archive.action',
+ 'argument_selector.action',
+ 'book.action',
+ 'delete.action',
+ 'modify.action',
+ 'script.action',
+ 'user_roles.action',
+ 'user_cancel.action',
);
if (!$loaded) {
foreach ($files as $file) {
- include_once $path . $file;
+ module_load_include('inc', 'views_bulk_operations', 'actions/' . $file);
}
$loaded = TRUE;
}
@@ -77,7 +76,7 @@ function views_bulk_operations_load_action_includes() {
function views_bulk_operations_cron() {
db_delete('queue')
->condition('name', db_like('views_bulk_operations_active_queue_'), 'LIKE')
- ->condition('created', REQUEST_TIME - 864000, '<')
+ ->condition('created', REQUEST_TIME - 86400, '<')
->execute();
}
@@ -358,7 +357,7 @@ function views_bulk_operations_form_alter(&$form, &$form_state, $form_id) {
*/
function views_bulk_operations_views_post_build(&$view) {
$vbo = _views_bulk_operations_get_field($view);
- if ($vbo && $vbo->get_selected_operations() < 1) {
+ if ($vbo && count($vbo->get_selected_operations()) < 1) {
$vbo->options['exclude'] = TRUE;
}
}
@@ -420,7 +419,7 @@ function theme_views_bulk_operations_select_all($variables) {
if ($enable_select_all_pages) {
$form['select_all']['or'] = array(
'#type' => 'markup',
- '#markup' => 'OR',
+ '#markup' => '' . t('OR') . '',
);
$form['select_all']['all_pages'] = array(
'#type' => 'checkbox',
@@ -443,6 +442,13 @@ function theme_views_bulk_operations_select_all($variables) {
*/
function views_bulk_operations_form($form, &$form_state, $vbo) {
$form['#attached']['js'][] = drupal_get_path('module', 'views_bulk_operations') . '/js/views_bulk_operations.js';
+ $form['#attached']['js'][] = array(
+ 'data' => array('vbo' => array(
+ 'row_clickable' => $vbo->get_vbo_option('row_clickable'),
+ )),
+ 'type' => 'setting',
+ );
+
$form['#attached']['css'][] = drupal_get_path('module', 'views_bulk_operations') . '/css/views_bulk_operations.css';
// Wrap the form in a div with specific classes for JS targeting and theming.
$class = 'vbo-views-form';
@@ -595,14 +601,23 @@ function views_bulk_operations_confirm_form($form, &$form_state, $view, $output)
$operation = $form_state['operation'];
$rows = $form_state['selection'];
$query = drupal_get_query_parameters($_GET, array('q'));
+ $title = t('Are you sure you want to perform %operation on the selected items?', array('%operation' => $operation->label()));
$form = confirm_form($form,
- t('Are you sure you want to perform %operation on the selected items?', array('%operation' => $operation->label())),
+ $title,
array('path' => $view->get_url(), 'query' => $query),
theme('views_bulk_operations_confirmation', array('rows' => $rows, 'vbo' => $vbo, 'operation' => $operation, 'select_all_pages' => $form_state['select_all_pages']))
);
// Add VBO's submit handler to the Confirm button added by config_form().
$form['actions']['submit']['#submit'] = array('views_bulk_operations_form_submit');
+ // We can't set the View title here as $view is just a copy of the original,
+ // and our settings changes won't "stick" for the first page load of the
+ // confirmation form. We also can't just call drupal_set_title() directly
+ // because our title will be clobbered by the actual View title later. So
+ // let's tuck the title away in the form for use later.
+ // @see views_bulk_operations_preprocess_views_view()
+ $form['#vbo_confirm_form_title'] = $title;
+
return $form;
}
@@ -618,7 +633,7 @@ function theme_views_bulk_operations_confirmation($variables) {
// Load the entities from the current page, and show their titles.
$entities = _views_bulk_operations_entity_load($entity_type, array_values($rows), $vbo->revision);
foreach ($entities as $entity) {
- $items[] = check_plain(_views_bulk_operations_entity_label($entity_type, $entity));
+ $items[] = check_plain(entity_label($entity_type, $entity));
}
// All rows on all pages have been selected, so show a count of additional items.
if ($select_all_pages) {
@@ -631,6 +646,29 @@ function theme_views_bulk_operations_confirmation($variables) {
return $output;
}
+/**
+ * Implements hook_preprocess_page().
+ *
+ * Hide action links on the configure and confirm pages.
+ */
+function views_bulk_operations_preprocess_page(&$variables) {
+ if (isset($_POST['select_all'], $_POST['operation'])) {
+ $variables['action_links'] = array();
+ }
+}
+
+/**
+ * Implements hook_preprocess_views_view().
+ */
+function views_bulk_operations_preprocess_views_view($variables) {
+ // If we've stored a title for the confirmation form, retrieve it here and
+ // retitle the View.
+ // @see views_bulk_operations_confirm_form()
+ if (array_key_exists('rows', $variables) && is_array($variables['rows']) && array_key_exists('#vbo_confirm_form_title', $variables['rows'])) {
+ $variables['view']->set_title($variables['rows']['#vbo_confirm_form_title']);
+ }
+}
+
/**
* Goes through the submitted values, and returns
* an array of selected rows, in the form of
@@ -871,7 +909,7 @@ function views_bulk_operations_adjust_selection($queue_name, $operation, $option
'views_row' => array(),
'position' => array(
'current' => ++$context['sandbox']['progress'],
- 'total' => $view->total_rows,
+ 'total' => $context['sandbox']['max'],
),
);
// Some operations require full selected rows.
@@ -1042,7 +1080,7 @@ function views_bulk_operations_queue_item_process($queue_item_data, &$log = NULL
$arguments = array(
'%operation' => $operation->label(),
'@type' => $entity_type,
- '%title' => _views_bulk_operations_entity_label($entity_type, $entity),
+ '%title' => entity_label($entity_type, $entity),
);
if ($log) {
@@ -1128,7 +1166,7 @@ function views_bulk_operations_direct_process($operation, $rows, $options) {
$context['results']['log'][] = t('Skipped %operation on @type %title due to insufficient permissions.', array(
'%operation' => $operation->label(),
'@type' => $entity_type,
- '%title' => _views_bulk_operations_entity_label($entity_type, $entity),
+ '%title' => entity_label($entity_type, $entity),
));
unset($entities[$id]);
}
@@ -1236,29 +1274,6 @@ function _views_bulk_operations_entity_load($entity_type, $ids, $revision = FALS
return $entities;
}
-/**
- * Label function for entities.
- * Core entities don't declare the "label" key, so entity_label() fails,
- * and a fallback is needed. This function provides that fallback.
- */
-function _views_bulk_operations_entity_label($entity_type, $entity) {
- $label = entity_label($entity_type, $entity);
- if (!$label) {
- $entity_info = entity_get_info($entity_type);
- $id_key = $entity_info['entity keys']['id'];
- // Many entity types (e.g. "user") have a name which fits the label perfectly.
- if (isset($entity->name)) {
- $label = $entity->name;
- }
- elseif (isset($entity->{$id_key})) {
- // Fallback to the id key.
- $label = $entity->{$id_key};
- }
- }
-
- return $label;
-}
-
/**
* Helper function to report an error.
*/
diff --git a/sites/all/modules/contrib/views/views_php/LICENSE.txt b/sites/all/modules/contrib/views/views_php/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/sites/all/modules/contrib/views/views_php/plugins/views/views_php_handler_field.inc b/sites/all/modules/contrib/views/views_php/plugins/views/views_php_handler_field.inc
index 9164d9a7..1da366b6 100644
--- a/sites/all/modules/contrib/views/views_php/plugins/views/views_php_handler_field.inc
+++ b/sites/all/modules/contrib/views/views_php/plugins/views/views_php_handler_field.inc
@@ -220,8 +220,13 @@ class views_php_handler_field extends views_handler_field {
$value = ob_get_clean();
}
else {
- $value = check_plain($values->{$this->field_alias});
+ if (isset($values->{$this->field_alias})) {
+ $value = check_plain($values->{$this->field_alias});
+ }
+ }
+
+ if (isset($value)) {
+ return $value;
}
- return $value;
}
}
diff --git a/sites/all/modules/contrib/views/views_php/views_php.info b/sites/all/modules/contrib/views/views_php/views_php.info
index d999ce1c..63fb2385 100644
--- a/sites/all/modules/contrib/views/views_php/views_php.info
+++ b/sites/all/modules/contrib/views/views_php/views_php.info
@@ -15,9 +15,9 @@ files[] = plugins/views/views_php_plugin_pager.inc
files[] = plugins/views/views_php_plugin_query.inc
files[] = plugins/views/views_php_plugin_wrapper.inc
-; Information added by Drupal.org packaging script on 2014-01-24
-version = "7.x-1.0-alpha1"
+; Information added by Drupal.org packaging script on 2015-11-13
+version = "7.x-1.0-alpha3"
core = "7.x"
project = "views_php"
-datestamp = "1390577427"
+datestamp = "1447386022"
diff --git a/sites/all/modules/contrib/views/views_php/views_php.module b/sites/all/modules/contrib/views/views_php/views_php.module
index aee59716..d2fa27d1 100644
--- a/sites/all/modules/contrib/views/views_php/views_php.module
+++ b/sites/all/modules/contrib/views/views_php/views_php.module
@@ -148,3 +148,13 @@ function views_php_views_post_execute($view) {
$view->query->php_unwrap();
}
}
+
+/**
+ * Implements hook_views_post_build().
+ */
+function views_php_views_post_build($view) {
+ // Clear the limit and offset
+ if (!empty($view->views_php) && !empty($view->build_info['query']) && is_object($view->build_info['query'])) {
+ $view->build_info['query']->range();
+ }
+}
diff --git a/sites/all/modules/features/admin/admin.features.filter.inc b/sites/all/modules/features/admin/admin.features.filter.inc
index 2971863b..c72dc9cd 100644
--- a/sites/all/modules/features/admin/admin.features.filter.inc
+++ b/sites/all/modules/features/admin/admin.features.filter.inc
@@ -36,6 +36,47 @@ function admin_filter_default_formats() {
'video_filter_autoplay' => 0,
'video_filter_related' => 1,
'video_filter_html5' => 1,
+ 'video_filter_codecs' => array(
+ 'archive' => 'Archive.org',
+ 'bliptv' => 'Blip.tv',
+ 'candidcareer' => 'Candid Career',
+ 'capped' => 'Capped',
+ 'collegehumor' => 'College Humor',
+ 'coub' => 'Coub',
+ 'dailymotion' => 'DailyMotion',
+ 'democracynow_fullshow' => 'DemocracyNow Fullshow',
+ 'democracynow_story' => 'DemocracyNow Story',
+ 'flickr_slideshows' => 'Flickr Slideshows',
+ 'flickr_video' => 'Flickr Video',
+ 'foxnews' => 'Fox News',
+ 'gametrailers' => 'Game Trailers',
+ 'gamevideos' => 'Game Videos',
+ 'giphy' => 'Giphy',
+ 'godtube' => 'GodTube',
+ 'google' => 'Google Video',
+ 'instagram' => 'Instagram',
+ 'metacafe' => 'Meta Cafe',
+ 'mailru' => 'Mail.Ru',
+ 'myspace' => 'MySpace',
+ 'myvideo' => 'MyVideo',
+ 'picasa_slideshows' => 'Picasa Slideshows',
+ 'rutube' => 'Rutube',
+ 'slideshare' => 'Slideshare',
+ 'streamhoster' => 'Streamhoster',
+ 'teachertube' => 'Teachertube',
+ 'ted' => 'TED',
+ 'twitch' => 'Twitch',
+ 'ustream' => 'Ustream',
+ 'vbox' => 'Vbox7',
+ 'vimeo' => 'Vimeo',
+ 'vine' => 'Vine',
+ 'whatchado' => 'whatchado',
+ 'wistia' => 'Wistia',
+ 'youku' => 'YouKu',
+ 'youtube' => 'YouTube',
+ 'youtube_playlist' => 'YouTube (Playlist)',
+ ),
+ 'video_filter_multiple_sources' => TRUE,
),
),
'filter_url' => array(
diff --git a/sites/all/modules/features/admin/admin.features.user_permission.inc b/sites/all/modules/features/admin/admin.features.user_permission.inc
index 12c9400a..657524e7 100644
--- a/sites/all/modules/features/admin/admin.features.user_permission.inc
+++ b/sites/all/modules/features/admin/admin.features.user_permission.inc
@@ -48,24 +48,6 @@ function admin_user_default_permissions() {
'module' => 'views',
);
- // Exported permission: 'access backup and migrate'.
- $permissions['access backup and migrate'] = array(
- 'name' => 'access backup and migrate',
- 'roles' => array(
- 'root' => 'root',
- ),
- 'module' => 'backup_migrate',
- );
-
- // Exported permission: 'access backup files'.
- $permissions['access backup files'] = array(
- 'name' => 'access backup files',
- 'roles' => array(
- 'root' => 'root',
- ),
- 'module' => 'backup_migrate',
- );
-
// Exported permission: 'access content'.
$permissions['access content'] = array(
'name' => 'access content',
@@ -168,15 +150,6 @@ function admin_user_default_permissions() {
'module' => 'system',
);
- // Exported permission: 'administer backup and migrate'.
- $permissions['administer backup and migrate'] = array(
- 'name' => 'administer backup and migrate',
- 'roles' => array(
- 'root' => 'root',
- ),
- 'module' => 'backup_migrate',
- );
-
// Exported permission: 'administer blocks'.
$permissions['administer blocks'] = array(
'name' => 'administer blocks',
@@ -582,15 +555,6 @@ function admin_user_default_permissions() {
'module' => 'shortcut',
);
- // Exported permission: 'delete backup files'.
- $permissions['delete backup files'] = array(
- 'name' => 'delete backup files',
- 'roles' => array(
- 'root' => 'root',
- ),
- 'module' => 'backup_migrate',
- );
-
// Exported permission: 'delete revisions'.
$permissions['delete revisions'] = array(
'name' => 'delete revisions',
@@ -728,15 +692,6 @@ function admin_user_default_permissions() {
'module' => 'workflow_admin_ui',
);
- // Exported permission: 'perform backup'.
- $permissions['perform backup'] = array(
- 'name' => 'perform backup',
- 'roles' => array(
- 'root' => 'root',
- ),
- 'module' => 'backup_migrate',
- );
-
// Exported permission: 'rename features'.
$permissions['rename features'] = array(
'name' => 'rename features',
@@ -744,15 +699,6 @@ function admin_user_default_permissions() {
'module' => 'features',
);
- // Exported permission: 'restore from backup'.
- $permissions['restore from backup'] = array(
- 'name' => 'restore from backup',
- 'roles' => array(
- 'root' => 'root',
- ),
- 'module' => 'backup_migrate',
- );
-
// Exported permission: 'revert revisions'.
$permissions['revert revisions'] = array(
'name' => 'revert revisions',
diff --git a/sites/all/modules/features/admin/admin.features.wysiwyg.inc b/sites/all/modules/features/admin/admin.features.wysiwyg.inc
index fa91c5d4..4af32c12 100644
--- a/sites/all/modules/features/admin/admin.features.wysiwyg.inc
+++ b/sites/all/modules/features/admin/admin.features.wysiwyg.inc
@@ -15,9 +15,6 @@ function admin_wysiwyg_default_profiles() {
'format' => 'filtred_html',
'editor' => 'tinymce',
'settings' => array(
- 'default' => 1,
- 'user_choose' => 0,
- 'show_toggle' => 1,
'theme' => 'advanced',
'language' => 'en',
'buttons' => array(
@@ -35,6 +32,7 @@ function admin_wysiwyg_default_profiles() {
'cut' => 1,
'copy' => 1,
'paste' => 1,
+ 'formatselect' => 1,
),
'advimage' => array(
'advimage' => 1,
@@ -42,9 +40,7 @@ function admin_wysiwyg_default_profiles() {
'advlink' => array(
'advlink' => 1,
),
- 'font' => array(
- 'formatselect' => 1,
- ),
+ 'font' => array(),
'fullscreen' => array(
'fullscreen' => 1,
),
@@ -68,22 +64,30 @@ function admin_wysiwyg_default_profiles() {
'break' => 1,
),
),
- 'toolbar_loc' => 'top',
- 'toolbar_align' => 'left',
- 'path_loc' => 'bottom',
- 'resizing' => 1,
'verify_html' => 1,
'preformatted' => 0,
'convert_fonts_to_spans' => 1,
'remove_linebreaks' => 1,
'apply_source_formatting' => 0,
'paste_auto_cleanup_on_paste' => 1,
- 'block_formats' => 'h2,h3,h4,h5,h6',
'css_setting' => 'theme',
'css_path' => '',
- 'css_classes' => '',
'buttonorder' => 'fullscreen,separator,bold,italic,underline,separator,formatselect,separator,bullist,numlist,advlist,separator,link,advlink,unlink,separator,image,advimage,video_filter,separator,cut,copy,paste,pastetext,search,replace,wordcount,separator,undo,redo,separator,break',
+ 'theme_advanced_statusbar_location' => 'bottom',
+ 'theme_advanced_toolbar_location' => 'top',
+ 'theme_advanced_toolbar_align' => 'left',
+ 'theme_advanced_blockformats' => 'h2,h3,h4,h5,h6',
+ 'theme_advanced_styles' => '',
+ 'theme_advanced_resizing' => 1,
),
+ 'preferences' => array(
+ 'add_to_summaries' => NULL,
+ 'default' => 1,
+ 'show_toggle' => 1,
+ 'user_choose' => 0,
+ 'version' => '3.5.7',
+ ),
+ 'name' => 'formatfiltred_html',
);
return $profiles;
diff --git a/sites/all/modules/features/admin/admin.info b/sites/all/modules/features/admin/admin.info
index a7ab3487..256aa59e 100644
--- a/sites/all/modules/features/admin/admin.info
+++ b/sites/all/modules/features/admin/admin.info
@@ -1,12 +1,11 @@
name = Admin
core = 7.x
-package = GUI
+package = FigLi
dependencies[] = admin_menu
dependencies[] = admin_menu_source
dependencies[] = admin_theme
dependencies[] = adminimal_admin_menu
dependencies[] = auto_nodetitle
-dependencies[] = backup_migrate
dependencies[] = block
dependencies[] = content_type_extras
dependencies[] = context_ui
@@ -72,8 +71,6 @@ features[user_permission][] = access admin theme
features[user_permission][] = access administration menu
features[user_permission][] = access administration pages
features[user_permission][] = access all views
-features[user_permission][] = access backup and migrate
-features[user_permission][] = access backup files
features[user_permission][] = access content
features[user_permission][] = access content overview
features[user_permission][] = access devel information
@@ -85,7 +82,6 @@ features[user_permission][] = access user profiles
features[user_permission][] = access workflow summary views
features[user_permission][] = admin queue_ui
features[user_permission][] = administer actions
-features[user_permission][] = administer backup and migrate
features[user_permission][] = administer blocks
features[user_permission][] = administer content type defaults
features[user_permission][] = administer content types
@@ -131,7 +127,6 @@ features[user_permission][] = cancel account
features[user_permission][] = change own username
features[user_permission][] = create url aliases
features[user_permission][] = customize shortcut links
-features[user_permission][] = delete backup files
features[user_permission][] = delete revisions
features[user_permission][] = display drupal links
features[user_permission][] = execute php code
@@ -147,9 +142,7 @@ features[user_permission][] = menu edit user-menu
features[user_permission][] = notify of path changes
features[user_permission][] = override content type title display
features[user_permission][] = participate in workflow
-features[user_permission][] = perform backup
features[user_permission][] = rename features
-features[user_permission][] = restore from backup
features[user_permission][] = revert revisions
features[user_permission][] = schedule workflow transitions
features[user_permission][] = select account cancellation method
@@ -324,4 +317,5 @@ features[views_view][] = admin_contents
features[workflow][] = Publication
features[workflow_access][] = Publication
features[wysiwyg][] = filtred_html
+features_exclude[dependencies][backup_migrate] = backup_migrate
project path = sites/all/modules/features
diff --git a/sites/all/modules/features/admin/admin.strongarm.inc b/sites/all/modules/features/admin/admin.strongarm.inc
index 66edaa3f..44ba5706 100644
--- a/sites/all/modules/features/admin/admin.strongarm.inc
+++ b/sites/all/modules/features/admin/admin.strongarm.inc
@@ -530,7 +530,7 @@ function admin_strongarm() {
$strongarm->api_version = 1;
$strongarm->name = 'footer_message_msg';
$strongarm->value = array(
- 'value' => '
g.u.i. | 2 rue de la réunion, 75020 Paris | contact@g-u-i.net | 09 51 93 83 43
', + 'value' => 'clameurs
', 'format' => 'filtred_html', ); $export['footer_message_msg'] = $strongarm; @@ -1042,7 +1042,7 @@ function admin_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'site_name'; - $strongarm->value = 'Drupal base 7'; + $strongarm->value = 'Clameurs'; $export['site_name'] = $strongarm; $strongarm = new stdClass(); @@ -1056,7 +1056,7 @@ function admin_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'site_slogan'; - $strongarm->value = 'drupal7 starter base profile by www.g-u-i.net'; + $strongarm->value = 'La websérie habitée par Laudato si\''; $export['site_slogan'] = $strongarm; $strongarm = new stdClass(); @@ -1141,7 +1141,7 @@ function admin_strongarm() { $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; $strongarm->name = 'theme_default'; - $strongarm->value = 'inigui'; + $strongarm->value = 'clameurs'; $export['theme_default'] = $strongarm; $strongarm = new stdClass(); diff --git a/sites/all/modules/features/admin/admin.views_default.inc b/sites/all/modules/features/admin/admin.views_default.inc index bd79e620..8259d966 100644 --- a/sites/all/modules/features/admin/admin.views_default.inc +++ b/sites/all/modules/features/admin/admin.views_default.inc @@ -137,13 +137,6 @@ function admin_views_default_views() { $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0; $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10'; $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array( - 'action::node_assign_owner_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), 'action::node_unpublish_action' => array( 'selected' => 1, 'skip_confirmation' => 0, @@ -151,50 +144,6 @@ function admin_views_default_views() { 'label' => '', 'postpone_processing' => 0, ), - 'action::node_unpublish_by_keyword_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - 'action::node_save_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - 'action::system_send_email_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - 'action::views_bulk_operations_script_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - 'action::views_bulk_operations_argument_selector_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'settings' => array( - 'url' => '', - ), - ), - 'action::node_promote_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), 'action::node_publish_action' => array( 'selected' => 1, 'skip_confirmation' => 0, @@ -202,34 +151,6 @@ function admin_views_default_views() { 'label' => '', 'postpone_processing' => 0, ), - 'action::node_unpromote_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - 'action::node_make_unsticky_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - 'action::views_bulk_operations_delete_item' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), - 'action::node_make_sticky_action' => array( - 'selected' => 0, - 'skip_confirmation' => 0, - 'override_label' => 0, - 'label' => '', - 'postpone_processing' => 0, - ), ); /* Champ: Contenu : Type */ $handler->display->display_options['fields']['type']['id'] = 'type'; diff --git a/sites/all/modules/features/page/page.features.field_base.inc b/sites/all/modules/features/page/page.features.field_base.inc index cf42da7d..828422a4 100644 --- a/sites/all/modules/features/page/page.features.field_base.inc +++ b/sites/all/modules/features/page/page.features.field_base.inc @@ -10,7 +10,7 @@ function page_field_default_field_bases() { $field_bases = array(); - // Exported field_base: 'body' + // Exported field_base: 'body'. $field_bases['body'] = array( 'active' => 1, 'cardinality' => 1, @@ -19,14 +19,6 @@ function page_field_default_field_bases() { 0 => 'node', ), 'field_name' => 'body', - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', diff --git a/sites/all/modules/features/page/page.features.field_instance.inc b/sites/all/modules/features/page/page.features.field_instance.inc index 6fd6064b..38052109 100644 --- a/sites/all/modules/features/page/page.features.field_instance.inc +++ b/sites/all/modules/features/page/page.features.field_instance.inc @@ -10,7 +10,7 @@ function page_field_default_field_instances() { $field_instances = array(); - // Exported field_instance: 'node-page-body' + // Exported field_instance: 'node-page-body'. $field_instances['node-page-body'] = array( 'bundle' => 'page', 'default_value' => NULL, diff --git a/sites/all/modules/features/page/page.info b/sites/all/modules/features/page/page.info index 8a3e2a0c..5e66a8a0 100644 --- a/sites/all/modules/features/page/page.info +++ b/sites/all/modules/features/page/page.info @@ -1,6 +1,6 @@ name = Page core = 7.x -package = GUI +package = FigLi dependencies[] = ctools dependencies[] = features dependencies[] = node diff --git a/sites/all/themes/contrid/adminimal_theme/adminimal.info b/sites/all/themes/contrid/adminimal_theme/adminimal.info index 95cf268c..0de3e836 100644 --- a/sites/all/themes/contrid/adminimal_theme/adminimal.info +++ b/sites/all/themes/contrid/adminimal_theme/adminimal.info @@ -1,14 +1,20 @@ name = Adminimal -description = A simple one-column, tableless, minimalist administration theme. +description = Minimalist administration theme. core = 7.x scripts[] = js/jRespond.js scripts[] = js/adminimal_theme.js settings[shortcut_module_link] = 1 +settings[style_checkboxes] = 1 settings[display_icons_config] = 1 +settings[rounded_buttons] = 1 +settings[sticky_actions] = 0 +settings[avoid_custom_font] = 0 +settings[adminimal_ckeditor] = 1 settings[custom_css] = 0 settings[use_custom_media_queries] = 0 settings[media_query_mobile] = only screen and (max-width: 480px) settings[media_query_tablet] = only screen and (min-width : 481px) and (max-width : 1024px) +regions[hidden] = Hidden regions[content_before] = Before Content regions[sidebar_left] = Sidebar Left regions[content] = Content @@ -17,12 +23,10 @@ regions[content_after] = After Content regions[help] = Help regions[page_top] = Page top regions[page_bottom] = Page bottom -regions[sidebar_first] = First sidebar -regions_hidden[] = sidebar_first -; Information added by Drupal.org packaging script on 2015-01-28 -version = "7.x-1.20" +; Information added by Drupal.org packaging script on 2016-02-23 +version = "7.x-1.24" core = "7.x" project = "adminimal_theme" -datestamp = "1422442296" +datestamp = "1456190957" diff --git a/sites/all/themes/contrid/adminimal_theme/css/avoid_custom_font.css b/sites/all/themes/contrid/adminimal_theme/css/avoid_custom_font.css new file mode 100644 index 00000000..12626067 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/css/avoid_custom_font.css @@ -0,0 +1,3 @@ +body.adminimal-theme * { + font-family: "Segoe UI", "Helvetica", sans-serif !important; +} diff --git a/sites/all/themes/contrid/adminimal_theme/css/ckeditor-adminimal.css b/sites/all/themes/contrid/adminimal_theme/css/ckeditor-adminimal.css new file mode 100644 index 00000000..f8b9a779 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/css/ckeditor-adminimal.css @@ -0,0 +1,220 @@ +/* Ckeditor Styling */ + +body.adminimal-theme .cke_reset_all,body.adminimal-theme .cke_reset_all * { + border-radius: 0; + font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; + text-shadow: none; +} + +body.adminimal-theme .ckeditor_links { + border-left: 1px solid #DDDDDD; + border-right: 1px solid #DDDDDD; + display: block; + padding: 10px; + width: auto; +} + +body.adminimal-theme .ckeditor_links:hover { + background: #eee; + text-decoration: none; +} + +body.adminimal-theme .cke_chrome { + box-shadow: none; +} + +body.adminimal-theme .cke_top { + background: #eee; +} + +body.adminimal-theme .cke_toolgroup { + background: #fff; + border: 1px solid #ccc; +} + + +body.adminimal-theme .cke_combo_button { + background: #fff; + border: 1px solid #ccc; +} + +body.adminimal-theme .cke_combo_off a.cke_combo_button:hover { + background: #fff; + border: 1px solid #0074BD; +} + +body.adminimal-theme .cke_button_on { + background: #fff; + box-shadow: 0px 3px 0px #0074BD; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} + +body.adminimal-theme .cke_button_on:hover { + box-shadow: 0px 3px 0px #0074BD; +} + +body.adminimal-theme .cke_bottom { + background: #eee; +} + +body.adminimal-theme .cke_combo_off a.cke_combo_button:active,body.adminimal-theme .cke_combo_on a.cke_combo_button { + border: 1px solid #0074BD; + border-bottom-width: 3px; + background: #fff; + box-shadow: none; +} + +body.adminimal-theme a.cke_button_on:hover, +body.adminimal-theme a.cke_button_on:focus, +body.adminimal-theme a.cke_button_on:active, +body.adminimal-theme .cke_button:first-child, +body.adminimal-theme .cke_button:last-child { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} + +body.adminimal-theme a.cke_button_off:hover, +body.adminimal-theme a.cke_button_off:focus, a.cke_button_off:active, +body.adminimal-theme a.cke_button_disabled:hover, +body.adminimal-theme a.cke_button_disabled:focus, +body.adminimal-theme a.cke_button_disabled:active { + background: #eee; + box-shadow: none; + border-color: #0074BD; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} + +body.adminimal-theme .cke_reset_all label { + display: inline-block; + margin-top: 5px; + padding-bottom: 2px; + position: relative; +} + +body.adminimal-theme .cke_dialog_body label.cke_required { + font-weight: normal; +} + +body.adminimal-theme .cke_reset_all .cke_dialog_body { + font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; + border: 1px solid #CCCCCC; +} + +body.adminimal-theme .cke_reset_all fieldset { + border: 1px solid #DDDDDD; + border-top: 3px solid #0074BD; + padding: 10px; +} + +body.adminimal-theme .cke_reset_all legend { + font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; + font-size: 18px; + font-weight: 100; + padding: 0 0.5em; +} + +body.adminimal-theme .cke_combopanel { + height: 170px; + width: 170px; + border: 1px solid #DDDDDD; + margin-top: 3px; +} + +body.adminimal-theme .cke_dialog_footer { + background: #eee; +} + +body.adminimal-theme a.cke_dialog_tab:hover { + text-decoration: none; + background: #fff; + color: #0074BD; +} + +body.adminimal-theme select.cke_dialog_ui_input_select { + box-shadow: none; +} + +body.adminimal-theme input.cke_dialog_ui_input_text, +body.adminimal-theme input.cke_dialog_ui_input_password, +body.adminimal-theme textarea.cke_dialog_ui_input_textarea { + box-shadow: none; + border-color: #CCCCCC; +} + +body.adminimal-theme .cke_dialog_title { + background: #333333; + border-bottom: none; + border-radius: 0; + box-shadow: none; + color: #FFFFFF; + font-size: 18px; + text-shadow: none; +} + +body.adminimal-theme .cke_dialog_ui_vbox_child label { + top: -2px; +} + +body.adminimal-theme input.cke_dialog_ui_input_text:focus, +body.adminimal-theme input.cke_dialog_ui_input_password:focus, +body.adminimal-theme textarea.cke_dialog_ui_input_textarea:focus, +body.adminimal-theme select.cke_dialog_ui_input_select:focus { + border-color: #0074BD; +} + +body.adminimal-theme a.cke_dialog_ui_button:focus, +body.adminimal-theme a.cke_dialog_ui_button:hover, +body.adminimal-theme a.cke_dialog_ui_button:active { + border-color: #0074BD; + box-shadow: none; + text-decoration: none; + color: #fff; + background: #0074BD; +} + +body.adminimal-theme a.cke_dialog_ui_button { + background: #eee; + padding: 4px 0; +} + +body.adminimal-theme a.cke_dialog_ui_button:focus span, +body.adminimal-theme a.cke_dialog_ui_button:hover span, +body.adminimal-theme a.cke_dialog_ui_button:active span { + color: #fff; +} + +body.adminimal-theme .cke_ltr .cke_dialog_close_button { + background: url("images/x-white.png") scroll no-repeat 50% 2px #B73939; + right: 10px; + top: 1px; + width: 45px; +} + +body.adminimal-theme .cke_ltr .cke_dialog_close_button:hover { + background-color: #e55454; +} + +body.adminimal-theme a.cke_dialog_ui_button_ok { + background: #4D8F46; + border-color: #4D8F46; + box-shadow: none; +} + +body.adminimal-theme a.cke_dialog_ui_button_ok:hover { + background: #0A6700; + border-color: #0A6700; +} + +body.adminimal-theme a.cke_path_item:hover, body.adminimal-theme a.cke_path_item:focus, body.adminimal-theme a.cke_path_item:active { + border-radius: 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + box-shadow: none; + text-decoration:none; + text-shadow: none; +} diff --git a/sites/all/themes/contrid/adminimal_theme/css/homebox_custom.css b/sites/all/themes/contrid/adminimal_theme/css/homebox_custom.css new file mode 100644 index 00000000..bbac2c19 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/css/homebox_custom.css @@ -0,0 +1,85 @@ +/* +* @file +* Includes style for homebox module boxes +* +* Includes proper styling for homebox module when enabled. Includes style for boxes +* and icons for the box actions +*/ + +#homebox-buttons { + margin: 20px 0 10px; +} +#homebox-buttons a { + padding: 0px 20px; + font-family: "Helvetica", sans-serif; + font-size: 14px; + font-weight: bold; + background: #fff; + line-height: 30px; + border: 2px solid #0074BD; + margin: 5px auto; + border-radius: 100px; + display: inline-block; + transition: all, 0.3s; +} +#homebox-buttons a:hover { + text-decoration: none; + background: #0074BD; + color: #fff; +} + +#homebox .homebox-column { + background: transparent; +} + +#homebox .homebox-portlet { + border: none; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); + margin-bottom: 15px; +} +#homebox .homebox-portlet .portlet-header { + font-size: 15px; + padding: 8px 13px; + background-color: #F3F4EE; + color: #333; +} + +/* Just some support for views on homebox portlets */ +#homebox .homebox-portlet .view .view-footer{ + padding: 5px; +} + +/* +* Material style +*/ +body.adminimal-skin-material #homebox-buttons a { + text-transform: uppercase; + font-weight: 500; + font-size: 15px; + background: #2196f3; + border: none; + color: #FFFFFF; + padding: 3px 20px 2px; + border-radius: 3px; + display: inline-block; +} +body.adminimal-skin-material #homebox-buttons a:hover { + background: #29B6F6; + text-decoration: none; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.45); +} + +body.adminimal-skin-material #homebox .homebox-portlet { + border: none; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.18); + background: #fff; + border-radius: 3px; +} +body.adminimal-skin-material #homebox .homebox-portlet-inner { + border: none; +} +body.adminimal-skin-material #homebox .homebox-portlet .portlet-header { + font-family: Roboto, sans-serif; + font-size: 15px; + font-weight: 500; +} diff --git a/sites/all/themes/contrid/adminimal_theme/css/mobile.css b/sites/all/themes/contrid/adminimal_theme/css/mobile.css index a008d623..272881d7 100644 --- a/sites/all/themes/contrid/adminimal_theme/css/mobile.css +++ b/sites/all/themes/contrid/adminimal_theme/css/mobile.css @@ -45,6 +45,10 @@ ul.primary li { width: 100%; } +body.adminimal-theme #navigation ul.primary li:first-of-type { + margin-left: 0; +} + body.adminimal-theme ul.primary li a:active, body.adminimal-theme ul.primary li a:link, body.adminimal-theme ul.primary li a:visited { border: 0 none; display: block; @@ -96,7 +100,7 @@ body.adminimal-theme div.admin .right, body.adminimal-theme div.admin .left { .exposed-filters .form-select { clear: both; margin-bottom: 10px; - width: 100%; + width: auto; } .views-exposed-form label { @@ -258,3 +262,11 @@ html.js .adminimal-theme #module-filter-show-wrapper .form-item { .adminimal-theme #module-filter-tabs.top-fixed{ position: relative; } + +.adminimal-theme #dashboard div#dashboard_sidebar { + width: 100%; +} + +.container-inline.form-actions.form-wrapper { + clear: both; +} diff --git a/sites/all/themes/contrid/adminimal_theme/css/style.css b/sites/all/themes/contrid/adminimal_theme/css/style.css index 4051e4ad..c1bde06d 100644 --- a/sites/all/themes/contrid/adminimal_theme/css/style.css +++ b/sites/all/themes/contrid/adminimal_theme/css/style.css @@ -26,12 +26,16 @@ body.adminimal-theme * { -moz-box-sizing: inherit; -webkit-box-sizing: inherit; box-sizing: inherit; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } body { color: #000; background: #fff; font:normal 13px/1.538em Open Sans, "Segoe UI", "Helvetica", sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } a { @@ -189,11 +193,6 @@ pre { white-space: pre-wrap; } -strong { - font-family: Arial, Helvetica, sans-serif !important; - font-weight: bold !important; -} - /** * Skip link. */ @@ -364,7 +363,7 @@ ul.primary li.active a,ul.primary li.active a.active,ul.primary li.active a:acti border-top: 3px solid #0074BD; margin-top: -3px; color: #333; - box-shadow: 0px 0px 8px rgba(0,0,0,0.2); + box-shadow: 0px 0px 3px rgba(0,0,0,0.2); position: relative; } @@ -408,6 +407,7 @@ ul.secondary li a { display: inline-block; color: #777; border-bottom: 1px solid #EBEBEB; + transition: all, 0.3s; } ul.secondary li a,ul.secondary li a:hover,ul.secondary li.active a,ul.secondary li.active a.active { @@ -588,6 +588,7 @@ tr.even,tr.odd { border-style: solid; border-color: #ddd; background: #f3f4ee; + transition: all, 0.15s; } tr.odd { @@ -676,14 +677,15 @@ table.system-status-report tr.warning { /* Fieldsets */ fieldset { border: solid 1px #ddd; - border-top: 3px solid #0074BD; + border-top: none; + box-shadow: 0px -3px 0 #0074BD; padding: 12px; margin: 0 0 20px; } fieldset legend { background: white; - padding: 0 3px; + padding: 0 6px; margin: 0; margin-left: -3px; font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; @@ -713,12 +715,22 @@ fieldset legend { padding-bottom: 0; } -.form-item label, .exposed-filters .form-item label { +.form-item label { font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; font-size: 20px; font-weight: 300; margin: 0; - margin: 0 0 10px; + margin: 0px 0px 4px; + line-height: 1.4; + width: initial; +} + +.exposed-filters .form-item label { + font-family: sans-serif; + font-size: 16px; + font-weight: 600; + margin: 0; + margin: 0px 0px 4px; line-height: 1.4; width: initial; } @@ -752,6 +764,7 @@ input.empty { /* Filter */ .filter-wrapper { border-top: 0; + box-shadow: none; padding: 10px 2px; } @@ -786,7 +799,9 @@ ul.tips li { } body div.form-type-radio div.description,body div.form-type-checkbox div.description { - margin-left: 1.5em;/* LTR */ + margin-left: 25px;/* LTR */ + color: #949494; + margin-top: 0; } a.button:link,a.button:visited,a.button:hover,a.button:active { @@ -808,26 +823,27 @@ input.form-autocomplete,input.form-text,input.form-file,textarea.form-textarea,s color: #333; vertical-align: baseline; box-sizing: inherit; + outline: 2px solid transparent; + outline-offset: 0px; + transition: all, 0.1s; } /* Fix webkit select on OS X see issue #2351221 */ @media screen and (-webkit-min-device-pixel-ratio:0) { input.form-autocomplete,input.form-text,input.form-file,textarea.form-textarea,select.form-select { -webkit-appearance: none; - -webkit-padding-start: 5px; + -webkit-padding-start: 8px; -webkit-padding-end: 16px; -webkit-padding-before: 5px; -webkit-padding-after: 5px; + border-radius: 0; + min-height: 16px; } input.form-autocomplete, select.form-select { background: url('images/select-arrow.svg') no-repeat right 50% #fff; } } -#module-filter-modules { - min-height: 0 !important; -} - input#edit-module-filter-name { background: transparent; border:none; @@ -927,7 +943,7 @@ html.js .toggle-enable.disabled div { } html.js .toggle-enable div { - border-radius: 0 !important; + border-radius: 0 !important; background: #fff; } @@ -965,9 +981,10 @@ html.js input.throbbing { } ul.action-links { - margin: 0 0 20px; + margin: 20px 0 10px; + list-style-type: none; + display: inline-block; list-style-type: none; - overflow: hidden; } ul.action-links li { @@ -977,7 +994,7 @@ ul.action-links li { ul.action-links a { padding-left: 15px;/* LTR */ - font: "Open Sans", "Segoe UI", "Helvetica", sans-serif; + font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; font-size: 23px; font-weight: 300; background: transparent url(../images/add.png) no-repeat 0 center; @@ -1163,7 +1180,7 @@ div.breadcrumb a:hover { .overlay #page { margin: 0; - padding: 0 20px; + padding: 20px 20px; } .overlay #branding div.breadcrumb { @@ -1275,8 +1292,8 @@ div.add-or-remove-shortcuts { #dashboard div.block h2 { margin: 0; - font-size: 1em; - padding: 3px 10px; + font-size: 23px; + padding: 10px 0; } #dashboard div.block div.content { @@ -1295,6 +1312,12 @@ div.add-or-remove-shortcuts { #field-display-overview input.field-formatter-settings-edit { margin: 0; padding: 1px 8px; + background-color: transparent; +} + +#field-display-overview input.field-formatter-settings-edit:focus, +#field-display-overview input.field-formatter-settings-edit:active { + box-shadow: none; } #field-display-overview tr.field-formatter-settings-changed { @@ -1306,7 +1329,7 @@ div.add-or-remove-shortcuts { } #field-display-overview tr.field-formatter-settings-editing { - background: #D5E9F2; + background: #EDF4FF; } #field-display-overview.field-formatter-settings-edit-form .form-item { @@ -1546,6 +1569,7 @@ body.adminimal-theme .views-ui-display-tab-bucket h3 { margin: 10px; padding: 6px 6px 10px; border-left: 5px solid #DDD; + transition: all, 0.3s; } body.adminimal-theme .views-ui-display-tab-bucket:hover h3 { border-color: #0074BD; @@ -1555,225 +1579,6 @@ div.fieldset-description { padding-bottom: 0.5em; } -/* Buttons */ - -/* Gray Button */ -input.form-submit, -a.button, -div.exposed-filters input#edit-submit { - cursor: pointer; - background: #e3e3e3; - border: none; - border-radius: 0; - padding: 6px 10px; - margin-bottom: 1em; - margin-right: 1em;/* LTR */ - color: #555; - text-align: center; - font-weight: normal; - font-size: 1.077em; - font-family: "Lucida Grande",Verdana,sans-serif; -} - -input.form-submit:hover, -a.button:hover, -div.exposed-filters input#edit-submit:hover { - background: #0074BD; - color: #fff; -} - -input.form-submit:active, -a.button:active, -div.exposed-filters input#edit-submit:active { - box-shadow: 0 2px 2px rgba(0,0,0,0.3) inset; -} - -/* Green Button */ -input[type="submit"][id^="edit-submit"], -input#edit-actions-submit, -input[id^="save-continue"], -input[type="submit"][id^="edit-save"], -input#edit-save, -input#edit-submit, -input#edit-actions-save, -#media-browser-page a.button-yes { - cursor: pointer; - border-radius: 0; - border: none; - padding: 6px 10px; - margin-bottom: 1em; - margin-right: 1em;/* LTR */ - color: #fff; - text-align: center; - font-weight: normal; - font-size: 1.077em; - font-family: "Lucida Grande",Verdana,sans-serif; - background: #4d8f46; -} - -input[type="submit"][id^="edit-submit"]:hover, -input#edit-actions-submit:hover, -input[id^="save-continue"]:hover, -input[type="submit"][id^="edit-save"]:hover, -input#edit-save:hover, -input#edit-submit:hover, -input#edit-actions-save:hover, -#media-browser-page a.button-yes:hover { - background: #0a6700; - border-radius: 0; - border: none; - color: #fff; -} - -input#edit-submit:active, -input#edit-actions-submit:active, -input[id^="save-continue"]:active, -input[type="submit"][id^="edit-save"]:active, -input#edit-save:active, -input#edit-submit:active, -input#edit-actions-save:active { - box-shadow: 0 2px 2px rgba(0,0,0,0.75) inset; - background: #333; - border-radius: 0; - border: none; - color: #fff; -} - -/* Red Button */ -input#edit-delete, -input#remove-button, -input#edit-remove, -input#edit-clear, -a.button.remove, -input[id*="remove-button"], -.page-admin-modules-uninstall input#edit-submit { - cursor: pointer; - padding: 6px 10px; - border-radius: 0; - border: none; - margin-bottom: 1em; - margin-right: 1em;/* LTR */ - color: #fff; - text-align: center; - font-weight: normal; - font-size: 1.077em; - font-family: "Lucida Grande",Verdana,sans-serif; - background: #b73939; -} - -input#edit-delete:hover, -input#remove-button:hover, -input#edit-remove:hover, -input#edit-clear:hover, -a.button.remove:hover, -input[id*="remove-button"]:hover, -body.page-admin-modules-uninstall input#edit-submit:hover { - background: #990000; - border-radius: 0; - border: none; - color: #fff; -} - -input#edit-delete:active, -input#remove-button:active, -input#edit-remove:active, -input#edit-clear:active, -input[id*="remove-button"]:active, -body.page-admin-modules-uninstall input#edit-submit:active { - box-shadow: 0 2px 2px rgba(0,0,0,0.75) inset; - background: #333; - border-radius: 0; - border: none; - color: #fff; -} - -/* Blue Button */ -input#edit-preview, -input#edit-next, -input#preview-submit, -input[type="submit"][id^="edit-return"] { - cursor: pointer; - border-radius: 0; - border: none; - padding: 6px 10px; - margin-bottom: 1em; - margin-right: 1em;/* LTR */ - color: #fff; - text-align: center; - font-weight: normal; - font-size: 1.077em; - font-family: "Lucida Grande",Verdana,sans-serif; - background: #0074BD; -} - -input#edit-preview:hover, -input#edit-next:hover, -input#preview-submit:hover, -input[type="submit"][id^="edit-return"]:hover { - background: #004c99; - border-radius: 0; - border: none; - color: #fff; -} - -input#edit-preview:active, -input#edit-next:active, -input#preview-submit:active, -input[type="submit"][id^="edit-return"]:active { - box-shadow: 0 2px 2px rgba(0,0,0,0.75) inset; - background: #333; - border-radius: 0; - border: none; - color: #fff; -} - -/* Orange Button */ -#edit-cancel, -#edit-actions-cancel, -input#edit-buttons-revert, -#media-browser-page a.button-no { - cursor: pointer; - border-radius: 0; - border: none; - padding: 6px 10px; - margin-bottom: 1em; - margin-right: 1em;/* LTR */ - color: #fff; - text-align: center; - font-weight: normal; - font-size: 1.077em; - font-family: "Lucida Grande",Verdana,sans-serif; - background: #f69231; -} - -a#edit-cancel,a#edit-actions-cancel { - padding: 6px 10px; - text-decoration: none; - border-radius: 0; - border: none; -} - -#edit-cancel:hover, -#edit-actions-cancel:hover, -input#edit-buttons-revert:hover, -#media-browser-page a.button-no:hover { - background: #ef6114; - text-decoration: none; - border-radius: 0; - border: none; - color: #fff; -} - -#edit-cancel:active, -#edit-actions-cancel:active, -input#edit-buttons-revert:active { - box-shadow: 0 2px 2px rgba(0,0,0,0.75) inset; - background: #333; - border-radius: 0; - border: none; - color: #fff; -} - /* Configuration menu blocks */ div.admin-panel { background: none repeat scroll 0 0 #F8F8F8; @@ -1894,9 +1699,9 @@ body.adminimal-theme .token-tree th { } .views-exposed-form label { - font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; - font-size: 23px; - font-weight: 300; + font-family: Sans-serif; + font-size: 16px; + font-weight: 600; line-height: inherit; margin-bottom: 0; padding: 0.25em 0; @@ -1983,21 +1788,13 @@ body.adminimal-theme .token-tree th { color: white; } -/* Omega Fieldset fix */ -body.page-admin-appearance fieldset { - border: solid 1px #ddd !important; - border-top: 3px solid #0074BD !important; - padding: 12px !important; - margin: 18px 0 !important; -} - body.page-admin-appearance fieldset legend { background: white !important; - padding: 0 3px !important; + padding: 0 6px !important; margin: 0 !important; margin-left: -3px !important; font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif !important; - font-size: 24px !important; + font-size: 22px !important; font-weight: 300 !important; } @@ -2021,6 +1818,11 @@ body.page-admin-appearance fieldset fieldset { top: 5px; } +.views-ui-dialog #views-ajax-title { + font-weight: normal; + text-align: center; +} + .views-ui-dialog .scroll { padding: 10px 20px; } @@ -2036,6 +1838,10 @@ body.page-admin-appearance fieldset fieldset { .views-ui-dialog { box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); + padding-bottom: 10px; +} +.views-ui-dialog #views-ajax-popup { + padding-bottom: 10px; } .views-filterable-options .form-type-checkbox input.form-checkbox{ @@ -2309,238 +2115,21 @@ div.krumo-wrapper li { } #module-filter-tabs.bottom-fixed { - position: relative; + position: fixed; } body.adminimal-theme div.dev-query { - background: none repeat scroll 0 0 #000000; - bottom: 0; - color: #82eb12; - display: block; - font-family: courier; - overflow: auto; - padding: 5px; -} - -/* Ckeditor Styling */ - -body.adminimal-theme .cke_reset_all,body.adminimal-theme .cke_reset_all * { - border-radius: 0; - font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; - text-shadow: none; -} - -body.adminimal-theme .ckeditor_links { - border-left: 1px solid #DDDDDD; - border-right: 1px solid #DDDDDD; + background: none repeat scroll 0 0 #000000; + bottom: 0; + color: #82eb12; display: block; - padding: 10px; - width: auto; + font-family: courier; + overflow: auto; + padding: 5px; } -body.adminimal-theme .ckeditor_links:hover { - background: #eee; - text-decoration: none; -} - -body.adminimal-theme .cke_chrome { - box-shadow: none; -} - -body.adminimal-theme .cke_top { - background: #eee; -} - -body.adminimal-theme .cke_toolgroup { - background: #fff; - border: 1px solid #ccc; -} - - -body.adminimal-theme .cke_combo_button { - background: #fff; - border: 1px solid #ccc; -} - -body.adminimal-theme .cke_combo_off a.cke_combo_button:hover { - background: #fff; - border: 1px solid #0074BD; -} - -body.adminimal-theme .cke_button_on { - background: #fff; - box-shadow: 0px 3px 0px #0074BD; - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; -} - -body.adminimal-theme .cke_button_on:hover { - box-shadow: 0px 3px 0px #0074BD; -} - -body.adminimal-theme .cke_bottom { - background: #eee; -} - -body.adminimal-theme .cke_combo_off a.cke_combo_button:active,body.adminimal-theme .cke_combo_on a.cke_combo_button { - border: 1px solid #0074BD; - border-bottom-width: 3px; - background: #fff; - box-shadow: none; -} - -body.adminimal-theme a.cke_button_on:hover, -body.adminimal-theme a.cke_button_on:focus, -body.adminimal-theme a.cke_button_on:active, -body.adminimal-theme .cke_button:first-child, -body.adminimal-theme .cke_button:last-child { - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; -} - -body.adminimal-theme a.cke_button_off:hover, -body.adminimal-theme a.cke_button_off:focus, a.cke_button_off:active, -body.adminimal-theme a.cke_button_disabled:hover, -body.adminimal-theme a.cke_button_disabled:focus, -body.adminimal-theme a.cke_button_disabled:active { - background: #eee; - box-shadow: none; - border-color: #0074BD; - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; -} - -body.adminimal-theme .cke_reset_all label { - display: inline-block; - margin-top: 5px; - padding-bottom: 2px; - position: relative; -} - -body.adminimal-theme .cke_dialog_body label.cke_required { - font-weight: normal; -} - -body.adminimal-theme .cke_reset_all .cke_dialog_body { - font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; - border: 1px solid #CCCCCC; -} - -body.adminimal-theme .cke_reset_all fieldset { - border: 1px solid #DDDDDD; - border-top: 3px solid #0074BD; - padding: 10px; -} - -body.adminimal-theme .cke_reset_all legend { - font-family: "Open Sans", "Segoe UI", "Helvetica", sans-serif; - font-size: 18px; - font-weight: 100; - padding: 0 0.5em; -} - -body.adminimal-theme .cke_combopanel { - height: 170px; - width: 170px; - border: 1px solid #DDDDDD; - margin-top: 3px; -} - -body.adminimal-theme .cke_dialog_footer { - background: #eee; -} - -body.adminimal-theme a.cke_dialog_tab:hover { - text-decoration: none; - background: #fff; - color: #0074BD; -} - -body.adminimal-theme select.cke_dialog_ui_input_select { - box-shadow: none; -} - -body.adminimal-theme input.cke_dialog_ui_input_text, -body.adminimal-theme input.cke_dialog_ui_input_password, -body.adminimal-theme textarea.cke_dialog_ui_input_textarea { - box-shadow: none; - border-color: #CCCCCC; -} - -body.adminimal-theme .cke_dialog_title { - background: #333333; - border-bottom: none; - border-radius: 0; - box-shadow: none; - color: #FFFFFF; - font-size: 18px; - text-shadow: none; -} - -body.adminimal-theme .cke_dialog_ui_vbox_child label { - top: -2px; -} - -body.adminimal-theme input.cke_dialog_ui_input_text:focus, -body.adminimal-theme input.cke_dialog_ui_input_password:focus, -body.adminimal-theme textarea.cke_dialog_ui_input_textarea:focus, -body.adminimal-theme select.cke_dialog_ui_input_select:focus { - border-color: #0074BD; -} - -body.adminimal-theme a.cke_dialog_ui_button:focus, -body.adminimal-theme a.cke_dialog_ui_button:hover, -body.adminimal-theme a.cke_dialog_ui_button:active { - border-color: #0074BD; - box-shadow: none; - text-decoration: none; - color: #fff; - background: #0074BD; -} - -body.adminimal-theme a.cke_dialog_ui_button { - background: #eee; - padding: 4px 0; -} - -body.adminimal-theme a.cke_dialog_ui_button:focus span, -body.adminimal-theme a.cke_dialog_ui_button:hover span, -body.adminimal-theme a.cke_dialog_ui_button:active span { - color: #fff; -} - -body.adminimal-theme .cke_ltr .cke_dialog_close_button { - background: url("images/x-white.png") scroll no-repeat 50% 2px #B73939; - right: 10px; - top: 1px; - width: 45px; -} - -body.adminimal-theme .cke_ltr .cke_dialog_close_button:hover { - background-color: #e55454; -} - -body.adminimal-theme a.cke_dialog_ui_button_ok { - background: #4D8F46; - border-color: #4D8F46; - box-shadow: none; -} - -body.adminimal-theme a.cke_dialog_ui_button_ok:hover { - background: #0A6700; - border-color: #0A6700; -} - -body.adminimal-theme a.cke_path_item:hover, body.adminimal-theme a.cke_path_item:focus, body.adminimal-theme a.cke_path_item:active { - border-radius: 0; - -moz-border-radius: 0; - -webkit-border-radius: 0; - box-shadow: none; - text-decoration:none; - text-shadow: none; +body.adminimal-theme div.dev-query strong { + color: #FFE414; } .messages.theme-disabled { @@ -2556,8 +2145,8 @@ body.adminimal-theme ul.rules-operations a, .rules-elements-add ul.action-links } body.adminimal-theme .rules-autocomplete-button { - height: 27px; - top: -2px; + height: 28px; + top: -1px; } body.adminimal-theme ul.rules-autocomplete .rules-dsac-group { @@ -2667,7 +2256,7 @@ body.adminimal-theme .views-display-top ul#views-display-menu-tabs li a.active { color: #0073BC; } -body.adminimal-theme .views-display-top ul#views-display-menu-tabs li a:hover, +body.adminimal-theme .views-display-top ul#views-display-menu-tabs li a:hover, body.adminimal-theme .views-display-top ul#views-display-menu-tabs li a:focus { color: #FFF; background-color: #0074BD; @@ -2716,6 +2305,10 @@ body.adminimal-theme .chosen-container-active .chosen-choices { border-color: #0074BD; } +body.adminimal-theme .chosen-container.chosen-container-active.chosen-with-drop .chosen-drop { + border-top: 1px solid #0074BD; +} + body.adminimal-theme .chosen-container-single .chosen-single div b { background-position: 0px 4px; } @@ -2734,6 +2327,7 @@ body.adminimal-theme .chosen-container-active .chosen-choices { } body.adminimal-theme .chosen-container-multi .chosen-choices { background: #fff; + border-color: #DDD; } body.adminimal-theme .chosen-container-multi .chosen-choices li.search-choice { background: #e3e3e3; @@ -2798,6 +2392,10 @@ body.adminimal-theme .custom_css_not_found .css_path { margin-bottom: 20px; } +scroll.form-wrapper { + margin-bottom: 0px; +} + #autosave-status { height: auto; left: 0; @@ -2825,3 +2423,635 @@ body.adminimal-theme .custom_css_not_found .css_path { body.page-admin-structure-views-view #views-ui-edit-display-form #edit-options #edit-style-options-row fieldset#edit-style-options-row--2 { float: left; } + +body.adminimal-theme #module-filter-update-status-form { + float: none; + text-align: center; +} + +body.adminimal-theme #module-filter-update-status-form #edit-module-filter-show { + padding: 10px; +} + +/* Fix Views preview display issue #2486489 by @geoffreyr */ +body.page-admin-structure-views-view #content-wrapper { + table-layout: fixed; +} + +/* Fix Views left and right sidebar display issue see #2562275 */ +body.page-admin-structure-views-view.sidebar-left #content-wrapper #main-content { + padding-left: 240px; +} + +body.page-admin-structure-views-view.sidebar-right #content-wrapper #main-content { + padding-right: 240px; +} + +body.page-admin-structure-views-view.sidebar-right #content-wrapper #sidebar-right { + margin-left: -240px; +} + +body.page-admin-structure-views-view.two-sidebars #content-wrapper #main-content { + padding-left: 240px; + padding-right: 240px; +} + +body.page-admin-structure-views-view.two-sidebars #content-wrapper #sidebar-right { + margin-left: -240px; +} + +/* Fix Module Filter form float... see #2444477 */ +body.adminimal-theme #module-filter-update-status-form { + float: none; + padding-bottom: 1em; + clear: both; +} + +body.adminimal-theme #module-filter-update-status-form #edit-module-filter-show { + margin-top: 5px; +} + +body.adminimal-theme #module-filter-update-status-form .module-filter-inputs-wrapper { + display: block; + text-align: center; +} + +body.adminimal-theme.page-admin-reports-updates .update.checked { + text-align: center; + margin-top: -10px; + color: #9B9B9B; +} + +.adminimal-theme .update tr.error, +.adminimal-theme .update tr.error.even:hover, +.adminimal-theme .update tr.error.odd:hover { + background: #FFFFFF !important; + color: #000; + border: 1px solid #B73939; + border-left-width: 5px; + width: 100%; + margin-bottom: 5px; +} + +.adminimal-theme .update tr.error .update table.version-security .version-title { + color: #B73939; +} + +.adminimal-theme .table.update tr.error td, +.adminimal-theme table.update tr.error th { + color: #B73939; +} + +.adminimal-theme .update tr.error .version-recommended, +.adminimal-theme .update .version-recommended { + background: #EDEDED; +} + +.adminimal-theme .update table.version-security .version-title { + color: #B73939; +} + +.adminimal-theme table.update { + margin-top: 0; +} + +.adminimal-theme table.update tr.error td, +.adminimal-theme table.update tr.error th { + color: #B73939; +} + +.adminimal-theme .update .security-error { + color: #B73939; + font-size: 18px; +} + +.adminimal-theme .update tr td { + border: none; +} + +.adminimal-theme.page-admin-reports-updates .content h3 { + font-size: 25px; + margin: 40px 0 0 0; + background: #0074BD; + padding: 18px; + color: #fff; +} + +.adminimal-theme.page-admin-reports-updates .update tr.warning { + background: #FFF; + border: 1px solid #FF7C43; + border-left-width: 5px; + width: 100%; + margin-bottom: 5px; +} + +.adminimal-theme.page-admin-reports-updates .update tr.ok { + background: #FFF; + opacity: .75; +} + +.adminimal-theme .update tr.warning .version-recommended { + background: #EDEDED; +} + +html body.adminimal-theme.page-admin-reports-updates .overflow-fix { + overflow: initial !important; +} + +.adminimal-theme .focal-point-indicator.form-wrapper { + margin: 0; + padding: 0; +} + +.adminimal-theme .focal-point-indicator:after { + font-size: 38px; +} + + +/* Improve Commerce Kickstart styling. */ +.adminimal-theme #commerce-kickstart-inline-help-button { + margin-bottom: 20px; +} + +.adminimal-theme #commerce-kickstart-inline-help-button #header { + margin-top: 10px; +} + +.adminimal-theme .commerce-backoffice-view .vbo-views-form #edit-select { + margin-top: 20px; +} + +.adminimal-theme .commerce-backoffice-view .vbo-views-form #edit-select select { + height: 17px; +} + +.adminimal-theme .commerce-backoffice-view .vbo-views-form .container-inline.form-wrapper#edit-select input.form-submit { + margin-left: -10px; +} + +.adminimal-theme .commerce-backoffice-view div.views-megarow-content { + border-bottom: 10px solid #D5E9F2; + border-radius: 0; + border-top: none; + border-color: #D5E9F2; +} + +.adminimal-theme div.views-megarow-content .megarow-header a.close { + margin-top: -34px; +} + +.adminimal-theme .commerce-backoffice-view .vbo-views-form select { + height: 17px; + margin: 0px 10px 0px 0; +} + +.adminimal-theme .commerce-backoffice-view .vbo-views-form .form-submit { + margin-top: -1px; +} + +.adminimal-theme #commerce-backoffice-order-status-form { + margin-top: 12px; +} + +.adminimal-theme #edit-field-product-und-entities-7-form-product-attributes { + margin-bottom: 20px; +} + +.adminimal-theme fieldset.ief-entity-fieldset { + margin: 20px 0; +} + +.adminimal-theme div.image-preview { + float: none; +} + +.adminimal-theme .image-widget .image-widget-data .file-size { + padding-right: 1em; +} + +.adminimal-theme .field-widget-commerce-line-item-manager input { + margin-top: 3px; +} + +.adminimal-theme .add-payment .form-submit { + margin: 0; +} + +.adminimal-theme table tr.rules-elements-add { + background: #fff; +} + +.adminimal-theme table tr.rules-elements-add:hover { + background: #fff; +} + +.adminimal-theme .rules-elements-table .tabledrag-toggle-weight-wrapper { + position: absolute; + right: 48px; +} + +.adminimal-theme .rules-elements-table caption, +.adminimal-theme .rules-overview-table caption { + font-size: 23px; + font-weight: 100; + padding: 10px 0; + text-align: left; +} + +body.adminimal-theme .rules-elements-add ul.action-links a, +body.adminimal-theme ul.rules-operations a, +body.adminimal-theme .rules-elements-add ul.action-links a { + font-family: sans-serif; + font-size: 14px; + border: none; + padding: 0; + font-weight: bold; +} + +body.adminimal-theme .rules-elements-add ul.action-links a:hover, +body.adminimal-theme ul.rules-operations a:hover, +body.adminimal-theme .rules-elements-add ul.action-links a:hover { + text-decoration: underline; + background: transparent; + color: #0074BD; +} + +body.adminimal-theme ul.rules-operations .delete a, +body.adminimal-theme ul.rules-operations .delete a:hover, +body.adminimal-theme ul.rules-operations .delete_event a, +body.adminimal-theme ul.rules-operations .delete_event a:hover { + color: #E25D5D; +} + +.adminimal-theme form input.rules-switch-button { + font-size: 12px; + padding: 5px; +} + +.adminimal-theme .field-type-commerce-product-reference .ief-entity-table tr.ief-row-entity-form { + background: #F1F6FF; + border: 3px solid #0074BD; +} + +.adminimal-theme .ief-row-form .ief-form-row { + border-bottom: 10px solid #FFD477; + padding: 10px 10px; +} + +.adminimal-theme .field-type-commerce-product-reference tr.ief-row-form .ief-form-row { + background: transparent url("../images/arrow-down.svg") no-repeat 4px 8px; +} + +.adminimal-theme .field-widget-inline-entity-form fieldset { + border-top: solid 3px #ddd; +} + +.adminimal-theme .views-ui-dialog { + z-index: 1000; +} + +.adminimal-theme #overlay-content { + padding: 0; +} + +.adminimal-theme #dashboard .ui-sortable .block h2 { + padding: 4px; + background-color: #E0E0D8; + text-indent: 20px; + font-size: 15px; + background-position-y: -13px; + background-position-x: 5px; +} + +.adminimal-theme #dashboard.customize-inactive .dashboard-region .ui-sortable .block:hover h2 { + background-position: 5px -33px; +} + +.adminimal-theme #toolbar { + box-shadow: none; +} + +.adminimal-theme #toolbar div.toolbar-menu { + background: #2D2D2D; +} + +.adminimal-theme #toolbar div.toolbar-menu ul li.active-trail a { + background: #0074BD; + text-shadow: none; +} + +.adminimal-theme div#toolbar div.toolbar-shortcuts ul li a.active { + background: #505050; +} + +.adminimal-theme .form-item.form-type-textfield.form-item-view-args label{ + line-height: 46px; +} + +.adminimal-theme #dashboard #disabled-blocks h2 { + background-color: transparent; + background-position-y: -33px; + background-position-x: 0px; + line-height: 16px; + padding: 2px 8px 0px 18px; +} + +.adminimal-theme #dashboard.customize-inactive #disabled-blocks h2:hover, +.adminimal-theme #dashboard.customize-inactive #disabled-blocks .block:hover { + background-position-y: -33px !important; + background-position-x: 0px !important; +} + +.adminimal-theme #dashboard #disabled-blocks .block { + margin-right: 8px; +} + +.adminimal-theme .field-name-commerce-discount-offer .form-item-commerce-discount-fields-commerce-discount-offer-und-form-type .form-radios .form-item input, +.adminimal-theme .field-name-commerce-discount-offer .form-wrapper .form-wrapper .form-item div.form-radios .form-item input { + display: inline-block; +} + +.adminimal-theme .field-name-commerce-discount-offer .form-wrapper .form-wrapper .form-item div.form-radios input[type=radio], +.adminimal-theme .form-item-commerce-discount-type .form-radios input[type=radio] { + top: -2px; +} + +.adminimal-theme .field-widget-inline-entity-form .ief-entity-operations input { + margin-bottom: 0 !important; +} + +.ief-entity-operations { + margin-bottom: 0; +} + +.field-widget-inline-entity-form .container-inline.form-wrapper { + margin-top: 20px; + margin-bottom: 0; +} + +.field-widget-commerce-line-item-manager table .form-wrapper { + margin-bottom: 0; +} + +.tabledrag-toggle-weight-wrapper { + margin-bottom: 5px; +} + +body.page-admin-config-system-actions #edit-parent { + margin-top: 30px; +} + +body.sticky-actions .form-actions.form-wrapper { + position: fixed; + bottom: 0; + background: #fff; + border-top: 1px solid #CCCCCC; + width: 100%; + left: 0; + padding: 20px 40px 8px; + margin: 0; + z-index: 999; +} + +body.sticky-actions #page { + margin-bottom: 60px; +} + +.adminimal-theme fieldset.features-export-component.collapsed { + background: transparent; +} + +.adminimal-theme fieldset.features-export-component .fieldset-title { + font-size: 16px; + font-weight: 600; + font-family: sans-serif; + line-height: 40px; +} + +.adminimal-theme.page-admin-structure-features fieldset { + box-shadow: none; + background: transparent; +} + +.adminimal-theme.page-admin-structure-features fieldset legend { + background: transparent; +} + +.adminimal-theme.page-admin-structure-features #edit-export fieldset.collapsible.collapse-processed .fieldset-legend { + padding-left: 10px; + background-position-x: 0px; + background-position-y: 19px; + margin-left: 0px; +} + +.adminimal-theme.page-admin-structure-features #edit-export fieldset.collapsible.collapse-processed.collapsed .fieldset-legend { + background-position-y: 16px; +} + +.adminimal-theme .features-export-parent #edit-export fieldset.collapsible legend { + padding-left: 10px; + margin-left: -12px; +} + +.adminimal-theme .features-export-parent fieldset.collapsible { + margin-top: 0; + border: none; +} + +.adminimal-theme .features-export-parent fieldset.collapsible.collapsed legend { + margin-left: 0px; +} + +html.js .adminimal-theme #features-export-form fieldset.collapsed { + min-height: 40px; +} + +.adminimal-theme #features-export-wrapper div.features-export-parent { + border: 1px solid #ddd; + margin: 10px 0; +} + +.adminimal-theme #features-filter span { + position: absolute; + margin-left: -35px; + margin-top: 10px; + color: #929292; + background-color: #EFEFEF; + font-size: 0px; + text-align: center; + line-height: 20px; + border-radius: 0; + width: 10px; + height: 20px; + transition: all, 0.2s; +} + +.adminimal-theme #features-filter span:hover{ + background-color: #E05D5D; +} + +#edit-features-filter-wrapper > div > div.form-item.form-type-textfield.form-item-features-filter { + margin-right: 10px; +} + +.adminimal-theme #features-filter span:after { + content: "X"; + display: inline-block; + font-family: sans-serif; + font-weight: bold; + position: absolute; + left: 5px; + font-size: 10px; + width: 10px; + height: 11px; + color: #909090; + transition: all, 0.2s; +} + +.adminimal-theme #features-filter span:hover:after { + color: #fff; +} + +.adminimal-theme #features-filter .form-item.form-type-checkbox.form-item-checkall { + margin: 8px 2px; +} + +.adminimal-theme #edit-features-filter { + position: relative; + top: -2px; + margin-left: 5px; +} + +.adminimal-theme div.features-export-list { + background-color: #FFFFFF; + padding: 10px 5px; + border: none; +} + +.adminimal-theme #features-export-form input[size="60"].form-text { + width: auto; +} + +.adminimal-theme #features-export-form input[size="60"].form-text#edit-features-filter { + width: 200px; + padding-right: 30px; +} + +.adminimal-theme #features-export-wrapper .component-added .form-type-checkbox, +.adminimal-theme #features-export-wrapper .component-detected .form-type-checkbox, +.adminimal-theme #features-export-wrapper .component-included .form-type-checkbox, +.adminimal-theme #features-export-wrapper .features-conflict .form-item { + padding: 4px 8px; + margin-bottom: 8px; +} + +.adminimal-theme #features-export-wrapper .form-item label.option { + font-size: 14px; + text-transform: none; + font-weight: bold; + font-family: sans-serif; + font-style: normal; +} + +.adminimal-theme #features-export-wrapper div.component-added label.option { + position: relative; + top: -1px; +} + +.adminimal-theme #features-legend .fieldset-wrapper .component-detected { + font-style: normal; +} + +#features-filter input { + display: inline-block; + width: 16px; +} + +#features-filter label { + position: relative; + top: -1px; +} + +body.sticky-actions #module-filter-submit.fixed.fixed-bottom .form-actions.form-wrapper { + position: relative; + width: initial; + border-top: none; + padding: 0; + margin: 0; +} + +#locale-translation-filter-form .form-item-language, #locale-translation-filter-form .form-item-translation, #locale-translation-filter-form .form-item-group { + padding-right: 1em; + margin: 0 2em 0 0; + width: auto; +} + +#locale-translation-filter-form .form-actions { + padding: 32px 0 0 0px; +} + +.sticky-actions #locale-translation-filter-form .form-actions { + float: left; + padding: 20px 0 0 3em; +} + +[dir="rtl"] .sticky-actions #locale-translation-filter-form .form-actions { + padding: 20px 26px 0 2em; +} + +[dir="rtl"] body.sticky-actions .form-actions.form-wrapper { + left: initial; + right: 0; +} + +html[dir="rtl"].js input.form-autocomplete { + text-indent: 1em; +} + +@media screen and (-webkit-min-device-pixel-ratio: 0) { + [dir="rtl"] input.form-autocomplete, + [dir="rtl"] input.form-text, + [dir="rtl"] input.form-file, + [dir="rtl"] textarea.form-textarea, + [dir="rtl"] select.form-select { + -webkit-padding-start: 16px; + -webkit-padding-end: 8px; + } +} + +[dir="rtl"] body.adminimal-theme div.admin-panel.admin h3 { + background-position-x: 100%; +} + +[dir="rtl"] dl dd, +[dir="rtl"] dl dl { + background-position-x: 100%; +} + +[dir="rtl"] input.form-checkbox, +[dir="rtl"] input.form-radio { + margin-left: 0.25em; +} + +[dir="rtl"] input.form-checkbox { + margin-right: 16px !important; +} + +body.adminimal-skin-alternative.adminimal-theme.page-admin-structure-features #edit-export > legend, +body.adminimal-skin-alternative.adminimal-theme.page-admin-structure-features #edit-info > legend, +body.adminimal-skin-alternative.adminimal-theme.page-admin-structure-features #edit-features-legend > legend { + padding-left: 0; +} + +.page-admin-structure-features-create form div.buttons { + text-align: left; +} + + +/** + * Hide dummy checkbox in Fast Permissions Administration (FPA) see #2653436. + * by @rcodina. + */ +.fpa-container .dummy-checkbox { + display: none !important; +} diff --git a/sites/all/themes/contrid/adminimal_theme/css/vertical-tabs.css b/sites/all/themes/contrid/adminimal_theme/css/vertical-tabs.css index d2883361..161a1f18 100644 --- a/sites/all/themes/contrid/adminimal_theme/css/vertical-tabs.css +++ b/sites/all/themes/contrid/adminimal_theme/css/vertical-tabs.css @@ -39,6 +39,11 @@ div.vertical-tabs ul li.vertical-tab-button a { div.vertical-tabs ul li.first a { border-top: 0; } + +div.vertical-tabs .vertical-tabs-pane ul li.first a { + border-top: 2px solid #0074BD; +} + div.vertical-tabs ul li.vertical-tab-button strong { font-size: 0.923em; } diff --git a/sites/all/themes/contrid/adminimal_theme/images/arrow-down.svg b/sites/all/themes/contrid/adminimal_theme/images/arrow-down.svg new file mode 100644 index 00000000..8871fe4f --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/images/arrow-down.svg @@ -0,0 +1,21 @@ + + + + diff --git a/sites/all/themes/contrid/adminimal_theme/images/check-mark.svg b/sites/all/themes/contrid/adminimal_theme/images/check-mark.svg new file mode 100644 index 00000000..687525a7 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/images/check-mark.svg @@ -0,0 +1,21 @@ + + + + diff --git a/sites/all/themes/contrid/adminimal_theme/js/adminimal_theme.js b/sites/all/themes/contrid/adminimal_theme/js/adminimal_theme.js index 264230d8..8a86ff99 100644 --- a/sites/all/themes/contrid/adminimal_theme/js/adminimal_theme.js +++ b/sites/all/themes/contrid/adminimal_theme/js/adminimal_theme.js @@ -1,22 +1,33 @@ (function($) { +'use strict'; // Define jRespond Media queries. var jRes = jRespond([ - { - label: 'mobile', - enter: 0, - exit: 480 - },{ - label: 'tablet', - enter: 481, - exit: 979 - },{ - label: 'desktop', - enter: 980, - exit: 9999 - } + { + label: 'mobile', + enter: 0, + exit: 480 + },{ + label: 'tablet', + enter: 481, + exit: 979 + },{ + label: 'desktop', + enter: 980, + exit: 9999 + } ]); +// Detect Operating system and add class to the body. +Drupal.behaviors.adminimal_os_class = { + attach: function (context, settings) { + // Detect if OS is mac based. + if (navigator.userAgent.indexOf('Mac OS X') != -1) { + $("body").addClass("mac"); + } + } +}; + // Modify the Search field for module filter. Drupal.behaviors.adminimal_module_filter_box = { attach: function (context, settings) { @@ -28,63 +39,63 @@ Drupal.behaviors.adminimal_module_filter_box = { // Fix some krumo styling. Drupal.behaviors.krumo_remove_class = { attach: function (context, settings) { - // Find status messages that has krumo div inside them, and change the classes. + // Find status messages that has krumo div inside them, and change the classes. $('#console .messages.status').has("div.krumo-root").removeClass().addClass( "krumo-wrapper" ); } }; // Add media query classes to the body tag. Drupal.behaviors.adminimal_media_queries = { - attach: function (context, settings) { - jRes.addFunc([ - { - breakpoint: 'mobile', - enter: function() { - $( "body" ).addClass( "mq-mobile" ); - }, - exit: function() { - $( "body" ).removeClass( "mq-mobile" ); - } - },{ - breakpoint: 'tablet', - enter: function() { - $( "body" ).addClass( "mq-tablet" ); - }, - exit: function() { - $( "body" ).removeClass( "mq-tablet" ); - } - },{ - breakpoint: 'desktop', - enter: function() { - $( "body" ).addClass( "mq-desktop" ); - }, - exit: function() { - $( "body" ).removeClass( "mq-desktop" ); - } - } - ]); - } + attach: function (context, settings) { + jRes.addFunc([ + { + breakpoint: 'mobile', + enter: function() { + $( "body" ).addClass( "mq-mobile" ); + }, + exit: function() { + $( "body" ).removeClass( "mq-mobile" ); + } + },{ + breakpoint: 'tablet', + enter: function() { + $( "body" ).addClass( "mq-tablet" ); + }, + exit: function() { + $( "body" ).removeClass( "mq-tablet" ); + } + },{ + breakpoint: 'desktop', + enter: function() { + $( "body" ).addClass( "mq-desktop" ); + }, + exit: function() { + $( "body" ).removeClass( "mq-desktop" ); + } + } + ]); + } }; -// Move the active primary tab on mobile to be displayed last. +// Move the active primary tab on mobile to be displayed last. Drupal.behaviors.adminimal_move_active_primary_tab = { - attach: function (context, settings) { - // Add primary tabs class to the branding div for the bottom border. + attach: function (context, settings) { + // Add primary tabs class to the branding div for the bottom border. $('#branding').has("ul.tabs.primary").addClass( "has-primary-tabs" ); - // register enter and exit functions for a single breakpoint - jRes.addFunc({ - breakpoint: 'mobile', - enter: function() { - $( "ul.tabs.primary li.active" ).clone().appendTo( "ul.tabs.primary" ).removeClass( "active" ).addClass( "current" ); - $( "ul.tabs.primary li.active" ).css("display", "none"); - }, - exit: function() { - $( "ul.tabs.primary li.active" ).css("display", "table"); - $( "ul.tabs.primary li.current" ).css("display", "none"); - } - }); - } + // register enter and exit functions for a single breakpoint + jRes.addFunc({ + breakpoint: 'mobile', + enter: function() { + $( "ul.tabs.primary li.active" ).clone().appendTo( "ul.tabs.primary" ).removeClass( "active" ).addClass( "current" ); + $( "ul.tabs.primary li.active" ).css("display", "none"); + }, + exit: function() { + $( "ul.tabs.primary li.active" ).css("display", "table"); + $( "ul.tabs.primary li.current" ).css("display", "none"); + } + }); + } }; })(jQuery); diff --git a/sites/all/themes/contrid/adminimal_theme/js/update_status.js b/sites/all/themes/contrid/adminimal_theme/js/update_status.js new file mode 100644 index 00000000..88f6ff88 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/js/update_status.js @@ -0,0 +1,117 @@ +(function($) { + +Drupal.behaviors.moduleFilterUpdateStatus = { + attach: function(context) { + $('#module-filter-update-status-form').once('update-status', function() { + var filterInput = $('input[name="module_filter[name]"]', context); + filterInput.moduleFilter('table.update > tbody > tr', { + wrapper: $('table.update:first').parent(), + delay: 300, + childSelector: 'div.project a', + rules: [ + function(moduleFilter, item) { + switch (moduleFilter.options.show) { + case 'all': + return true; + case 'updates': + if (item.state == 'warning' || item.state == 'error') { + return true; + } + break; + case 'security': + if (item.state == 'error') { + return true; + } + break; + case 'ignore': + if (item.state == 'ignored') { + return true; + } + break; + case 'unknown': + if (item.state == 'unknown') { + return true; + } + break; + } + return false; + } + ], + buildIndex: [ + function(moduleFilter, item) { + if ($('.version-status', item.element).text() == Drupal.t('Ignored from settings')) { + item.state = 'ignored'; + return item; + } + if (item.element.is('.ok')) { + item.state = 'ok'; + } + else if (item.element.is('.warning')) { + item.state = 'warning'; + } + else if (item.element.is('.error')) { + item.state = 'error'; + } + else if (item.element.is('.unknown')) { + item.state = 'unknown'; + } + return item; + } + ], + show: $('#edit-module-filter-show input[name="module_filter[show]"]', context).val() + }); + + var moduleFilter = filterInput.data('moduleFilter'); + + if (Drupal.settings.moduleFilter.rememberUpdateState) { + var updateShow = Drupal.ModuleFilter.getState('updateShow'); + if (updateShow) { + moduleFilter.options.show = updateShow; + $('#edit-module-filter-show input[name="module_filter[show]"][value="' + updateShow + '"]', context).click(); + } + } + + $('#edit-module-filter-show input[name="module_filter[show]"]', context).change(function() { + moduleFilter.options.show = $(this).val(); + Drupal.ModuleFilter.setState('updateShow', moduleFilter.options.show); + moduleFilter.applyFilter(); + }); + + moduleFilter.element.bind('moduleFilter:start', function() { + $('.overflow-fix').has('table.update').each(function() { + $(this).show().prev('h3').show(); + }); + }); + + moduleFilter.element.bind('moduleFilter:finish', function(e, data) { + $('.overflow-fix').has('table.update').each(function() { + var $table = $(this); + if ($('tbody tr', $(this)).filter(':visible').length == 0) { + $table.hide().prev('h3').hide(); + } + }); + }); + + moduleFilter.element.bind('moduleFilter:keyup', function() { + if (moduleFilter.clearOffset == undefined) { + moduleFilter.inputWidth = filterInput.width(); + moduleFilter.clearOffset = moduleFilter.element.parent().find('.module-filter-clear a').width(); + } + if (moduleFilter.text) { + filterInput.width(moduleFilter.inputWidth - moduleFilter.clearOffset - 5).parent().css('margin-right', moduleFilter.clearOffset + 5); + } + else { + filterInput.width(moduleFilter.inputWidth).parent().css('margin-right', 0); + } + }); + + moduleFilter.element.parent().find('.module-filter-clear a').click(function() { + filterInput.width(moduleFilter.inputWidth).parent().css('margin-right', 0); + }); + + moduleFilter.applyFilter(); + }); + } +}; + +})(jQuery); diff --git a/sites/all/themes/contrid/adminimal_theme/skins/alternative/alternative.css b/sites/all/themes/contrid/adminimal_theme/skins/alternative/alternative.css new file mode 100644 index 00000000..0f542f1c --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/skins/alternative/alternative.css @@ -0,0 +1,646 @@ +body.adminimal-skin-alternative { + font-family: "Segoe UI", "Helvetica", sans-serif; + font-size: 14px; +} + +body.adminimal-skin-alternative #branding div.breadcrumb { + padding-bottom: 0px; + margin-top: -4px; +} + +body.adminimal-skin-alternative h1, +body.adminimal-skin-alternative h2, +body.adminimal-skin-alternative h3, +body.adminimal-skin-alternative h4, +body.adminimal-skin-alternative h5, +body.adminimal-skin-alternative h6 { + font-family: "Segoe UI", "Helvetica", sans-serif; + font-weight: 300; +} + +/* Style checkbox and radio buttons in Chrome + Safari + Opera */ +@supports (-webkit-appearance:none) { + .style-checkboxes input[type=checkbox], + .style-checkboxes input[type=radio], + .style-checkboxes input[type=checkbox]#edit-delete { + -webkit-appearance:none; + display: inline-block; + position: relative; + top: 3px; + margin-right: 0.25em; + padding: 0; + background: #fff; + border: 1px solid #B5B5B5; + width: 16px !important; + height: 16px !important; + -webkit-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: background 0.5s ease; + outline: none; + } + + .adminimal-theme .location .form-item input.form-checkbox { + width: 16px; + display: inline-block; + } + + .style-checkboxes input[type=checkbox]#edit-delete { + margin-bottom: 0; + } + + .style-checkboxes input[type=radio] { + border-radius: 50%; + } + + .style-checkboxes input[type=checkbox]:hover, + .style-checkboxes input[type=checkbox]:focus, + .style-checkboxes input[type=radio]:hover, + .style-checkboxes input[type=radio]:focus { + border-color: #0074BD; + cursor: pointer; + } + + .style-checkboxes input[type=checkbox]#edit-delete:hover, + .style-checkboxes input[type=checkbox]#edit-delete:focus { + border-color: #D01616; + cursor: pointer; + } + + .style-checkboxes input[type=checkbox]:checked, + .style-checkboxes input[type=checkbox]:disabled:checked, + .style-checkboxes input[type=radio]:checked, + .style-checkboxes input[type=radio]:disabled:checked{ + background: #0074BD; + box-shadow: inset 0px 0px 0px 4px #fff; + } + + .style-checkboxes input[type=checkbox]#edit-delete:checked, + .style-checkboxes input[type=checkbox]#edit-delete:disabled:checked { + background: #D01616; + box-shadow: inset 0px 0px 0px 4px #fff; + } + + .style-checkboxes input[type=checkbox]:disabled, + .style-checkboxes input[type=radio]:disabled { + opacity: .5; + background: #E2E2E2; + } + + .style-checkboxes input[type=checkbox]#edit-delete:disabled { + opacity: .5; + background: #E88181; + } + + .style-checkboxes input[type=checkbox]:disabled:hover { + border-color: #B5B5B5; + cursor: default; + } + + .style-checkboxes input[type=checkbox]:disabled:hover, + .style-checkboxes input[type=radio]:disabled:hover { + border-color: #B5B5B5; + cursor: default; + /*cursor: not-allowed;*/ + } + +} + +/* Buttons */ + +/* Gray Button */ +input.form-submit, +a.button, +div.exposed-filters input#edit-submit { + cursor: pointer; + background: #e3e3e3; + border: none; + border-radius: 0; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #555; + text-align: center; + font-weight: 600; + font-size: 14px; + font-family: "Segoe UI", "Helvetica",sans-serif; + transition: all, 0.3s; +} + +input.form-submit:hover, +a.button:hover, +div.exposed-filters input#edit-submit:hover { + background: #CECECE; +} + +input.form-submit:active, +a.button:active, +div.exposed-filters input#edit-submit:active { + border-radius: 0; + border: none; +} + +input.form-submit:focus, +a.button:focus, +div.exposed-filters input#edit-submit:focus { + outline: 3px solid #EFEFEF; +} + +/* Green Button */ +input[type="submit"][id^="edit-submit"], +input#edit-actions-submit, +input[id^="save-continue"], +input[type="submit"][id^="edit-save"], +input#edit-save, +input#edit-submit, +input#edit-actions-save, +.field-widget-inline-entity-form .container-inline .form-submit, +#media-browser-page a.button-yes, +input.add-new-condition, +#edit-field-product-und-form-actions input.ief-entity-submit { + cursor: pointer; + border-radius: 0; + border: none; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: 600; + font-size: 14px; + font-family: "Segoe UI", "Helvetica",sans-serif; + background: #4d8f46; + transition: all, 0.3s; +} + +input[type="submit"][id^="edit-submit"]:hover, +input#edit-actions-submit:hover, +input[id^="save-continue"]:hover, +input[type="submit"][id^="edit-save"]:hover, +input#edit-save:hover, +input#edit-submit:hover, +input#edit-actions-save:hover, +.field-widget-inline-entity-form .container-inline .form-submit:hover, +#media-browser-page a.button-yes:hover, +input.add-new-condition:hover, +#edit-field-product-und-form-actions input.ief-entity-submit:hover { + background: #0a6700; + border-radius: 0; + border: none; + color: #fff; +} + +input[type="submit"][id^="edit-submit"]:active, +input#edit-actions-submit:active, +input[id^="save-continue"]:active, +input[type="submit"][id^="edit-save"]:active, +input#edit-save:active, +input#edit-submit:active, +.field-widget-inline-entity-form .container-inline .form-submit:active, +input#edit-actions-save:active, +input.add-new-condition:active, +#edit-field-product-und-form-actions input.ief-entity-submit:active { + border-radius: 0; + border: none; + color: #fff; +} + +input[type="submit"][id^="edit-submit"]:focus, +input#edit-actions-submit:focus, +input[id^="save-continue"]:focus, +input[type="submit"][id^="edit-save"]:focus, +input#edit-save:focus, +input#edit-submit:focus, +.field-widget-inline-entity-form .container-inline .form-submit:focus, +input#edit-actions-save:focus, +input.add-new-condition:focus, +#edit-field-product-und-form-actions input.ief-entity-submit:focus { + outline: 3px solid #D0E8CE; +} + +/* Red Button */ +input#edit-delete, +input#remove-button, +input#edit-remove, +input#edit-clear, +a.button.remove, +.page-node-delete input#edit-submit, +input[id*="remove-button"], +.page-admin-modules-uninstall input#edit-submit, +.remove-condition input, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit { + cursor: pointer; + padding: 6px 10px; + border-radius: 0; + border: none; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: 600; + font-size: 14px; + font-family: "Segoe UI", "Helvetica",sans-serif; + background: #b73939; + transition: all, 0.3s; +} + +input#edit-delete:hover, +input#remove-button:hover, +input#edit-remove:hover, +input#edit-clear:hover, +a.button.remove:hover, +.page-node-delete input#edit-submit:hover, +input[id*="remove-button"]:hover, +body.page-admin-modules-uninstall input#edit-submit:hover, +.remove-condition input:hover, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:hover { + background: #990000; + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-delete:active, +input#remove-button:active, +input#edit-remove:active, +input#edit-clear:active, +.page-node-delete input#edit-submit:active, +input[id*="remove-button"]:active, +body.page-admin-modules-uninstall input#edit-submit:active, +.remove-condition input:active, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:active { + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-delete:focus, +input#remove-button:focus, +input#edit-remove:focus, +input#edit-clear:focus, +.page-node-delete input#edit-submit:focus, +input[id*="remove-button"]:focus, +body.page-admin-modules-uninstall input#edit-submit:focus, +.remove-condition input:focus, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:focus { + outline: 3px solid #FFD8D8; +} + +/* Blue Button */ +input#edit-preview, +input#edit-next, +input#preview-submit, +input.ief-entity-submit, +input[type="submit"][id^="edit-return"], +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"] { + cursor: pointer; + border-radius: 0; + border: none; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: 600; + font-size: 14px; + font-family: "Segoe UI", "Helvetica",sans-serif; + background: #0074BD; + transition: all, 0.3s; +} + +input#edit-preview:hover, +input#edit-next:hover, +input#preview-submit:hover, +input.ief-entity-submit:hover, +input[type="submit"][id^="edit-return"]:hover, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:hover { + background: #004c99; + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-preview:active, +input#edit-next:active, +input#preview-submit:active, +input.ief-entity-submit:active, +input[type="submit"][id^="edit-return"]:active, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:active { + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-preview:focus, +input#edit-next:focus, +input#preview-submit:focus, +input.ief-entity-submit:focus, +input[type="submit"][id^="edit-return"]:focus, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:focus { + outline: 3px solid #D2E4F7; +} + +/* Orange Button */ +#edit-cancel, +#edit-actions-cancel, +input#edit-buttons-revert, +#media-browser-page a.button-no, +.field-widget-inline-entity-form input[id*="cancel"] { + cursor: pointer; + border-radius: 0; + border: none; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: 600; + font-size: 14px; + font-family: "Segoe UI", "Helvetica",sans-serif; + background: #f69231; + transition: all, 0.3s; +} + +a#edit-cancel,a#edit-actions-cancel { + padding: 6px 10px; + text-decoration: none; + border-radius: 0; + border: none; +} + +#edit-cancel:hover, +#edit-actions-cancel:hover, +input#edit-buttons-revert:hover, +#media-browser-page a.button-no:hover, +.field-widget-inline-entity-form input[id*="cancel"]:hover { + background: #ef6114; + text-decoration: none; + border-radius: 0; + border: none; + color: #fff; +} + +#edit-cancel:active, +#edit-actions-cancel:active, +input#edit-buttons-revert:active, +.field-widget-inline-entity-form input[id*="cancel"]:active { + border-radius: 0; + border: none; + color: #fff; +} + +#edit-cancel:focus, +#edit-actions-cancel:focus, +input#edit-buttons-revert:focus, +.field-widget-inline-entity-form input[id*="cancel"]:focus { + outline: 3px solid #FFE8D2; +} + +html body input.disabled, +html body input.disabled:hover, +html body input.disabled:active, +html body input.disabled:focus { + background-color: #A0A0A0; + color: #CCCCCC; + text-decoration: line-through; + cursor: not-allowed; +} + +input[type="submit"]:disabled { + background: repeating-linear-gradient( + -45deg, + #FFFFFF, + #D2D2D2 4px + ) !important; + color: #6B6B6B !important; + cursor: not-allowed !important; + outline: none !important; + opacity: 0.665 !important; + text-shadow: 1px 1px 0px #fff !important; +} + +/* END Buttons */ + +strong { + font-family: "Segoe UI", "Helvetica",sans-serif !important; + font-weight: 600 !important; +} + +/* Omega Fieldset fix */ +html body.adminimal-skin-alternative.page-admin-appearance.page-admin-appearance-settings-omega fieldset { + border: solid 1px #ddd !important; + border-top: 3px solid #0074BD !important; + padding: 12px !important; + margin: 18px 0 !important; +} + +html body.adminimal-skin-alternative.page-admin-appearance.page-admin-appearance-settings-omega fieldset legend { + color: #484848 !important; +} + +div.breadcrumb a { + transition: all, 0.3s; +} + +ul.action-links a { + padding: 0px 20px; + font-family: "Segoe UI", "Helvetica", sans-serif; + font-size: 16px; + font-weight: 600; + background: #fff; + line-height: 30px; + border: 2px solid #0074BD; + margin: 5px auto; + border-radius: 100px; + display: block; + transition: all, 0.3s; +} + +body.no-rounded-buttons ul.action-links a { + border-radius: 0; +} + +ul.action-links a:hover { + text-decoration: none; + background: #0074BD; + color: #fff; +} + +#admin-menu { + box-shadow: none; + background: #2B2B2B; +} + +#admin-menu .dropdown .admin-menu-toolbar-category > a.active-trail { + background: #0074BD; +} + +.overlay #overlay-close, +.overlay #overlay-close:hover { + height: 44px; + background-position-y: 10px; + left: -36px; +} + +.overlay #overlay-tabs { + right: 2px; +} + +body.adminimal-skin-alternative fieldset legend { + background: white; + padding: 0 6px; + margin: 0; + margin-left: -6px; + font-family: "Segoe UI", "Helvetica",sans-serif; + font-size: 21px; + font-weight: 100; + color: #9E9E9E; + margin-bottom: 2px; +} + +body.adminimal-skin-alternative fieldset legend span { + /*border-bottom: 3px solid #F1F1F1;*/ + /*padding-bottom: 10px;*/ + display: inline-block; + font-size: 21px; + transition: all, 0.3s; +} + +body.adminimal-skin-alternative fieldset:hover legend span { + /*border-color: #0074BD;*/ + /*color: #000;*/ +} + +html body.adminimal-skin-alternative.page-admin-appearance fieldset legend { + background: white !important; + padding: 0 6px !important; + margin: 0 !important; + margin-left: -6px !important; + font-family: "Segoe UI", "Helvetica",sans-serif !important; + font-size: 21px !important; + font-weight: 100 !important; + color: #AFAFAF !important; + margin-bottom: 2px !important; +} + +body.adminimal-skin-alternative fieldset { + border: none; + border-top: none; + padding: 12px 0; + margin: 0 0 20px; +} + +body.adminimal-skin-alternative div.vertical-tabs .vertical-tabs-panes { + margin: 0 0 0 265px; + padding: 20px 15px 10px 0; +} + +body.adminimal-skin-alternative .form-item label { + font-family: "Segoe UI", "Helvetica", sans-serif; + font-size: 16px; + font-weight: 400; +} + +body.adminimal-skin-alternative .form-item.form-type-checkbox label { + font-family: "Segoe UI", "Helvetica", sans-serif; + font-size: 16px; + font-weight: 400; + line-height: 1.3; +} + +body.adminimal-skin-alternative .form-item.form-type-radio label { + font-family: "Segoe UI", "Helvetica", sans-serif; + font-size: 16px; + font-weight: 400; + line-height: 1.3; +} + +body.adminimal-skin-alternative #branding { + overflow: hidden; + padding: 12px 20px 0 20px; + position: relative; + background-color: #3B3C3E; +} + +body.adminimal-skin-alternative #branding h1.page-title { + color: #FFFFFF; + float: left; + font-family: "Segoe UI", "Helvetica", sans-serif; + font-size: 32px; + font-weight: 300; + line-height: 38px; + margin: 0; + padding: 0 0 12px; + letter-spacing: normal; +} + +body.adminimal-skin-alternative div.add-or-remove-shortcuts { + padding-top: 18px; +} + +body.adminimal-skin-alternative #toolbar div.toolbar-menu { + background: #464646; + box-shadow: 0 0 6px rgba(0,0,0,0.1); +} + +body.adminimal-skin-alternative #toolbar div.toolbar-menu ul li a:hover { + background: #5D5D5D; +} + +body.adminimal-skin-alternative.adminimal-menu div#admin-menu { + background: #424242; + border-bottom: 1px solid #3B3C3E; + box-shadow: none; +} + +body.adminimal-skin-alternative.adminimal-menu #admin-menu #admin-menu-wrapper .dropdown li li.expandable, +body.adminimal-skin-alternative.adminimal-menu #admin-menu .dropdown li li, +body.adminimal-skin-alternative.adminimal-menu.admin-menu.menu-render-collapsed div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu:hover li { + background-color: #353535; +} + +body.adminimal-skin-alternative.adminimal-menu.admin-menu.menu-render-collapsed div.shortcut-toolbar div#toolbar div.toolbar-shortcuts ul.menu li.label a:hover { + background-color: #353535 !important; +} + +body.adminimal-skin-alternative.adminimal-theme.page-admin-structure-features fieldset legend { + margin-left: 0; +} + +body.adminimal-skin-alternative.adminimal-theme.page-admin-structure-features fieldset.features-export-component .fieldset-wrapper .form-checkboxes { + padding: 0 10px; +} + +body.adminimal-skin-alternative.adminimal-theme.page-admin-structure-features #features-filter span { + margin-top: 7px; +} + +body.adminimal-skin-alternative.adminimal-theme.page-admin-structure-features #features-filter .form-item.form-type-checkbox.form-item-checkall { + margin: 5px 2px; +} + +body.adminimal-skin-alternative table th { + font-family: "Segoe UI", "Helvetica", sans-serif; + background-color: #F3F3F3; + font-weight: 400; +} + +body.adminimal-skin-alternative table th.active { + background-color: #0074BD; + color: #fff; +} + +body.adminimal-skin-alternative #permissions td.module { + font-family: "Segoe UI", "Helvetica", sans-serif; + color: #4C4C4C; +} + +body.adminimal-skin-alternative div.form-type-radio div.description, +body.adminimal-skin-alternative div.form-type-checkbox div.description { + color: #AFAFAF; +} + +body.adminimal-skin-alternative tr.even, +body.adminimal-skin-alternative tr.odd { + background-color: #fff; + transition: all, 0.2s; +} diff --git a/sites/all/themes/contrid/adminimal_theme/skins/alternative/alternative.js b/sites/all/themes/contrid/adminimal_theme/skins/alternative/alternative.js new file mode 100644 index 00000000..e69de29b diff --git a/sites/all/themes/contrid/adminimal_theme/skins/alternative/mac_os_x.css b/sites/all/themes/contrid/adminimal_theme/skins/alternative/mac_os_x.css new file mode 100644 index 00000000..4b4bcc06 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/skins/alternative/mac_os_x.css @@ -0,0 +1,69 @@ +body.mac, +body.mac input[type="submit"], +body.mac div.admin-panel h3 { + font-family: Helvetica !important; +} + +body.mac .form-item label { + font-family: "Helvetica", sans-serif; + font-size: 16px; + font-weight: 600; + line-height: 1.3; +} + +body.mac .form-item.form-type-checkbox label { + font-family: "Helvetica", sans-serif; + font-size: 16px; + font-weight: 300; + line-height: 1.3; +} + +body.mac .exposed-filters .form-item label { + line-height: 38px; +} + +body.mac.style-checkboxes input[type=checkbox] { + width: 14px; + height: 14px; + border-radius: 2px; + top: 2px; +} + +body.mac.style-checkboxes input[type=radio] { + width: 14px; + height: 14px; + top: 2px; +} + +body.mac.style-checkboxes input[type=checkbox]:checked, +body.mac.style-checkboxes input[type=checkbox]:disabled:checked, +body.mac.style-checkboxes input[type=radio]:checked, +body.mac.style-checkboxes input[type=radio]:disabled:checked { + box-shadow: inset 0px 0px 0px 4px #fff; +} + +body.mac table th { + font-family: "Helvetica", sans-serif; + font-size: 16px; + font-weight: 400; + color: #696969; +} + +body.mac input.form-file { + background: #F5F5F5; + border: none; +} + +body.mac div.add-or-remove-shortcuts { + padding-top: 15px; +} + +body.adminimal-theme.mac .exposed-filters .container-inline .form-actions, +body.mac .exposed-filters .container-inline.form-actions { + margin: 4px 0 0 -5px; +} + +body.mac input[type="submit"]{ + position: relative; + top: 1px; +} diff --git a/sites/all/themes/contrid/adminimal_theme/skins/dark/dark.css b/sites/all/themes/contrid/adminimal_theme/skins/dark/dark.css new file mode 100644 index 00000000..e69de29b diff --git a/sites/all/themes/contrid/adminimal_theme/skins/dark/mac_os_x.css b/sites/all/themes/contrid/adminimal_theme/skins/dark/mac_os_x.css new file mode 100644 index 00000000..e69de29b diff --git a/sites/all/themes/contrid/adminimal_theme/skins/default/default.css b/sites/all/themes/contrid/adminimal_theme/skins/default/default.css new file mode 100644 index 00000000..2e35bb84 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/skins/default/default.css @@ -0,0 +1,466 @@ +/* Style checkbox and radio buttons in Chrome + Safari + Opera */ +@supports (-webkit-appearance:none) { + .style-checkboxes input[type=checkbox], + .style-checkboxes input[type=radio], + .style-checkboxes input[type=checkbox]#edit-delete { + -webkit-appearance:none; + display: inline-block; + position: relative; + top: 3px; + margin-right: 0.25em; + padding: 0; + background: #fff; + border: 1px solid #B5B5B5; + width: 16px !important; + height: 16px !important; + -webkit-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: background 0.5s ease; + outline: none; + } + + .adminimal-theme .location .form-item input.form-checkbox { + width: 16px; + display: inline-block; + } + + .style-checkboxes input[type=checkbox]#edit-delete { + margin-bottom: 0; + } + + .style-checkboxes input[type=radio] { + border-radius: 50%; + } + + .style-checkboxes input[type=checkbox]:hover, + .style-checkboxes input[type=checkbox]:focus, + .style-checkboxes input[type=radio]:hover, + .style-checkboxes input[type=radio]:focus { + border-color: #0074BD; + cursor: pointer; + } + + .style-checkboxes input[type=checkbox]#edit-delete:hover, + .style-checkboxes input[type=checkbox]#edit-delete:focus { + border-color: #D01616; + cursor: pointer; + } + + .style-checkboxes input[type=checkbox]:checked, + .style-checkboxes input[type=checkbox]:disabled:checked, + .style-checkboxes input[type=radio]:checked, + .style-checkboxes input[type=radio]:disabled:checked{ + background: #0074BD; + box-shadow: inset 0px 0px 0px 4px #fff; + } + + .style-checkboxes input[type=checkbox]#edit-delete:checked, + .style-checkboxes input[type=checkbox]#edit-delete:disabled:checked { + background: #D01616; + box-shadow: inset 0px 0px 0px 4px #fff; + } + + .style-checkboxes input[type=checkbox]:disabled, + .style-checkboxes input[type=radio]:disabled { + opacity: .5; + background: #E2E2E2; + } + + .style-checkboxes input[type=checkbox]#edit-delete:disabled { + opacity: .5; + background: #E88181; + } + + .style-checkboxes input[type=checkbox]:disabled:hover { + border-color: #B5B5B5; + cursor: default; + } + + .style-checkboxes input[type=checkbox]:disabled:hover, + .style-checkboxes input[type=radio]:disabled:hover { + border-color: #B5B5B5; + cursor: default; + /*cursor: not-allowed;*/ + } + +} + +/* Buttons */ + +/* Gray Button */ +input.form-submit, +a.button, +div.exposed-filters input#edit-submit { + cursor: pointer; + background: #e3e3e3; + border: none; + border-radius: 0; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #555; + text-align: center; + font-weight: normal; + font-size: 1.077em; + font-family: "Lucida Grande",Verdana,sans-serif; + transition: all, 0.3s; +} + +input.form-submit:hover, +a.button:hover, +div.exposed-filters input#edit-submit:hover { + background: #CECECE; +} + +input.form-submit:active, +a.button:active, +div.exposed-filters input#edit-submit:active { + border-radius: 0; + border: none; +} + +input.form-submit:focus, +a.button:focus, +div.exposed-filters input#edit-submit:focus { + outline: 3px solid #EFEFEF; +} + +/* Green Button */ +input[type="submit"][id^="edit-submit"], +input#edit-actions-submit, +input[id^="save-continue"], +input[type="submit"][id^="edit-save"], +input#edit-save, +input#edit-submit, +input#edit-actions-save, +.field-widget-inline-entity-form .container-inline .form-submit, +#media-browser-page a.button-yes, +input.add-new-condition, +#edit-field-product-und-form-actions input.ief-entity-submit { + cursor: pointer; + border-radius: 0; + border: none; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: normal; + font-size: 1.077em; + font-family: "Lucida Grande",Verdana,sans-serif; + background: #4d8f46; + transition: all, 0.3s; +} + +input[type="submit"][id^="edit-submit"]:hover, +input#edit-actions-submit:hover, +input[id^="save-continue"]:hover, +input[type="submit"][id^="edit-save"]:hover, +input#edit-save:hover, +input#edit-submit:hover, +input#edit-actions-save:hover, +.field-widget-inline-entity-form .container-inline .form-submit:hover, +#media-browser-page a.button-yes:hover, +input.add-new-condition:hover, +#edit-field-product-und-form-actions input.ief-entity-submit:hover { + background: #0a6700; + border-radius: 0; + border: none; + color: #fff; +} + +input[type="submit"][id^="edit-submit"]:active, +input#edit-actions-submit:active, +input[id^="save-continue"]:active, +input[type="submit"][id^="edit-save"]:active, +input#edit-save:active, +input#edit-submit:active, +.field-widget-inline-entity-form .container-inline .form-submit:active, +input#edit-actions-save:active, +input.add-new-condition:active, +#edit-field-product-und-form-actions input.ief-entity-submit:active { + border-radius: 0; + border: none; + color: #fff; +} + +input[type="submit"][id^="edit-submit"]:focus, +input#edit-actions-submit:focus, +input[id^="save-continue"]:focus, +input[type="submit"][id^="edit-save"]:focus, +input#edit-save:focus, +input#edit-submit:focus, +.field-widget-inline-entity-form .container-inline .form-submit:focus, +input#edit-actions-save:focus, +input.add-new-condition:focus, +#edit-field-product-und-form-actions input.ief-entity-submit:focus { + outline: 3px solid #D0E8CE; +} + +/* Red Button */ +input#edit-delete, +input#remove-button, +input#edit-remove, +input#edit-clear, +a.button.remove, +.page-node-delete input#edit-submit, +input[id*="remove-button"], +.page-admin-modules-uninstall input#edit-submit, +.remove-condition input, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit { + cursor: pointer; + padding: 6px 10px; + border-radius: 0; + border: none; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: normal; + font-size: 1.077em; + font-family: "Lucida Grande",Verdana,sans-serif; + background: #b73939; + transition: all, 0.3s; +} + +input#edit-delete:hover, +input#remove-button:hover, +input#edit-remove:hover, +input#edit-clear:hover, +a.button.remove:hover, +.page-node-delete input#edit-submit:hover, +input[id*="remove-button"]:hover, +body.page-admin-modules-uninstall input#edit-submit:hover, +.remove-condition input:hover, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:hover { + background: #990000; + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-delete:active, +input#remove-button:active, +input#edit-remove:active, +input#edit-clear:active, +.page-node-delete input#edit-submit:active, +input[id*="remove-button"]:active, +body.page-admin-modules-uninstall input#edit-submit:active, +.remove-condition input:active, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:active { + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-delete:focus, +input#remove-button:focus, +input#edit-remove:focus, +input#edit-clear:focus, +.page-node-delete input#edit-submit:focus, +input[id*="remove-button"]:focus, +body.page-admin-modules-uninstall input#edit-submit:focus, +.remove-condition input:focus, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:focus { + outline: 3px solid #FFD8D8; +} + +/* Blue Button */ +input#edit-preview, +input#edit-next, +input#preview-submit, +input.ief-entity-submit, +input[type="submit"][id^="edit-return"], +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"] { + cursor: pointer; + border-radius: 0; + border: none; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: normal; + font-size: 1.077em; + font-family: "Lucida Grande",Verdana,sans-serif; + background: #0074BD; + transition: all, 0.3s; +} + +input#edit-preview:hover, +input#edit-next:hover, +input#preview-submit:hover, +input.ief-entity-submit:hover, +input[type="submit"][id^="edit-return"]:hover, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:hover { + background: #004c99; + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-preview:active, +input#edit-next:active, +input#preview-submit:active, +input.ief-entity-submit:active, +input[type="submit"][id^="edit-return"]:active, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:active { + border-radius: 0; + border: none; + color: #fff; +} + +input#edit-preview:focus, +input#edit-next:focus, +input#preview-submit:focus, +input.ief-entity-submit:focus, +input[type="submit"][id^="edit-return"]:focus, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:focus { + outline: 3px solid #D2E4F7; +} + +/* Orange Button */ +#edit-cancel, +#edit-actions-cancel, +input#edit-buttons-revert, +#media-browser-page a.button-no, +.field-widget-inline-entity-form input[id*="cancel"] { + cursor: pointer; + border-radius: 0; + border: none; + padding: 6px 10px; + margin-bottom: 1em; + margin-right: 1em;/* LTR */ + color: #fff; + text-align: center; + font-weight: normal; + font-size: 1.077em; + font-family: "Lucida Grande",Verdana,sans-serif; + background: #f69231; + transition: all, 0.3s; +} + +a#edit-cancel,a#edit-actions-cancel { + padding: 6px 10px; + text-decoration: none; + border-radius: 0; + border: none; +} + +#edit-cancel:hover, +#edit-actions-cancel:hover, +input#edit-buttons-revert:hover, +#media-browser-page a.button-no:hover, +.field-widget-inline-entity-form input[id*="cancel"]:hover { + background: #ef6114; + text-decoration: none; + border-radius: 0; + border: none; + color: #fff; +} + +#edit-cancel:active, +#edit-actions-cancel:active, +input#edit-buttons-revert:active, +.field-widget-inline-entity-form input[id*="cancel"]:active { + border-radius: 0; + border: none; + color: #fff; +} + +#edit-cancel:focus, +#edit-actions-cancel:focus, +input#edit-buttons-revert:focus, +.field-widget-inline-entity-form input[id*="cancel"]:focus { + outline: 3px solid #FFE8D2; +} + +html body input.disabled, +html body input.disabled:hover, +html body input.disabled:active, +html body input.disabled:focus { + background-color: #A0A0A0; + color: #CCCCCC; + text-decoration: line-through; + cursor: not-allowed; +} + +input[type="submit"]:disabled { + background: repeating-linear-gradient( + -45deg, + #FFFFFF, + #D2D2D2 4px + ) !important; + color: #6B6B6B !important; + cursor: not-allowed !important; + outline: none !important; + opacity: 0.665 !important; + text-shadow: 1px 1px 0px #fff !important; +} + +/* END Buttons */ + +strong { + font-family: Arial, Helvetica, sans-serif !important; + font-weight: bold !important; +} + +/* Omega Fieldset fix */ +body.page-admin-appearance-settings-omega fieldset { + border: solid 1px #ddd !important; + border-top: 3px solid #0074BD !important; + padding: 12px !important; + margin: 18px 0 !important; +} + +div.breadcrumb a { + transition: all, 0.3s; +} + +ul.action-links a { + padding: 0px 20px; + font-family: "Helvetica", sans-serif; + font-size: 14px; + font-weight: bold; + background: #fff; + line-height: 30px; + border: 2px solid #0074BD; + margin: 5px auto; + border-radius: 100px; + display: block; + transition: all, 0.3s; +} + +body.no-rounded-buttons ul.action-links a { + border-radius: 0; +} + +ul.action-links a:hover { + text-decoration: none; + background: #0074BD; + color: #fff; +} + +#admin-menu { + box-shadow: none; + background: #2B2B2B; +} + +#admin-menu .dropdown .admin-menu-toolbar-category > a.active-trail { + background: #0074BD; +} + +.overlay #overlay-close, +.overlay #overlay-close:hover { + height: 44px; + background-position-y: 10px; + left: -36px; +} + +.overlay #overlay-tabs { + right: 2px; +} + +body.sticky-actions .form-actions.form-wrapper { + box-shadow: -20px 2px 40px rgba(0,0,0,0.4); +} diff --git a/sites/all/themes/contrid/adminimal_theme/skins/default/default.js b/sites/all/themes/contrid/adminimal_theme/skins/default/default.js new file mode 100644 index 00000000..e69de29b diff --git a/sites/all/themes/contrid/adminimal_theme/skins/default/mac_os_x.css b/sites/all/themes/contrid/adminimal_theme/skins/default/mac_os_x.css new file mode 100644 index 00000000..273d372e --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/skins/default/mac_os_x.css @@ -0,0 +1,59 @@ +body.mac, +body.mac input[type="submit"], +body.mac div.admin-panel h3 { + font-family: Helvetica !important; +} + +body.mac .exposed-filters .form-item label { + line-height: 38px; +} + +body.mac.style-checkboxes input[type=checkbox] { + width: 14px; + height: 14px; + border-radius: 2px; + top: 2px; +} + +body.mac.style-checkboxes input[type=radio] { + width: 14px; + height: 14px; + top: 2px; +} + +body.mac.style-checkboxes input[type=checkbox]:checked, +body.mac.style-checkboxes input[type=checkbox]:disabled:checked, +body.mac.style-checkboxes input[type=radio]:checked, +body.mac.style-checkboxes input[type=radio]:disabled:checked { + box-shadow: inset 0px 0px 0px 4px #fff; +} + +body.mac table th { + font-family: "Helvetica", sans-serif; + font-size: 16px; + font-weight: 400; + color: #696969; +} + +body.mac input.form-file { + background: #F5F5F5; + border: none; +} + +body.mac #branding h1.page-title { + margin: -2px 0 4px 0; +} + +body.mac div.add-or-remove-shortcuts { + padding-top: 15px; +} + +body.adminimal-theme.mac .exposed-filters .container-inline .form-actions, +body.mac .exposed-filters .container-inline.form-actions { + margin: 4px 0 0 -5px; +} + +body.mac input[type="submit"]{ + position: relative; + top: 1px; +} diff --git a/sites/all/themes/contrid/adminimal_theme/skins/material/images/check.svg b/sites/all/themes/contrid/adminimal_theme/skins/material/images/check.svg new file mode 100644 index 00000000..d8288903 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/skins/material/images/check.svg @@ -0,0 +1,8 @@ + + + + diff --git a/sites/all/themes/contrid/adminimal_theme/skins/material/mac_os_x.css b/sites/all/themes/contrid/adminimal_theme/skins/material/mac_os_x.css new file mode 100644 index 00000000..e69de29b diff --git a/sites/all/themes/contrid/adminimal_theme/skins/material/material.css b/sites/all/themes/contrid/adminimal_theme/skins/material/material.css new file mode 100644 index 00000000..84dd5971 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/skins/material/material.css @@ -0,0 +1,1091 @@ +/* Import the Open Sans webfont from Google CDN */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url(https://fonts.gstatic.com/s/roboto/v15/El-bgsteBznJNL5pgUfFLA.woff2) format('woff2'), url(https://fonts.gstatic.com/s/roboto/v15/d-QWLnp4didxos_6urzFtg.woff) format('woff'); + } +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(https://fonts.gstatic.com/s/roboto/v15/N5Lbe1fynPA1KT8BFvAiGw.woff2) format('woff2'), url(https://fonts.gstatic.com/s/roboto/v15/grlryt2bdKIyfMSOhzd1eA.woff) format('woff'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 600; + src: local('Roboto Bold'), local('Roboto-Bold'), url(https://fonts.gstatic.com/s/roboto/v15/tZdhd9Zzj0I2MwoD56osIw.woff2) format('woff2'), url(https://fonts.gstatic.com/s/roboto/v15/vxNK-E6B13CyehuDCmvQvw.woff) format('woff'); +} + +html, +body.adminimal-skin-material { + height: 100%; + background: #f9f9f9; +} + +body.adminimal-skin-material { + font-family: Roboto, sans-serif; +} + +body.adminimal-skin-material #page { + background: #f9f9f9; +} + +body.adminimal-skin-material a { + color: #2196F3; + -o-transition:.3s; + -ms-transition:.3s; + -moz-transition:.3s; + -webkit-transition:.3s; + transition:.3s; +} + +h1, h2, h3, h4, h5, h6 { + font-family: Roboto, sans-serif; +} + +body.adminimal-skin-material table th.active { + background: #607D8B; + color: #fff; +} + +body.adminimal-skin-material table tr.selected td.active, +body.adminimal-skin-material table tr.selected td { + background: #ECEFF1; +} + +body.adminimal-skin-material table th { + background: #E0E0E0; +} + +body.adminimal-skin-material tr.even:hover, .adminimal-theme tr.odd:hover { + background: #FFF9C4; +} + +body.adminimal-skin-material .marker, +body.adminimal-skin-material .form-required { + color: #FF9800; +} + +body.adminimal-skin-material td .marker { + position: relative; + top: 0.5em; + vertical-align: top; +} + +body.adminimal-skin-material table.tableheader-processed { + border: 1px solid #E0E0E0; +} + +body.adminimal-skin-material tr.even, +body.adminimal-skin-material tr.odd { + background: #FFF; +} + +body.adminimal-skin-material .messages ul { + list-style-type: none; +} + +body.adminimal-skin-material div.messages ul li { + font-size: 14px; + padding-bottom: 0.5em; +} + +body.adminimal-skin-material div.messages ul li:last-of-type { + padding-bottom: 0; +} + +body.adminimal-skin-material #help p { + font-size: 13px; +} + +body.adminimal-skin-material div.messages ul.krumo-node { + margin : 0; +} + +body.adminimal-skin-material div.messages ul.krumo-node li.krumo-child { + font-size: 12px; + padding-bottom: 0; +} + +body.adminimal-skin-material div.warning { + background-color: #fff3e0; + border: none; + border-radius: 3px; + background-position: 14px 50%; +} + +body.adminimal-skin-material div.status { + background-color: #E8F5E9; + border: none; + border-radius: 3px; + background-position: 14px 50%; +} + +body.adminimal-menu.adminimal-skin-material div#admin-menu { + background: #1b2327; + border-color: #1b2327; +} + +body.adminimal-skin-material #branding { + background-color: #263238; + box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.26); +} + +body.adminimal-skin-material.adminimal-menu div#admin-menu a, +body.adminimal-skin-material.adminimal-menu div#admin-menu span { + font-family: Roboto; + font-size: 13px; + text-transform: capitalize; +} + +body.adminimal-menu #admin-menu .dropdown li.admin-menu-action:first-child a { + background: #1B2327; +} + +body.adminimal-menu #admin-menu .admin-menu-search input { + background: #1B2327; + box-shadow: inset 0px -2px 0px #64696C; + transition: all, 0.3s; +} + +body.adminimal-menu #admin-menu .admin-menu-search input:focus { + box-shadow: inset 0px -2px 0px #FFFFFF; + background: #1B2327; + color: #FFF; +} + +body.adminimal-menu #admin-menu .dropdown li.admin-menu-action.admin-menu-account a { + background: #1B2327 !important; +} + +body.adminimal-skin-material ul.primary li.active a, +body.adminimal-skin-material ul.primary li.active a.active, +body.adminimal-skin-material ul.primary li.active a:active, +body.adminimal-skin-material ul.primary li.active a:visited { + margin-top: 0px; + border-top: none; +} + +body.adminimal-skin-material ul.primary li { + text-transform: uppercase; +} + +body.adminimal-skin-material #navigation ul.primary li:first-of-type.active { + margin-left: 10px; +} + +body.adminimal-skin-material div.breadcrumb a { + color: #A3A3A3; +} + +body.adminimal-skin-material div.breadcrumb a:hover { + color: #fff; +} + + +body.adminimal-skin-material ul.primary li.active a, +body.adminimal-skin-material ul.primary li.active a.active, +body.adminimal-skin-material ul.primary li.active a:active, +body.adminimal-skin-material ul.primary li.active a:visited { + box-shadow: none; + background-color: transparent; + color: #000; +} + +body.adminimal-skin-material ul.primary { + background-color: #EEEEEE; +} + +body.adminimal-skin-material #branding h1.page-title { + font-family: Roboto, sans-serif; + font-size: 28px; + font-weight: 400; + line-height: 1.5em; + padding: 0px 0px 8px; +} + +body.adminimal-skin-material div.add-or-remove-shortcuts { + padding-left: 2px; + padding-top: 16px; +} + +body.adminimal-skin-material ul.action-links a { + text-transform: uppercase; + font-weight: 500; + font-size: 15px; + background: #2196f3; + color: #FFFFFF; + padding: 3px 20px 2px; + border-radius: 3px; + display: inline-block; + font-family: Roboto, sans-serif; +} + +body.adminimal-skin-material ul.action-links a:hover { + background: #29B6F6; + text-decoration: none; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.45); +} + +body.adminimal-skin-material .theme-selector { + padding-bottom: 40px; + background: #FFFFFF; + border-radius: 4px; + border: 1px solid #ECECEC; + margin: 26px 0; + padding: 40px 25px; + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.15); +} + +body.adminimal-skin-material #system-themes-page h2 { + color: #455a64; + font-size: 26px; + font-weight: 500; + text-transform: none; +} + +body.adminimal-skin-material #page .operations a { + text-transform: uppercase; +} + +body.adminimal-skin-material.page-admin-appearance fieldset legend { + font-family: Roboto, sans-serif !important; + font-weight: 400 !important; + font-size: 20px !important; +} + +body.adminimal-skin-material fieldset { + border: none; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.18); + background: #fff; + border-radius: 3px; + padding-top: 42px; + position: relative; + margin-bottom: 20px; +} + +body.adminimal-skin-material .fieldset-description { + padding-top: 28px; + padding-bottom: 20px; + color: #909090; +} + +body.adminimal-skin-material .text-format-wrapper fieldset.filter-wrapper { + box-shadow: none; + border: 1px solid #DDD; + border-radius: 0; +} + +body.adminimal-skin-material .vertical-tabs-panes fieldset.vertical-tabs-pane { + box-shadow: none; +} + +body.adminimal-skin-material .form-item label, +body.adminimal-skin-material .exposed-filters .form-item label { + font-family: Roboto, sans-serif; +} + +body.adminimal-skin-material fieldset legend { + font-family: Roboto, sans-serif; + font-size: 20px; + font-weight: 500; + position: absolute; + top: 14px; +} + +body.adminimal-skin-material .features-export-parent fieldset legend { + top: 0; +} + +/* Omega Fieldset fix */ + +body.page-admin-appearance-settings-omega.adminimal-skin-material fieldset { + border: solid 1px #ddd !important; + border-top: 1px #ddd !important; + box-shadow: 0 1px 6px rgba(0, 0, 0, 0.18) !important; + padding: 12px !important; + padding-top: 42px !important; + margin: 18px 0 !important; +} + +/* Apperance page */ +body.page-admin-appearance.adminimal-skin-material fieldset legend { + font-family: Roboto, sans-serif !important; + font-size: 20px !important; + font-weight: 500 !important; + top: 16px; +} + +body.page-admin-appearance.adminimal-skin-material fieldset#edit-admin-theme { + padding-top: 13px; +} + +body.page-admin-appearance.adminimal-skin-material .theme-selector { + padding-bottom: 40px; + background: #FFFFFF; + border-radius: 4px; + border: none; + margin: 26px 0; + padding: 32px 25px; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.17); + width: 306px; + float: left; + margin-right: 20px; + height: 410px; + position: relative; + -o-transition:.3s; + -ms-transition:.3s; + -moz-transition:.3s; + -webkit-transition:.3s; + transition:.3s; +} + +body.page-admin-appearance.adminimal-skin-material .system-themes-list-disabled .theme-selector .screenshot, +body.page-admin-appearance.adminimal-skin-material .system-themes-list-disabled .theme-selector .no-screenshot { + border: 1px solid #e0e0d8; + padding: 2px; + vertical-align: bottom; + width: 294px; + height: 219px; + line-height: 219px; + text-align: center; +} + +body.page-admin-appearance.adminimal-skin-material .system-themes-list-enabled .theme-info h3{ + font-size: 20px; + font-weight: 600; + line-height: 1.5rem; + float: left; + width: 100%; + margin-top: 15px; +} + +body.page-admin-appearance.adminimal-skin-material .theme-selector .theme-description { + overflow: auto; + float: left; + margin-top: 2px; + max-height: 100px; +} + +body.page-admin-appearance.adminimal-skin-material .theme-selector .operations { + padding: 0; + position: absolute; + bottom: 0px; + font-size: 14px; + width: 100%; + font-weight: bold; + margin: 0; + left: 0px; + padding-top: 5px; + border-top: 1px solid #eee; +} + +body.page-admin-appearance.adminimal-skin-material .theme-selector .operations li { + float: right; + border: none; + padding: 0; +} + +body.page-admin-appearance.adminimal-skin-material .theme-selector .operations li a { + padding: 10px; +} + +body.page-admin-appearance.adminimal-skin-material .theme-selector .operations li.first a{ + padding: 10px; + margin-right: 10px; +} + +body.page-admin-appearance.adminimal-skin-material .theme-selector .operations li a:hover{ + color: #FF9800; + text-decoration: none; +} + +/* Custom Checkbox styling */ + +/* Chrome + Safari + Opera */ +@supports (-webkit-appearance:none) { +body.adminimal-skin-material.style-checkboxes input[type=checkbox], +body.adminimal-skin-material.style-checkboxes input[type=radio] { +-webkit-appearance:none; /* Safari and Chrome */ + display: inline-block; + position: relative; + top: 3px; + margin-right: 0.25em; + padding: 0; + background: #fff; + border: 2px solid #757575; + border-radius: 2px; + width: 14px !important; + height: 14px !important; + -webkit-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: background 0.5s ease; + outline: none; +} + +body.adminimal-skin-material.style-checkboxes input[type=radio] { + border-radius: 50%; + box-shadow: inset 0px 0px 0px 0px #fff; + transition: box-shadow .1s cubic-bezier(0.28,0.63,0.77,0.17); +} + +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:hover, +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:focus, +body.adminimal-skin-material.style-checkboxes input[type=radio]:hover, +body.adminimal-skin-material.style-checkboxes input[type=radio]:focus { + border-color: #757575; + cursor: pointer; +} + +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:checked, +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:disabled:checked, +body.adminimal-skin-material.style-checkboxes input[type=radio]:checked, +body.adminimal-skin-material.style-checkboxes input[type=radio]:disabled:checked{ + border-color: #0E9C57; +} + +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:checked, +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:disabled:checked { + background: url('images/check.svg') scroll no-repeat 0 0 #0E9C57; +} + +body.adminimal-skin-material.style-checkboxes input[type=radio]:checked, +body.adminimal-skin-material.style-checkboxes input[type=radio]:disabled:checked { + background: #0E9C57; + box-shadow: inset 0px 0px 0px 3px #fff; +} + +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:disabled, +body.adminimal-skin-material.style-checkboxes input[type=radio]:disabled { + opacity: .5; + background: #E2E2E2; +} + +body.adminimal-skin-material.style-checkboxes input[type=checkbox]:disabled:hover, +body.adminimal-skin-material.style-checkboxes input[type=radio]:disabled:hover { + border-color: #0E9C57; + cursor: default; + /*cursor: not-allowed;*/ + } +} + +/* Waves plugin (Ripple effect) */ +/*! + * Waves v0.6.6 + * http://fian.my.id/Waves + * + * Copyright 2014 Alfiana E. Sibuea and other contributors + * Released under the MIT license + * https://github.com/fians/Waves/blob/master/LICENSE + */ +.waves-effect { + position: relative; + cursor: pointer; + display: inline-block; + overflow: hidden; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -webkit-tap-highlight-color: transparent; +} +.waves-effect .waves-ripple { + position: absolute; + border-radius: 50%; + width: 100px; + height: 100px; + margin-top: -50px; + margin-left: -50px; + opacity: 0; + background: rgba(0, 0, 0, 0.2); + background: -webkit-radial-gradient(rgba(0, 0, 0, 0.2) 0, rgba(0, 0, 0, 0.3) 40%, rgba(0, 0, 0, 0.4) 50%, rgba(0, 0, 0, 0.5) 60%, rgba(255, 255, 255, 0) 70%); + background: -o-radial-gradient(rgba(0, 0, 0, 0.2) 0, rgba(0, 0, 0, 0.3) 40%, rgba(0, 0, 0, 0.4) 50%, rgba(0, 0, 0, 0.5) 60%, rgba(255, 255, 255, 0) 70%); + background: -moz-radial-gradient(rgba(0, 0, 0, 0.2) 0, rgba(0, 0, 0, 0.3) 40%, rgba(0, 0, 0, 0.4) 50%, rgba(0, 0, 0, 0.5) 60%, rgba(255, 255, 255, 0) 70%); + background: radial-gradient(rgba(0, 0, 0, 0.2) 0, rgba(0, 0, 0, 0.3) 40%, rgba(0, 0, 0, 0.4) 50%, rgba(0, 0, 0, 0.5) 60%, rgba(255, 255, 255, 0) 70%); + -webkit-transition: all 0.5s ease-out; + -moz-transition: all 0.5s ease-out; + -o-transition: all 0.5s ease-out; + transition: all 0.5s ease-out; + -webkit-transition-property: -webkit-transform, opacity; + -moz-transition-property: -moz-transform, opacity; + -o-transition-property: -o-transform, opacity; + transition-property: transform, opacity; + -webkit-transform: scale(0); + -moz-transform: scale(0); + -ms-transform: scale(0); + -o-transform: scale(0); + transform: scale(0); + pointer-events: none; +} +.waves-effect.waves-light .waves-ripple { + background: rgba(255, 255, 255, 0.4); + background: -webkit-radial-gradient(rgba(255, 255, 255, 0.2) 0, rgba(255, 255, 255, 0.3) 40%, rgba(255, 255, 255, 0.4) 50%, rgba(255, 255, 255, 0.5) 60%, rgba(255, 255, 255, 0) 70%); + background: -o-radial-gradient(rgba(255, 255, 255, 0.2) 0, rgba(255, 255, 255, 0.3) 40%, rgba(255, 255, 255, 0.4) 50%, rgba(255, 255, 255, 0.5) 60%, rgba(255, 255, 255, 0) 70%); + background: -moz-radial-gradient(rgba(255, 255, 255, 0.2) 0, rgba(255, 255, 255, 0.3) 40%, rgba(255, 255, 255, 0.4) 50%, rgba(255, 255, 255, 0.5) 60%, rgba(255, 255, 255, 0) 70%); + background: radial-gradient(rgba(255, 255, 255, 0.2) 0, rgba(255, 255, 255, 0.3) 40%, rgba(255, 255, 255, 0.4) 50%, rgba(255, 255, 255, 0.5) 60%, rgba(255, 255, 255, 0) 70%); +} +.waves-effect.waves-classic .waves-ripple { + background: rgba(0, 0, 0, 0.2); +} +.waves-effect.waves-classic.waves-light .waves-ripple { + background: rgba(255, 255, 255, 0.4); +} +.waves-notransition { + -webkit-transition: none !important; + -moz-transition: none !important; + -o-transition: none !important; + transition: none !important; +} +.waves-button, +.waves-circle { + -webkit-transform: translateZ(0); + -moz-transform: translateZ(0); + -ms-transform: translateZ(0); + -o-transform: translateZ(0); + transform: translateZ(0); + -webkit-mask-image: -webkit-radial-gradient(circle, #ffffff 100%, #000000 100%); +} +.waves-button, +.waves-button:hover, +.waves-button:visited, +.waves-button-input { + white-space: nowrap; + outline: none; + text-decoration: none; + z-index: 1; +} +.waves-button { + border-radius: 0.2em; +} +.waves-button-input { + margin: 0; + padding: 0.85em 1.1em; +} +.waves-input-wrapper { + border-radius: 0.2em; + vertical-align: middle; + z-index: 999; + margin-right: 1em; +} +.waves-input-wrapper.waves-button { + padding: 0; +} +.waves-input-wrapper .waves-button-input { + position: relative; + top: 0; + left: 0; + z-index: 0; +} +.waves-circle { + text-align: center; + width: 2.5em; + height: 2.5em; + line-height: 2.5em; + border-radius: 50%; +} +.waves-float { + -webkit-mask-image: none; + -webkit-box-shadow: 0px 1px 1.5px 1px rgba(0, 0, 0, 0.12); + box-shadow: 0px 1px 1.5px 1px rgba(0, 0, 0, 0.12); +} +.waves-float:active { + -webkit-box-shadow: 0px 8px 20px 1px rgba(0, 0, 0, 0.3); + box-shadow: 0px 8px 20px 1px rgba(0, 0, 0, 0.3); +} +.waves-block { + display: block; +} +/* Firefox Bug: link not triggered */ +a.waves-effect .waves-ripple { + z-index: -1; +} + +body.adminimal-skin-material #navigation ul.secondary { + overflow: hidden; +} + +body.adminimal-skin-material #navigation ul.secondary li { + height: 39px; +} + +body.adminimal-skin-material #navigation ul.secondary li a { + color: #777 !important; + background: #fff; +} + +body.adminimal-skin-material #navigation ul.secondary li a:hover { + color: #2196F3 !important; + border-color: #2196F3 !important; + background: #fff; +} + +body.adminimal-skin-material #navigation ul.secondary li a.active { + color: #000 !important; + background: #fff; +} + +body.adminimal-skin-material #navigation ul.secondary li a.active:hover { + border-color: #000 !important; +} + +body.adminimal-skin-material table th { + font-family: Roboto; + font-size: 16px; + font-weight: 400; +} + +body.adminimal-skin-material #webform-components tr.webform-add-form { + background-color: #E8F5E9; +} + +body.adminimal-skin-material table tr.add-new, +body.adminimal-skin-material table tr.add-new:hover { + background-color: #E8F5E9; +} + +body.adminimal-skin-material table tbody td a { + padding: .5em .75em; + border-radius: 3px; + vertical-align: middle; +} + +body.adminimal-skin-material table tbody td a.module-link { + padding: .5em 10px .5em 30px; +} + +body.adminimal-skin-material table tbody td a.module-link { + background-position-x: 10px; +} + +body.adminimal-skin-material table tbody td a:hover { + text-decoration: underline; +} + +/* Buttons */ + +/* Gray Button */ +input[type="submit"], +input.form-submit, +a.button, +div.exposed-filters input#edit-submit { + cursor: pointer; + background: #BBBBBB; + border: none; + padding: 6px 18px; + color: #fff; + text-align: center; + font-size: 1.077em; + font-family: Roboto, sans-serif; + font-weight: 500; + text-transform: uppercase; + border-radius: 0.2rem; + transition: all, 0.3s; +} + +input[type="submit"]:hover, +input.form-submit:hover, +a.button:hover, +div.exposed-filters input#edit-submit:hover { + box-shadow: 0 2px 6px rgba(0,0,0,.2); +} + +input[type="submit"]:active, +input.form-submit:active, +a.button:active, +div.exposed-filters input#edit-submit:active { + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +input[type="submit"]:focus, +input.form-submit:focus, +a.button:focus, +div.exposed-filters input#edit-submit:focus { + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + + +/* Green Button */ +input[type="submit"][id^="edit-submit"], +input#edit-actions-submit, +input[id^="save-continue"], +input[type="submit"][id^="edit-save"], +input#edit-save, +input#edit-submit, +input#edit-actions-save, +#media-browser-page a.button-yes, +input.add-new-condition, +#edit-field-product-und-form-actions input.ief-entity-submit { + cursor: pointer; + border: none; + padding: 6px 18px; + text-align: center; + font-weight: normal; + font-size: 1.077em; + background: #0E9C57; + color: #fff; + font-family: Roboto, sans-serif; + font-weight: 500; + text-transform: uppercase; + border-radius: 0.2rem; +} + +input[type="submit"][id^="edit-submit"]:hover, +input#edit-actions-submit:hover, +input[id^="save-continue"]:hover, +input[type="submit"][id^="edit-save"]:hover, +input#edit-save:hover, +input#edit-submit:hover, +input#edit-actions-save:hover, +#media-browser-page a.button-yes:hover, +input.add-new-condition:hover, +#edit-field-product-und-form-actions input.ief-entity-submit:hover { + box-shadow: 0 2px 6px rgba(0,0,0,.3); +} + +input[type="submit"][id^="edit-submit"]:active, +input#edit-actions-submit:active, +input[id^="save-continue"]:active, +input[type="submit"][id^="edit-save"]:active, +input#edit-save:active, +input#edit-submit:active, +input#edit-actions-save:active, +#media-browser-page a.button-yes:active, +input.add-new-condition:active, +#edit-field-product-und-form-actions input.ief-entity-submit:active { + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +input[type="submit"][id^="edit-submit"]:focus, +input#edit-actions-submit:focus, +input[id^="save-continue"]:focus, +input[type="submit"][id^="edit-save"]:focus, +input#edit-save:focus, +input#edit-submit:focus, +input#edit-actions-save:focus, +#media-browser-page a.button-yes:focus, +input.add-new-condition:focus, +#edit-field-product-und-form-actions input.ief-entity-submit:focus { + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +/* Red Button */ +input#edit-delete, +input#remove-button, +input#edit-remove, +input#edit-clear, +a.button.remove, +input[id*="remove-button"], +.page-node-delete input#edit-submit, +.page-admin-modules-uninstall input#edit-submit, +.remove-condition input, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit { + cursor: pointer; + padding: 6px 18px; + border: none; + color: #fff; + text-align: center; + font-weight: normal; + font-size: 1.077em; + background: #D32F2F; + font-family: Roboto, sans-serif; + font-weight: 500; + text-transform: uppercase; + border-radius: 0.2rem; + transition: all, 0.3s; +} + +input#edit-delete:hover, +input#remove-button:hover, +input#edit-remove:hover, +input#edit-clear:hover, +a.button.remove:hover, +input[id*="remove-button"]:hover, +.page-node-delete input#edit-submit:hover, +body.page-admin-modules-uninstall input#edit-submit:hover, +.remove-condition input:hover, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:hover { + box-shadow: 0 2px 6px rgba(0,0,0,.3); +} + +input#edit-delete:active, +input#remove-button:active, +input#edit-remove:active, +input#edit-clear:active, +input[id*="remove-button"]:active, +.page-node-delete input#edit-submit:active, +body.page-admin-modules-uninstall input#edit-submit:active, +.remove-condition input:active, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:active { + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +input#edit-delete:focus, +input#remove-button:focus, +input#edit-remove:focus, +input#edit-clear:focus, +input[id*="remove-button"]:focus, +.page-node-delete input#edit-submit:focus, +body.page-admin-modules-uninstall input#edit-submit:focus, +.remove-condition input:focus, +.field-widget-inline-entity-form .ief-entity-operations input[id*="remove"].form-submit:focus { + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +/* Blue Button */ +input#edit-preview, +input#edit-next, +input#preview-submit, +input.ief-entity-submit, +input[type="submit"][id^="edit-return"], +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"] { + cursor: pointer; + border: none; + padding: 6px 18px; + color: #fff; + text-align: center; + font-weight: normal; + font-size: 1.077em; + background: #0074BD; + font-family: Roboto, sans-serif; + font-weight: 500; + text-transform: uppercase; + border-radius: 0.2rem; + transition: all, 0.3s; +} + +input#edit-preview:hover, +input#edit-next:hover, +input#preview-submit:hover, +input.ief-entity-submit:hover, +input[type="submit"][id^="edit-return"]:hover, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:hover { + box-shadow: 0 2px 6px rgba(0,0,0,.3); +} + +input#edit-preview:active, +input#edit-next:active, +input#preview-submit:active, +input.ief-entity-submit:active, +input[type="submit"][id^="edit-return"]:active, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:active { + border: none; + color: #fff; + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +input#edit-preview:focus, +input#edit-next:focus, +input#preview-submit:focus, +input.ief-entity-submit:focus, +input[type="submit"][id^="edit-return"]:focus, +.field-widget-inline-entity-form .ief-entity-operations input[id*="edit"]:focus { + border: none; + color: #fff; + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +/* Orange Button */ +#edit-cancel, +#edit-actions-cancel, +input#edit-buttons-revert, +#media-browser-page a.button-no, +.field-widget-inline-entity-form input[id*="cancel"] { + cursor: pointer; + border: none; + padding: 6px 18px; + color: #fff; + text-align: center; + font-weight: normal; + font-size: 1.077em; + font-family: "Lucida Grande",Verdana,sans-serif; + background: #f69231; + transition: all, 0.3s; +} + +a#edit-cancel,a#edit-actions-cancel { + padding: 6px 10px; + text-decoration: none; + border: none; +} + +#edit-cancel:hover, +#edit-actions-cancel:hover, +input#edit-buttons-revert:hover, +#media-browser-page a.button-no:hover, +.field-widget-inline-entity-form input[id*="cancel"]:hover { + box-shadow: 0 2px 6px rgba(0,0,0,.3); +} + +#edit-cancel:active, +#edit-actions-cancel:active, +input#edit-buttons-revert:active, +.field-widget-inline-entity-form input[id*="cancel"]:active { + background: #333; + border: none; + color: #fff; + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +#edit-cancel:focus, +#edit-actions-cancel:focus, +input#edit-buttons-revert:focus, +.field-widget-inline-entity-form input[id*="cancel"]:focus { + background: #333; + border: none; + color: #fff; + outline: none; + box-shadow: inset 0 0px 8px rgba(0,0,0,0.4); +} + +.waves-input-wrapper input { + -o-transition:.5s; + -ms-transition:.5s; + -moz-transition:.5s; + -webkit-transition:.5s; + transition:.5s; +} + +.waves-input-wrapper:hover input { + box-shadow: inset 0 -2px 0px rgba(0, 0, 0, 0.18); +} + +body.adminimal-skin-material div.vertical-tabs ul li.vertical-tab-button strong { + font-size: 13px; +} + +/*body.adminimal-skin-material input.form-autocomplete, +body.adminimal-skin-material input.form-text, +body.adminimal-skin-material input.form-file, +body.adminimal-skin-material textarea.form-textarea, +body.adminimal-skin-material select.form-select { + border: none; + border-bottom: 2px solid #FF9800; + -o-transition:.3s; + -ms-transition:.3s; + -moz-transition:.3s; + -webkit-transition:.3s; + transition:.3s; +} + +body.adminimal-skin-material textarea.form-textarea { + border: 1px solid #ddd; +} + +body.adminimal-skin-material input.form-text:hover, +body.adminimal-skin-material input.form-file:hover, +body.adminimal-skin-material select.form-select:hover { + border-bottom: 2px solid #F57C00; +} + +body.adminimal-skin-material input.form-text:focus, +body.adminimal-skin-material input.form-file:focus, +body.adminimal-skin-material select.form-select:focus { + color: #000; + border-bottom: 2px solid #9C27B0; + outline: none; + outline-offset: 0px; +}*/ + +body.adminimal-skin-material #main-content div.admin-panel { + background-color: #fff; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.17); + border-radius: 3px; + padding: 15px 100px 20px 15px; +} + +html.js body.adminimal-skin-material #module-filter-submit input { + margin: 0; +} + +html.js body.adminimal-skin-material #module-filter-submit .form-actions { + padding: 20px 0; +} + +body.adminimal-skin-material .form-actions input { + height: 24px; + margin-right: 1rem; +} + +body.adminimal-skin-material .block-search .form-actions input, +body.adminimal-skin-material .exposed-filters input{ + height: initial; +} + +body.adminimal-skin-material.overlay #branding { + background-color: #FFFFFF; + border-bottom: 1px solid #ddd; + padding-bottom: 5px; + box-shadow: none; +} + +body.adminimal-skin-material.overlay div.breadcrumb a:hover { + color: #0074bd; +} + +body.adminimal-skin-material.overlay #overlay-close, +body.adminimal-skin-material.overlay #overlay-close:hover { + height: 44px; + background-position-y: 10px; + left: -36px; +} + +body.adminimal-skin-material.overlay #overlay-tabs { + right: 2px; +} + +body.adminimal-skin-material.overlay #overlay-tabs li:first-of-type a { + border-radius: 0.2em 0 0 0; +} + +body.adminimal-skin-material.overlay #overlay-tabs li:last-of-type a { + border-radius: 0 0.2em 0 0; +} + +body.adminimal-skin-material.overlay ul.secondary { + background: #F9F9F9; +} + +body.adminimal-skin-material .rules-elements-add ul.action-links a, +body.adminimal-skin-material ul.rules-operations a, +body.adminimal-skin-material .rules-elements-add ul.action-links a { + background: transparent; + color: #2196F3; + box-shadow: none; + padding: 8px 18px; + margin: 5px 0 0 0; +} + +body.adminimal-skin-material .rules-elements-add ul.action-links a:hover, +body.adminimal-skin-material ul.rules-operations a:hover, +body.adminimal-skin-material .rules-elements-add ul.action-links a:hover { + background: transparent; + color: #2196F3; + box-shadow: none; +} + +body.adminimal-skin-material .rules-elements-add ul.action-links a:focus, +body.adminimal-skin-material ul.rules-operations a:focus, +body.adminimal-skin-material .rules-elements-add ul.action-links a:focus { + text-decoration: none; +} + +body.sticky-actions.adminimal-skin-material .form-actions.form-wrapper { + padding: 20px 40px 20px; + box-shadow: -20px 2px 40px rgba(0,0,0,0.2); + border-bottom: none; +} + +body.sticky-actions.adminimal-skin-material #page { + margin-bottom: 80px; +} diff --git a/sites/all/themes/contrid/adminimal_theme/skins/material/material.js b/sites/all/themes/contrid/adminimal_theme/skins/material/material.js new file mode 100644 index 00000000..60a2abc4 --- /dev/null +++ b/sites/all/themes/contrid/adminimal_theme/skins/material/material.js @@ -0,0 +1,378 @@ +(function($) { +'use strict'; + +// Add wave effect. +Drupal.behaviors.adminimal_material_wave_effect = { + attach: function (context, settings) { + // Init Waves + $( ".action-links li a" ).addClass("waves-effect waves-button waves-float waves-classic"); + //$( ".form-actions input" ).addClass("waves-effect"); + //$( 'input[type="submit"]' ).addClass("waves-effect"); + $( "#navigation ul.tabs.primary li a" ).addClass("waves-effect waves-button waves-classic"); + $( "#navigation ul.tabs.secondary li a" ).addClass("waves-effect waves-button waves-classic"); + $( "#admin-menu a" ).addClass("waves-effect waves-button waves-light waves-classic"); + $( ".theme-info .operations a" ).addClass("waves-effect waves-button waves-classic"); + $( "table tbody td a" ).addClass("waves-effect waves-button waves-classic"); + } +}; + +})(jQuery); + +/*! + * Waves v0.6.6 + * http://fian.my.id/Waves + * + * Copyright 2014 Alfiana E. Sibuea and other contributors + * Released under the MIT license + * https://github.com/fians/Waves/blob/master/LICENSE + */ + +;(function(window, factory) { + "use strict"; + + // AMD. Register as an anonymous module. Wrap in function so we have access + // to root via `this`. + if (typeof define === "function" && define.amd) { + define([], function() { + return factory.apply(window); + }); + } + + // Node. Does not work with strict CommonJS, but only CommonJS-like + // environments that support module.exports, like Node. + else if (typeof exports === "object") { + module.exports = factory.call(window); + } + + // Browser globals. + else { + window.Waves = factory.call(window); + } +})(typeof global === "object" ? global : this, function () { + "use strict"; + + var Waves = Waves || {}; + var $$ = document.querySelectorAll.bind(document); + + // Find exact position of element + function isWindow(obj) { + return obj !== null && obj === obj.window; + } + + function getWindow(elem) { + return isWindow(elem) ? elem : elem.nodeType === 9 && elem.defaultView; + } + + function offset(elem) { + var docElem, win, + box = {top: 0, left: 0}, + doc = elem && elem.ownerDocument; + + docElem = doc.documentElement; + + if (typeof elem.getBoundingClientRect !== typeof undefined) { + box = elem.getBoundingClientRect(); + } + win = getWindow(doc); + return { + top: box.top + win.pageYOffset - docElem.clientTop, + left: box.left + win.pageXOffset - docElem.clientLeft + }; + } + + function convertStyle(obj) { + var style = ''; + + for (var a in obj) { + if (obj.hasOwnProperty(a)) { + style += (a + ':' + obj[a] + ';'); + } + } + + return style; + } + + var Effect = { + + // Effect delay + duration: 750, + + show: function(e, element) { + + // Disable right click + if (e.button === 2) { + return false; + } + + var el = element || this; + + // Create ripple + var ripple = document.createElement('div'); + ripple.className = 'waves-ripple'; + el.appendChild(ripple); + + // Get click coordinate and element witdh + var pos = offset(el); + var relativeY = (e.pageY - pos.top); + var relativeX = (e.pageX - pos.left); + var scale = 'scale('+((el.clientWidth / 100) * 3)+')'; + + // Support for touch devices + if ('touches' in e) { + relativeY = (e.touches[0].pageY - pos.top); + relativeX = (e.touches[0].pageX - pos.left); + } + + // Attach data to element + ripple.setAttribute('data-hold', Date.now()); + ripple.setAttribute('data-scale', scale); + ripple.setAttribute('data-x', relativeX); + ripple.setAttribute('data-y', relativeY); + + // Set ripple position + var rippleStyle = { + 'top': relativeY+'px', + 'left': relativeX+'px' + }; + + ripple.className = ripple.className + ' waves-notransition'; + ripple.setAttribute('style', convertStyle(rippleStyle)); + ripple.className = ripple.className.replace('waves-notransition', ''); + + // Scale the ripple + rippleStyle['-webkit-transform'] = scale; + rippleStyle['-moz-transform'] = scale; + rippleStyle['-ms-transform'] = scale; + rippleStyle['-o-transform'] = scale; + rippleStyle.transform = scale; + rippleStyle.opacity = '1'; + + rippleStyle['-webkit-transition-duration'] = Effect.duration + 'ms'; + rippleStyle['-moz-transition-duration'] = Effect.duration + 'ms'; + rippleStyle['-o-transition-duration'] = Effect.duration + 'ms'; + rippleStyle['transition-duration'] = Effect.duration + 'ms'; + + ripple.setAttribute('style', convertStyle(rippleStyle)); + }, + + hide: function(e) { + TouchHandler.touchup(e); + + var el = this; + var width = el.clientWidth * 1.4; + + // Get first ripple + var ripple = null; + var ripples = el.getElementsByClassName('waves-ripple'); + if (ripples.length > 0) { + ripple = ripples[ripples.length - 1]; + } else { + return false; + } + + var relativeX = ripple.getAttribute('data-x'); + var relativeY = ripple.getAttribute('data-y'); + var scale = ripple.getAttribute('data-scale'); + + // Get delay beetween mousedown and mouse leave + var diff = Date.now() - Number(ripple.getAttribute('data-hold')); + var delay = 350 - diff; + + if (delay < 0) { + delay = 0; + } + + // Fade out ripple after delay + setTimeout(function() { + var style = { + 'top': relativeY+'px', + 'left': relativeX+'px', + 'opacity': '0', + + // Duration + '-webkit-transition-duration': Effect.duration + 'ms', + '-moz-transition-duration': Effect.duration + 'ms', + '-o-transition-duration': Effect.duration + 'ms', + 'transition-duration': Effect.duration + 'ms', + '-webkit-transform': scale, + '-moz-transform': scale, + '-ms-transform': scale, + '-o-transform': scale, + 'transform': scale + }; + + ripple.setAttribute('style', convertStyle(style)); + + setTimeout(function() { + try { + el.removeChild(ripple); + } catch(e) { + return false; + } + }, Effect.duration); + }, delay); + }, + + // Little hack to make can perform waves effect + wrapInput: function(elements) { + for (var a = 0; a < elements.length; a++) { + var el = elements[a]; + + if (el.tagName.toLowerCase() === 'input') { + var parent = el.parentNode; + + // If input already have parent just pass through + if (parent.tagName.toLowerCase() === 'i' && parent.className.indexOf('waves-effect') !== -1) { + continue; + } + + // Put element class and style to the specified parent + var wrapper = document.createElement('i'); + wrapper.className = el.className + ' waves-input-wrapper'; + + var elementStyle = el.getAttribute('style'); + + if (!elementStyle) { + elementStyle = ''; + } + + wrapper.setAttribute('style', elementStyle); + + el.className = 'waves-button-input'; + el.removeAttribute('style'); + + // Put element as child + parent.replaceChild(wrapper, el); + wrapper.appendChild(el); + } + } + } + }; + + + /** + * Disable mousedown event for 500ms during and after touch + */ + var TouchHandler = { + /* uses an integer rather than bool so there's no issues with + * needing to clear timeouts if another touch event occurred + * within the 500ms. Cannot mouseup between touchstart and + * touchend, nor in the 500ms after touchend. */ + touches: 0, + allowEvent: function(e) { + var allow = true; + + if (e.type === 'touchstart') { + TouchHandler.touches += 1; //push + } else if (e.type === 'touchend' || e.type === 'touchcancel') { + setTimeout(function() { + if (TouchHandler.touches > 0) { + TouchHandler.touches -= 1; //pop after 500ms + } + }, 500); + } else if (e.type === 'mousedown' && TouchHandler.touches > 0) { + allow = false; + } + + return allow; + }, + touchup: function(e) { + TouchHandler.allowEvent(e); + } + }; + + + /** + * Delegated click handler for .waves-effect element. + * returns null when .waves-effect element not in "click tree" + */ + function getWavesEffectElement(e) { + if (TouchHandler.allowEvent(e) === false) { + return null; + } + + var element = null; + var target = e.target || e.srcElement; + + while (target.parentElement !== null) { + if (!(target instanceof SVGElement) && target.className.indexOf('waves-effect') !== -1) { + element = target; + break; + } else if (target.classList.contains('waves-effect')) { + element = target; + break; + } + target = target.parentElement; + } + + return element; + } + + /** + * Bubble the click and show effect if .waves-effect elem was found + */ + function showEffect(e) { + var element = getWavesEffectElement(e); + + if (element !== null) { + Effect.show(e, element); + + if ('ontouchstart' in window) { + element.addEventListener('touchend', Effect.hide, false); + element.addEventListener('touchcancel', Effect.hide, false); + } + + element.addEventListener('mouseup', Effect.hide, false); + element.addEventListener('mouseleave', Effect.hide, false); + } + } + + Waves.displayEffect = function(options) { + options = options || {}; + + if ('duration' in options) { + Effect.duration = options.duration; + } + + //Wrap input inside tag + Effect.wrapInput($$('.waves-effect')); + + if ('ontouchstart' in window) { + document.body.addEventListener('touchstart', showEffect, false); + } + + document.body.addEventListener('mousedown', showEffect, false); + }; + + /** + * Attach Waves to an input element (or any element which doesn't + * bubble mouseup/mousedown events). + * Intended to be used with dynamically loaded forms/inputs, or + * where the user doesn't want a delegated click handler. + */ + Waves.attach = function(element) { + //FUTURE: automatically add waves classes and allow users + // to specify them with an options param? Eg. light/classic/button + if (element.tagName.toLowerCase() === 'input') { + Effect.wrapInput([element]); + element = element.parentElement; + } + + if ('ontouchstart' in window) { + element.addEventListener('touchstart', showEffect, false); + } + + element.addEventListener('mousedown', showEffect, false); + }; + + return Waves; +}); + +// Init Waves +(function ($) { + Drupal.behaviors.wavesInit = { + attach: function (context, settings) { + Waves.displayEffect(); + } + }; +})(jQuery); diff --git a/sites/all/themes/contrid/adminimal_theme/template.php b/sites/all/themes/contrid/adminimal_theme/template.php index 0c706777..f96cec25 100644 --- a/sites/all/themes/contrid/adminimal_theme/template.php +++ b/sites/all/themes/contrid/adminimal_theme/template.php @@ -30,20 +30,50 @@ function adminimal_preprocess_html(&$vars) { drupal_add_css($adminimal_path . '/css/style.css', array('group' => CSS_THEME, 'media' => 'all', 'weight' => 1)); // Add conditional CSS for IE8 and below. - drupal_add_css($adminimal_path . '/css/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); + drupal_add_css($adminimal_path . '/css/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'weight' => 999, 'preprocess' => TRUE)); // Add conditional CSS for IE7 and below. - drupal_add_css($adminimal_path . '/css/ie7.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 7', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); + drupal_add_css($adminimal_path . '/css/ie7.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 7', '!IE' => FALSE), 'weight' => 999, 'preprocess' => TRUE)); // Add conditional CSS for IE6. - drupal_add_css($adminimal_path . '/css/ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 6', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); + drupal_add_css($adminimal_path . '/css/ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 6', '!IE' => FALSE), 'weight' => 999, 'preprocess' => TRUE)); + + //Add Homebox module support + if (module_exists('homebox')) { + drupal_add_css($adminimal_path . '/css/homebox_custom.css', array('group' => CSS_THEME, 'media' => 'all', 'weight' => 1)); + } // Add theme name to body class. $vars['classes_array'][] = 'adminimal-theme'; + // Style checkbox and radio buttons in Webkit Browsers. + if (theme_get_setting('style_checkboxes')) { + $vars['classes_array'][] = 'style-checkboxes'; + } + + // Disable rounded buttons setting. + if (!theme_get_setting('rounded_buttons')) { + $vars['classes_array'][] = 'no-rounded-buttons'; + } + + // Enable sticky action buttons. + if (theme_get_setting('sticky_actions')) { + $vars['classes_array'][] = 'sticky-actions'; + } + // Add icons to the admin configuration page. if (theme_get_setting('display_icons_config')) { - drupal_add_css($adminimal_path . '/css/icons-config.css', array('group' => CSS_THEME, 'weight' => 10, 'preprocess' => FALSE)); + drupal_add_css($adminimal_path . '/css/icons-config.css', array('group' => CSS_THEME, 'weight' => 10, 'preprocess' => TRUE)); + } + + // Add icons to the admin configuration page. + if (theme_get_setting('avoid_custom_font')) { + drupal_add_css($adminimal_path . '/css/avoid_custom_font.css', array('group' => CSS_THEME, 'weight' => 9000, 'preprocess' => TRUE)); + } + + // Load CKEditor styles if enabled in settings. + if (theme_get_setting('adminimal_ckeditor')) { + drupal_add_css($adminimal_path . '/css/ckeditor-adminimal.css', array('group' => CSS_THEME, 'media' => 'all', 'weight' => 2)); } // Define Default media queries. @@ -56,6 +86,23 @@ function adminimal_preprocess_html(&$vars) { $media_query_tablet = theme_get_setting('media_query_tablet'); } + // Load custom Adminimal skin. + $adminimal_skin = theme_get_setting('adminimal_theme_skin'); + if ((!is_null($adminimal_skin))) { + drupal_add_css($adminimal_path . '/skins/' . $adminimal_skin . '/' . $adminimal_skin . '.css', array('group' => CSS_THEME, 'weight' => 900, 'preprocess' => TRUE)); + // Add conditional CSS for Mac OS X. + drupal_add_css($adminimal_path . '/skins/' . $adminimal_skin . '/mac_os_x.css', array('group' => CSS_THEME, 'weight' => 950, 'preprocess' => TRUE)); + drupal_add_js($adminimal_path . '/skins/' . $adminimal_skin . '/' . $adminimal_skin . '.js'); + $vars['classes_array'][] = 'adminimal-skin-' . $adminimal_skin ; + } + else { + drupal_add_css($adminimal_path . '/skins/default/default.css', array('group' => CSS_THEME, 'weight' => 900, 'preprocess' => TRUE)); + // Add conditional CSS for Mac OS X. + drupal_add_css($adminimal_path . '/skins/default/mac_os_x.css', array('group' => CSS_THEME, 'weight' => 950, 'preprocess' => TRUE)); + drupal_add_js($adminimal_path . '/skins/default/default.js'); + $vars['classes_array'][] = 'adminimal-skin-default' ; + } + // Add responsive styles. drupal_add_css($adminimal_path . '/css/mobile.css', array('group' => CSS_THEME, 'media' => $media_query_mobile, 'weight' => 1000)); drupal_add_css($adminimal_path . '/css/tablet.css', array('group' => CSS_THEME, 'media' => $media_query_tablet, 'weight' => 1000)); @@ -63,7 +110,7 @@ function adminimal_preprocess_html(&$vars) { // Add custom CSS. $custom_css_path = 'public://adminimal-custom.css'; if (theme_get_setting('custom_css') && file_exists($custom_css_path)) { - drupal_add_css($custom_css_path, array('group' => CSS_THEME, 'weight' => 9999, 'preprocess' => FALSE)); + drupal_add_css($custom_css_path, array('group' => CSS_THEME, 'weight' => 9999, 'preprocess' => TRUE)); } // Fix the viewport and zooming in mobile devices. @@ -76,6 +123,26 @@ function adminimal_preprocess_html(&$vars) { ); drupal_add_html_head($viewport, 'viewport'); + // Remove the no-sidebars class which is always added by core. Core assumes + // the sidebar regions are called sidebar_first and sidebar_second, which + // is not the case in this theme. + $key = array_search('no-sidebars', $vars['classes_array']); + if ($key !== FALSE) { + unset($vars['classes_array'][$key]); + } + // Add information about the number of sidebars. + if (!empty($vars['page']['sidebar_left']) && !empty($vars['page']['sidebar_right'])) { + $vars['classes_array'][] = 'two-sidebars'; + } + elseif (!empty($vars['page']['sidebar_left'])) { + $vars['classes_array'][] = 'one-sidebar sidebar-left'; + } + elseif (!empty($vars['page']['sidebar_right'])) { + $vars['classes_array'][] = 'one-sidebar sidebar-right'; + } + else { + $vars['classes_array'][] = 'no-sidebars'; + } } /** @@ -88,7 +155,7 @@ function adminimal_preprocess_page(&$vars) { '#theme' => 'menu_local_tasks', '#secondary' => $vars['tabs']['#secondary'], ); - + unset($vars['page']['hidden']); } /** @@ -138,7 +205,7 @@ function adminimal_adminimal_block_content($variables) { /** * Implements theme_tablesort_indicator(). - * + * * Use our own image versions, so they show up as black and not gray on gray. */ function adminimal_tablesort_indicator($variables) { @@ -169,6 +236,16 @@ function adminimal_css_alter(&$css) { } } +/** + * Implements hook_js_alter(). + */ +function adminimal_js_alter(&$javascript) { + // Fix module filter available updates page. + if (isset($javascript[drupal_get_path('module','module_filter').'/js/update_status.js'])) { + $javascript[drupal_get_path('module','module_filter').'/js/update_status.js']['data'] = drupal_get_path('theme', 'adminimal') . '/js/update_status.js'; + } +} + /** * Implements theme_admin_block(). * Adding classes to the administration blocks see issue #1869690. @@ -206,7 +283,6 @@ function adminimal_admin_block($variables) { $output .= ''; return $output; - } /** diff --git a/sites/all/themes/contrid/adminimal_theme/templates/maintenance-page.tpl.php b/sites/all/themes/contrid/adminimal_theme/templates/maintenance-page.tpl.php index abe98426..ebd4f033 100644 --- a/sites/all/themes/contrid/adminimal_theme/templates/maintenance-page.tpl.php +++ b/sites/all/themes/contrid/adminimal_theme/templates/maintenance-page.tpl.php @@ -24,14 +24,14 @@
-
-
-
- 
-
+
+
+
+
+
-
-
+
+
diff --git a/sites/all/themes/contrid/adminimal_theme/theme-settings.php b/sites/all/themes/contrid/adminimal_theme/theme-settings.php
index 904c00be..62ed81b5 100644
--- a/sites/all/themes/contrid/adminimal_theme/theme-settings.php
+++ b/sites/all/themes/contrid/adminimal_theme/theme-settings.php
@@ -1,6 +1,5 @@
-10,
);
+ $form['skin'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Adminimal skin'),
+ '#weight' => -11,
+ );
+
+ // Create the select list.
+ $form['skin']['adminimal_theme_skin'] = array(
+ '#type' => 'select',
+ '#title' => t('Skin selection'),
+ '#default_value' => theme_get_setting('adminimal_theme_skin'),
+ '#options' => array(
+ 'default' => t('Adminimal Default'),
+ //'dark' => t('Dark'),
+ //'flat' => t('Flat'),
+ 'material' => t('Material (BETA version)'),
+ 'alternative' => t('Alternative'),
+ ),
+ '#description' => t('Select desired skin style. Note that this feature is in beta stage and there might be some issues.'),
+ '#required' => FALSE,
+ );
+
+ $form['adminimal_custom']['style_checkboxes'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Style checkboxes and radio buttons in Webkit browsers.'),
+ '#description' => t('Enabling this option will style checkbox and radio buttons for Webkit browsers like Google Chrome, Safari, Opera and their mobile versions.
+ Enabling this option will not have any negative impact on older browsers that dont support pure CSS styling of checkboxes like Internet Explorer or Firefox.'),
+ '#default_value' => theme_get_setting('style_checkboxes'),
+ );
+
$form['adminimal_custom']['display_icons_config'] = array(
'#type' => 'checkbox',
'#title' => t('Display icons in Configuration page'),
'#default_value' => theme_get_setting('display_icons_config'),
);
+ $form['adminimal_custom']['rounded_buttons'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use rounded buttons'),
+ '#description' => t('Uncheck this setting if you dont like the rounded button styling for some action links'),
+ '#default_value' => theme_get_setting('rounded_buttons'),
+ );
+
+ $form['adminimal_custom']['sticky_actions'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Sticky form actions'),
+ '#description' => t('This will make the form actions div fixed bottom positioning. So for example when you visit the node edit page you wont need to scroll down to save/preview/delete the node. The form action buttons will be sticky to the bottom of the screen.'),
+ '#default_value' => theme_get_setting('sticky_actions'),
+ );
+
+ $form['adminimal_custom']['avoid_custom_font'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Avoid using "Open Sans" font'),
+ '#description' => t('(useful for languages that are not well supported by the "Open sans" font. Like Japanese for example)'),
+ '#default_value' => theme_get_setting('avoid_custom_font'),
+ );
+
+ $form['adminimal_custom']['adminimal_ckeditor'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('CKEditor support'),
+ '#description' => t('Loads custom adminimal css skin for CKEditor. Disable this to avoid css conflicts when using other CKEditor skins.'),
+ '#default_value' => theme_get_setting('adminimal_ckeditor'),
+ );
+
$form['adminimal_custom']['use_custom_media_queries'] = array(
'#type' => 'checkbox',
'#title' => t('Use Custom Media Queries'),