diff --git a/js/materio_flag-ck.js b/js/materio_flag-ck.js
index 6df69d89..db11971d 100644
--- a/js/materio_flag-ck.js
+++ b/js/materio_flag-ck.js
@@ -2,4 +2,4 @@
/**
* misc
*/// ------ TRACE ------
-function trace(e,t){window.console&&window.console.debug&&(arguments.length===2?window.console.debug(e,t):window.console.debug(e))}function Timeout(e,t){var n=setTimeout(e,t);this.cleared=!1;this.clear=function(){this.cleared=!0;clearTimeout(n)}}function HexToRGB(e){if(e.charAt(0)=="#"){var t=e.substring(1,7),n=parseInt(t.substring(0,2),16),r=parseInt(t.substring(2,4),16),i=parseInt(t.substring(4,6),16);return"rgb("+n+", "+r+", "+i+")"}return null}function pair(e){return typeof e=="number"?e%2==0?!0:!1:null}function random(e,t){return arguments.length===1&&typeof e=="number"?Math.random()*e:arguments.length===2&&typeof e==typeof t&&typeof e=="number"?e+Math.random()*(t-e):NaN}function round(e,t){if(arguments.length==1)e=Math.round(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.round(e*t)/t}return e}function floor(e,t){if(arguments.length==1)e=Math.floor(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.floor(e*t)/t}return e}function ceil(e,t){if(arguments.length==1)e=Math.ceil(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.ceil(e*t)/t}return e}function array_subtract(e,t){var n=new Array;for(var r=e.length-1;r>=0;r--)t.contains(e[r])||n.push(e[r]);return n}function objectSize(e){var t=e.length?--e.length:0;for(var n in e)t++;return t}function objectIsEmpty(e){for(var t in e)if(e.hasOwnProperty(t))return!1;return!0}function objectGetKey(e,t){var n=0;for(var r in e){if(r==="length"||!e.hasOwnProperty(r))continue;if(n==t)return r;n++}}function objectSort(e,t){var n=new Array;for(var r=objectSize(e)-1;r>=0;r--){var i=objectGetKey(e,r);for(var s=objectSize(e[i].wit)-1;s>=0;s--){var o=objectGetKey(e[i].wit,s);if(o==t){var u=parseFloat(e[i].wit[o]);n.push({wit:u,nid:i})}}}n.sort(function(e,t){return t.wit-e.wit});var a={};for(var r=n.length-1;r>=0;r--)a[n[r].nid]=e[n[r].nid];return a}function getElementAngle(e,t,n,r){var i=n-e,s=r-t,o=Math.abs(Math.atan(s/i)*180/Math.PI);i>0&&s<0?o=90-o:i>=0&&s>=0?o+=90:i<0&&s>=0?o=180+(90-o):o+=270;return o}String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/gi,"").replace(/[ ]{2,}/gi," ").replace(/\n /,"\n")};var Latinise={};Latinise.latin_map={"Á":"A","Ă":"A","Ắ":"A","Ặ":"A","Ằ":"A","Ẳ":"A","Ẵ":"A","Ǎ":"A","Â":"A","Ấ":"A","Ậ":"A","Ầ":"A","Ẩ":"A","Ẫ":"A","Ä":"A","Ǟ":"A","Ȧ":"A","Ǡ":"A","Ạ":"A","Ȁ":"A","À":"A","Ả":"A","Ȃ":"A","Ā":"A","Ą":"A","Å":"A","Ǻ":"A","Ḁ":"A","Ⱥ":"A","Ã":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ḃ":"B","Ḅ":"B","Ɓ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ć":"C","Č":"C","Ç":"C","Ḉ":"C","Ĉ":"C","Ċ":"C","Ƈ":"C","Ȼ":"C","Ď":"D","Ḑ":"D","Ḓ":"D","Ḋ":"D","Ḍ":"D","Ɗ":"D","Ḏ":"D","Dz":"D","Dž":"D","Đ":"D","Ƌ":"D","DZ":"DZ","DŽ":"DZ","É":"E","Ĕ":"E","Ě":"E","Ȩ":"E","Ḝ":"E","Ê":"E","Ế":"E","Ệ":"E","Ề":"E","Ể":"E","Ễ":"E","Ḙ":"E","Ë":"E","Ė":"E","Ẹ":"E","Ȅ":"E","È":"E","Ẻ":"E","Ȇ":"E","Ē":"E","Ḗ":"E","Ḕ":"E","Ę":"E","Ɇ":"E","Ẽ":"E","Ḛ":"E","Ꝫ":"ET","Ḟ":"F","Ƒ":"F","Ǵ":"G","Ğ":"G","Ǧ":"G","Ģ":"G","Ĝ":"G","Ġ":"G","Ɠ":"G","Ḡ":"G","Ǥ":"G","Ḫ":"H","Ȟ":"H","Ḩ":"H","Ĥ":"H","Ⱨ":"H","Ḧ":"H","Ḣ":"H","Ḥ":"H","Ħ":"H","Í":"I","Ĭ":"I","Ǐ":"I","Î":"I","Ï":"I","Ḯ":"I","İ":"I","Ị":"I","Ȉ":"I","Ì":"I","Ỉ":"I","Ȋ":"I","Ī":"I","Į":"I","Ɨ":"I","Ĩ":"I","Ḭ":"I","Ꝺ":"D","Ꝼ":"F","Ᵹ":"G","Ꞃ":"R","Ꞅ":"S","Ꞇ":"T","Ꝭ":"IS","Ĵ":"J","Ɉ":"J","Ḱ":"K","Ǩ":"K","Ķ":"K","Ⱪ":"K","Ꝃ":"K","Ḳ":"K","Ƙ":"K","Ḵ":"K","Ꝁ":"K","Ꝅ":"K","Ĺ":"L","Ƚ":"L","Ľ":"L","Ļ":"L","Ḽ":"L","Ḷ":"L","Ḹ":"L","Ⱡ":"L","Ꝉ":"L","Ḻ":"L","Ŀ":"L","Ɫ":"L","Lj":"L","Ł":"L","LJ":"LJ","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ń":"N","Ň":"N","Ņ":"N","Ṋ":"N","Ṅ":"N","Ṇ":"N","Ǹ":"N","Ɲ":"N","Ṉ":"N","Ƞ":"N","Nj":"N","Ñ":"N","NJ":"NJ","Ó":"O","Ŏ":"O","Ǒ":"O","Ô":"O","Ố":"O","Ộ":"O","Ồ":"O","Ổ":"O","Ỗ":"O","Ö":"O","Ȫ":"O","Ȯ":"O","Ȱ":"O","Ọ":"O","Ő":"O","Ȍ":"O","Ò":"O","Ỏ":"O","Ơ":"O","Ớ":"O","Ợ":"O","Ờ":"O","Ở":"O","Ỡ":"O","Ȏ":"O","Ꝋ":"O","Ꝍ":"O","Ō":"O","Ṓ":"O","Ṑ":"O","Ɵ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Õ":"O","Ṍ":"O","Ṏ":"O","Ȭ":"O","Ƣ":"OI","Ꝏ":"OO","Ɛ":"E","Ɔ":"O","Ȣ":"OU","Ṕ":"P","Ṗ":"P","Ꝓ":"P","Ƥ":"P","Ꝕ":"P","Ᵽ":"P","Ꝑ":"P","Ꝙ":"Q","Ꝗ":"Q","Ŕ":"R","Ř":"R","Ŗ":"R","Ṙ":"R","Ṛ":"R","Ṝ":"R","Ȑ":"R","Ȓ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꜿ":"C","Ǝ":"E","Ś":"S","Ṥ":"S","Š":"S","Ṧ":"S","Ş":"S","Ŝ":"S","Ș":"S","Ṡ":"S","Ṣ":"S","Ṩ":"S","Ť":"T","Ţ":"T","Ṱ":"T","Ț":"T","Ⱦ":"T","Ṫ":"T","Ṭ":"T","Ƭ":"T","Ṯ":"T","Ʈ":"T","Ŧ":"T","Ɐ":"A","Ꞁ":"L","Ɯ":"M","Ʌ":"V","Ꜩ":"TZ","Ú":"U","Ŭ":"U","Ǔ":"U","Û":"U","Ṷ":"U","Ü":"U","Ǘ":"U","Ǚ":"U","Ǜ":"U","Ǖ":"U","Ṳ":"U","Ụ":"U","Ű":"U","Ȕ":"U","Ù":"U","Ủ":"U","Ư":"U","Ứ":"U","Ự":"U","Ừ":"U","Ử":"U","Ữ":"U","Ȗ":"U","Ū":"U","Ṻ":"U","Ų":"U","Ů":"U","Ũ":"U","Ṹ":"U","Ṵ":"U","Ꝟ":"V","Ṿ":"V","Ʋ":"V","Ṽ":"V","Ꝡ":"VY","Ẃ":"W","Ŵ":"W","Ẅ":"W","Ẇ":"W","Ẉ":"W","Ẁ":"W","Ⱳ":"W","Ẍ":"X","Ẋ":"X","Ý":"Y","Ŷ":"Y","Ÿ":"Y","Ẏ":"Y","Ỵ":"Y","Ỳ":"Y","Ƴ":"Y","Ỷ":"Y","Ỿ":"Y","Ȳ":"Y","Ɏ":"Y","Ỹ":"Y","Ź":"Z","Ž":"Z","Ẑ":"Z","Ⱬ":"Z","Ż":"Z","Ẓ":"Z","Ȥ":"Z","Ẕ":"Z","Ƶ":"Z","IJ":"IJ","Œ":"OE","ᴀ":"A","ᴁ":"AE","ʙ":"B","ᴃ":"B","ᴄ":"C","ᴅ":"D","ᴇ":"E","ꜰ":"F","ɢ":"G","ʛ":"G","ʜ":"H","ɪ":"I","ʁ":"R","ᴊ":"J","ᴋ":"K","ʟ":"L","ᴌ":"L","ᴍ":"M","ɴ":"N","ᴏ":"O","ɶ":"OE","ᴐ":"O","ᴕ":"OU","ᴘ":"P","ʀ":"R","ᴎ":"N","ᴙ":"R","ꜱ":"S","ᴛ":"T","ⱻ":"E","ᴚ":"R","ᴜ":"U","ᴠ":"V","ᴡ":"W","ʏ":"Y","ᴢ":"Z","á":"a","ă":"a","ắ":"a","ặ":"a","ằ":"a","ẳ":"a","ẵ":"a","ǎ":"a","â":"a","ấ":"a","ậ":"a","ầ":"a","ẩ":"a","ẫ":"a","ä":"a","ǟ":"a","ȧ":"a","ǡ":"a","ạ":"a","ȁ":"a","à":"a","ả":"a","ȃ":"a","ā":"a","ą":"a","ᶏ":"a","ẚ":"a","å":"a","ǻ":"a","ḁ":"a","ⱥ":"a","ã":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ḃ":"b","ḅ":"b","ɓ":"b","ḇ":"b","ᵬ":"b","ᶀ":"b","ƀ":"b","ƃ":"b","ɵ":"o","ć":"c","č":"c","ç":"c","ḉ":"c","ĉ":"c","ɕ":"c","ċ":"c","ƈ":"c","ȼ":"c","ď":"d","ḑ":"d","ḓ":"d","ȡ":"d","ḋ":"d","ḍ":"d","ɗ":"d","ᶑ":"d","ḏ":"d","ᵭ":"d","ᶁ":"d","đ":"d","ɖ":"d","ƌ":"d","ı":"i","ȷ":"j","ɟ":"j","ʄ":"j","dz":"dz","dž":"dz","é":"e","ĕ":"e","ě":"e","ȩ":"e","ḝ":"e","ê":"e","ế":"e","ệ":"e","ề":"e","ể":"e","ễ":"e","ḙ":"e","ë":"e","ė":"e","ẹ":"e","ȅ":"e","è":"e","ẻ":"e","ȇ":"e","ē":"e","ḗ":"e","ḕ":"e","ⱸ":"e","ę":"e","ᶒ":"e","ɇ":"e","ẽ":"e","ḛ":"e","ꝫ":"et","ḟ":"f","ƒ":"f","ᵮ":"f","ᶂ":"f","ǵ":"g","ğ":"g","ǧ":"g","ģ":"g","ĝ":"g","ġ":"g","ɠ":"g","ḡ":"g","ᶃ":"g","ǥ":"g","ḫ":"h","ȟ":"h","ḩ":"h","ĥ":"h","ⱨ":"h","ḧ":"h","ḣ":"h","ḥ":"h","ɦ":"h","ẖ":"h","ħ":"h","ƕ":"hv","í":"i","ĭ":"i","ǐ":"i","î":"i","ï":"i","ḯ":"i","ị":"i","ȉ":"i","ì":"i","ỉ":"i","ȋ":"i","ī":"i","į":"i","ᶖ":"i","ɨ":"i","ĩ":"i","ḭ":"i","ꝺ":"d","ꝼ":"f","ᵹ":"g","ꞃ":"r","ꞅ":"s","ꞇ":"t","ꝭ":"is","ǰ":"j","ĵ":"j","ʝ":"j","ɉ":"j","ḱ":"k","ǩ":"k","ķ":"k","ⱪ":"k","ꝃ":"k","ḳ":"k","ƙ":"k","ḵ":"k","ᶄ":"k","ꝁ":"k","ꝅ":"k","ĺ":"l","ƚ":"l","ɬ":"l","ľ":"l","ļ":"l","ḽ":"l","ȴ":"l","ḷ":"l","ḹ":"l","ⱡ":"l","ꝉ":"l","ḻ":"l","ŀ":"l","ɫ":"l","ᶅ":"l","ɭ":"l","ł":"l","lj":"lj","ſ":"s","ẜ":"s","ẛ":"s","ẝ":"s","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ᵯ":"m","ᶆ":"m","ń":"n","ň":"n","ņ":"n","ṋ":"n","ȵ":"n","ṅ":"n","ṇ":"n","ǹ":"n","ɲ":"n","ṉ":"n","ƞ":"n","ᵰ":"n","ᶇ":"n","ɳ":"n","ñ":"n","nj":"nj","ó":"o","ŏ":"o","ǒ":"o","ô":"o","ố":"o","ộ":"o","ồ":"o","ổ":"o","ỗ":"o","ö":"o","ȫ":"o","ȯ":"o","ȱ":"o","ọ":"o","ő":"o","ȍ":"o","ò":"o","ỏ":"o","ơ":"o","ớ":"o","ợ":"o","ờ":"o","ở":"o","ỡ":"o","ȏ":"o","ꝋ":"o","ꝍ":"o","ⱺ":"o","ō":"o","ṓ":"o","ṑ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","õ":"o","ṍ":"o","ṏ":"o","ȭ":"o","ƣ":"oi","ꝏ":"oo","ɛ":"e","ᶓ":"e","ɔ":"o","ᶗ":"o","ȣ":"ou","ṕ":"p","ṗ":"p","ꝓ":"p","ƥ":"p","ᵱ":"p","ᶈ":"p","ꝕ":"p","ᵽ":"p","ꝑ":"p","ꝙ":"q","ʠ":"q","ɋ":"q","ꝗ":"q","ŕ":"r","ř":"r","ŗ":"r","ṙ":"r","ṛ":"r","ṝ":"r","ȑ":"r","ɾ":"r","ᵳ":"r","ȓ":"r","ṟ":"r","ɼ":"r","ᵲ":"r","ᶉ":"r","ɍ":"r","ɽ":"r","ↄ":"c","ꜿ":"c","ɘ":"e","ɿ":"r","ś":"s","ṥ":"s","š":"s","ṧ":"s","ş":"s","ŝ":"s","ș":"s","ṡ":"s","ṣ":"s","ṩ":"s","ʂ":"s","ᵴ":"s","ᶊ":"s","ȿ":"s","ɡ":"g","ᴑ":"o","ᴓ":"o","ᴝ":"u","ť":"t","ţ":"t","ṱ":"t","ț":"t","ȶ":"t","ẗ":"t","ⱦ":"t","ṫ":"t","ṭ":"t","ƭ":"t","ṯ":"t","ᵵ":"t","ƫ":"t","ʈ":"t","ŧ":"t","ᵺ":"th","ɐ":"a","ᴂ":"ae","ǝ":"e","ᵷ":"g","ɥ":"h","ʮ":"h","ʯ":"h","ᴉ":"i","ʞ":"k","ꞁ":"l","ɯ":"m","ɰ":"m","ᴔ":"oe","ɹ":"r","ɻ":"r","ɺ":"r","ⱹ":"r","ʇ":"t","ʌ":"v","ʍ":"w","ʎ":"y","ꜩ":"tz","ú":"u","ŭ":"u","ǔ":"u","û":"u","ṷ":"u","ü":"u","ǘ":"u","ǚ":"u","ǜ":"u","ǖ":"u","ṳ":"u","ụ":"u","ű":"u","ȕ":"u","ù":"u","ủ":"u","ư":"u","ứ":"u","ự":"u","ừ":"u","ử":"u","ữ":"u","ȗ":"u","ū":"u","ṻ":"u","ų":"u","ᶙ":"u","ů":"u","ũ":"u","ṹ":"u","ṵ":"u","ᵫ":"ue","ꝸ":"um","ⱴ":"v","ꝟ":"v","ṿ":"v","ʋ":"v","ᶌ":"v","ⱱ":"v","ṽ":"v","ꝡ":"vy","ẃ":"w","ŵ":"w","ẅ":"w","ẇ":"w","ẉ":"w","ẁ":"w","ⱳ":"w","ẘ":"w","ẍ":"x","ẋ":"x","ᶍ":"x","ý":"y","ŷ":"y","ÿ":"y","ẏ":"y","ỵ":"y","ỳ":"y","ƴ":"y","ỷ":"y","ỿ":"y","ȳ":"y","ẙ":"y","ɏ":"y","ỹ":"y","ź":"z","ž":"z","ẑ":"z","ʑ":"z","ⱬ":"z","ż":"z","ẓ":"z","ȥ":"z","ẕ":"z","ᵶ":"z","ᶎ":"z","ʐ":"z","ƶ":"z","ɀ":"z","ff":"ff","ffi":"ffi","ffl":"ffl","fi":"fi","fl":"fl","ij":"ij","œ":"oe","st":"st","ₐ":"a","ₑ":"e","ᵢ":"i","ⱼ":"j","ₒ":"o","ᵣ":"r","ᵤ":"u","ᵥ":"v","ₓ":"x"};String.prototype.latinise=function(){return this.replace(/[^A-Za-z0-9\[\] ]/g,function(e){return Latinise.latin_map[e]||e})};String.prototype.latinize=String.prototype.latinise;String.prototype.isLatin=function(){return this==this.latinise()};array_unique=function(e){var t=new Array;e:for(var n=0,r=e.length;n ').appendTo("body");n.css({position:"absolute",top:"40%",left:"50%",marginLeft:"-200px",width:"400px",zIndex:"99999"}).append(t.return)}function u(t){var n="materioflag/createlist/"+t;e.getJSON(n,function(e){trace("json",e)})}t()};var t=new MaterioFlag})(jQuery);
\ No newline at end of file
+function trace(e,t){window.console&&window.console.debug&&(arguments.length===2?window.console.debug(e,t):window.console.debug(e))}function Timeout(e,t){var n=setTimeout(e,t);this.cleared=!1;this.clear=function(){this.cleared=!0;clearTimeout(n)}}function HexToRGB(e){if(e.charAt(0)=="#"){var t=e.substring(1,7),n=parseInt(t.substring(0,2),16),r=parseInt(t.substring(2,4),16),i=parseInt(t.substring(4,6),16);return"rgb("+n+", "+r+", "+i+")"}return null}function pair(e){return typeof e=="number"?e%2==0?!0:!1:null}function random(e,t){return arguments.length===1&&typeof e=="number"?Math.random()*e:arguments.length===2&&typeof e==typeof t&&typeof e=="number"?e+Math.random()*(t-e):NaN}function round(e,t){if(arguments.length==1)e=Math.round(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.round(e*t)/t}return e}function floor(e,t){if(arguments.length==1)e=Math.floor(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.floor(e*t)/t}return e}function ceil(e,t){if(arguments.length==1)e=Math.ceil(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.ceil(e*t)/t}return e}function array_subtract(e,t){var n=new Array;for(var r=e.length-1;r>=0;r--)t.contains(e[r])||n.push(e[r]);return n}function objectSize(e){var t=e.length?--e.length:0;for(var n in e)t++;return t}function objectIsEmpty(e){for(var t in e)if(e.hasOwnProperty(t))return!1;return!0}function objectGetKey(e,t){var n=0;for(var r in e){if(r==="length"||!e.hasOwnProperty(r))continue;if(n==t)return r;n++}}function objectSort(e,t){var n=new Array;for(var r=objectSize(e)-1;r>=0;r--){var i=objectGetKey(e,r);for(var s=objectSize(e[i].wit)-1;s>=0;s--){var o=objectGetKey(e[i].wit,s);if(o==t){var u=parseFloat(e[i].wit[o]);n.push({wit:u,nid:i})}}}n.sort(function(e,t){return t.wit-e.wit});var a={};for(var r=n.length-1;r>=0;r--)a[n[r].nid]=e[n[r].nid];return a}function getElementAngle(e,t,n,r){var i=n-e,s=r-t,o=Math.abs(Math.atan(s/i)*180/Math.PI);i>0&&s<0?o=90-o:i>=0&&s>=0?o+=90:i<0&&s>=0?o=180+(90-o):o+=270;return o}String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/gi,"").replace(/[ ]{2,}/gi," ").replace(/\n /,"\n")};var Latinise={};Latinise.latin_map={"Á":"A","Ă":"A","Ắ":"A","Ặ":"A","Ằ":"A","Ẳ":"A","Ẵ":"A","Ǎ":"A","Â":"A","Ấ":"A","Ậ":"A","Ầ":"A","Ẩ":"A","Ẫ":"A","Ä":"A","Ǟ":"A","Ȧ":"A","Ǡ":"A","Ạ":"A","Ȁ":"A","À":"A","Ả":"A","Ȃ":"A","Ā":"A","Ą":"A","Å":"A","Ǻ":"A","Ḁ":"A","Ⱥ":"A","Ã":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ḃ":"B","Ḅ":"B","Ɓ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ć":"C","Č":"C","Ç":"C","Ḉ":"C","Ĉ":"C","Ċ":"C","Ƈ":"C","Ȼ":"C","Ď":"D","Ḑ":"D","Ḓ":"D","Ḋ":"D","Ḍ":"D","Ɗ":"D","Ḏ":"D","Dz":"D","Dž":"D","Đ":"D","Ƌ":"D","DZ":"DZ","DŽ":"DZ","É":"E","Ĕ":"E","Ě":"E","Ȩ":"E","Ḝ":"E","Ê":"E","Ế":"E","Ệ":"E","Ề":"E","Ể":"E","Ễ":"E","Ḙ":"E","Ë":"E","Ė":"E","Ẹ":"E","Ȅ":"E","È":"E","Ẻ":"E","Ȇ":"E","Ē":"E","Ḗ":"E","Ḕ":"E","Ę":"E","Ɇ":"E","Ẽ":"E","Ḛ":"E","Ꝫ":"ET","Ḟ":"F","Ƒ":"F","Ǵ":"G","Ğ":"G","Ǧ":"G","Ģ":"G","Ĝ":"G","Ġ":"G","Ɠ":"G","Ḡ":"G","Ǥ":"G","Ḫ":"H","Ȟ":"H","Ḩ":"H","Ĥ":"H","Ⱨ":"H","Ḧ":"H","Ḣ":"H","Ḥ":"H","Ħ":"H","Í":"I","Ĭ":"I","Ǐ":"I","Î":"I","Ï":"I","Ḯ":"I","İ":"I","Ị":"I","Ȉ":"I","Ì":"I","Ỉ":"I","Ȋ":"I","Ī":"I","Į":"I","Ɨ":"I","Ĩ":"I","Ḭ":"I","Ꝺ":"D","Ꝼ":"F","Ᵹ":"G","Ꞃ":"R","Ꞅ":"S","Ꞇ":"T","Ꝭ":"IS","Ĵ":"J","Ɉ":"J","Ḱ":"K","Ǩ":"K","Ķ":"K","Ⱪ":"K","Ꝃ":"K","Ḳ":"K","Ƙ":"K","Ḵ":"K","Ꝁ":"K","Ꝅ":"K","Ĺ":"L","Ƚ":"L","Ľ":"L","Ļ":"L","Ḽ":"L","Ḷ":"L","Ḹ":"L","Ⱡ":"L","Ꝉ":"L","Ḻ":"L","Ŀ":"L","Ɫ":"L","Lj":"L","Ł":"L","LJ":"LJ","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ń":"N","Ň":"N","Ņ":"N","Ṋ":"N","Ṅ":"N","Ṇ":"N","Ǹ":"N","Ɲ":"N","Ṉ":"N","Ƞ":"N","Nj":"N","Ñ":"N","NJ":"NJ","Ó":"O","Ŏ":"O","Ǒ":"O","Ô":"O","Ố":"O","Ộ":"O","Ồ":"O","Ổ":"O","Ỗ":"O","Ö":"O","Ȫ":"O","Ȯ":"O","Ȱ":"O","Ọ":"O","Ő":"O","Ȍ":"O","Ò":"O","Ỏ":"O","Ơ":"O","Ớ":"O","Ợ":"O","Ờ":"O","Ở":"O","Ỡ":"O","Ȏ":"O","Ꝋ":"O","Ꝍ":"O","Ō":"O","Ṓ":"O","Ṑ":"O","Ɵ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Õ":"O","Ṍ":"O","Ṏ":"O","Ȭ":"O","Ƣ":"OI","Ꝏ":"OO","Ɛ":"E","Ɔ":"O","Ȣ":"OU","Ṕ":"P","Ṗ":"P","Ꝓ":"P","Ƥ":"P","Ꝕ":"P","Ᵽ":"P","Ꝑ":"P","Ꝙ":"Q","Ꝗ":"Q","Ŕ":"R","Ř":"R","Ŗ":"R","Ṙ":"R","Ṛ":"R","Ṝ":"R","Ȑ":"R","Ȓ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꜿ":"C","Ǝ":"E","Ś":"S","Ṥ":"S","Š":"S","Ṧ":"S","Ş":"S","Ŝ":"S","Ș":"S","Ṡ":"S","Ṣ":"S","Ṩ":"S","Ť":"T","Ţ":"T","Ṱ":"T","Ț":"T","Ⱦ":"T","Ṫ":"T","Ṭ":"T","Ƭ":"T","Ṯ":"T","Ʈ":"T","Ŧ":"T","Ɐ":"A","Ꞁ":"L","Ɯ":"M","Ʌ":"V","Ꜩ":"TZ","Ú":"U","Ŭ":"U","Ǔ":"U","Û":"U","Ṷ":"U","Ü":"U","Ǘ":"U","Ǚ":"U","Ǜ":"U","Ǖ":"U","Ṳ":"U","Ụ":"U","Ű":"U","Ȕ":"U","Ù":"U","Ủ":"U","Ư":"U","Ứ":"U","Ự":"U","Ừ":"U","Ử":"U","Ữ":"U","Ȗ":"U","Ū":"U","Ṻ":"U","Ų":"U","Ů":"U","Ũ":"U","Ṹ":"U","Ṵ":"U","Ꝟ":"V","Ṿ":"V","Ʋ":"V","Ṽ":"V","Ꝡ":"VY","Ẃ":"W","Ŵ":"W","Ẅ":"W","Ẇ":"W","Ẉ":"W","Ẁ":"W","Ⱳ":"W","Ẍ":"X","Ẋ":"X","Ý":"Y","Ŷ":"Y","Ÿ":"Y","Ẏ":"Y","Ỵ":"Y","Ỳ":"Y","Ƴ":"Y","Ỷ":"Y","Ỿ":"Y","Ȳ":"Y","Ɏ":"Y","Ỹ":"Y","Ź":"Z","Ž":"Z","Ẑ":"Z","Ⱬ":"Z","Ż":"Z","Ẓ":"Z","Ȥ":"Z","Ẕ":"Z","Ƶ":"Z","IJ":"IJ","Œ":"OE","ᴀ":"A","ᴁ":"AE","ʙ":"B","ᴃ":"B","ᴄ":"C","ᴅ":"D","ᴇ":"E","ꜰ":"F","ɢ":"G","ʛ":"G","ʜ":"H","ɪ":"I","ʁ":"R","ᴊ":"J","ᴋ":"K","ʟ":"L","ᴌ":"L","ᴍ":"M","ɴ":"N","ᴏ":"O","ɶ":"OE","ᴐ":"O","ᴕ":"OU","ᴘ":"P","ʀ":"R","ᴎ":"N","ᴙ":"R","ꜱ":"S","ᴛ":"T","ⱻ":"E","ᴚ":"R","ᴜ":"U","ᴠ":"V","ᴡ":"W","ʏ":"Y","ᴢ":"Z","á":"a","ă":"a","ắ":"a","ặ":"a","ằ":"a","ẳ":"a","ẵ":"a","ǎ":"a","â":"a","ấ":"a","ậ":"a","ầ":"a","ẩ":"a","ẫ":"a","ä":"a","ǟ":"a","ȧ":"a","ǡ":"a","ạ":"a","ȁ":"a","à":"a","ả":"a","ȃ":"a","ā":"a","ą":"a","ᶏ":"a","ẚ":"a","å":"a","ǻ":"a","ḁ":"a","ⱥ":"a","ã":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ḃ":"b","ḅ":"b","ɓ":"b","ḇ":"b","ᵬ":"b","ᶀ":"b","ƀ":"b","ƃ":"b","ɵ":"o","ć":"c","č":"c","ç":"c","ḉ":"c","ĉ":"c","ɕ":"c","ċ":"c","ƈ":"c","ȼ":"c","ď":"d","ḑ":"d","ḓ":"d","ȡ":"d","ḋ":"d","ḍ":"d","ɗ":"d","ᶑ":"d","ḏ":"d","ᵭ":"d","ᶁ":"d","đ":"d","ɖ":"d","ƌ":"d","ı":"i","ȷ":"j","ɟ":"j","ʄ":"j","dz":"dz","dž":"dz","é":"e","ĕ":"e","ě":"e","ȩ":"e","ḝ":"e","ê":"e","ế":"e","ệ":"e","ề":"e","ể":"e","ễ":"e","ḙ":"e","ë":"e","ė":"e","ẹ":"e","ȅ":"e","è":"e","ẻ":"e","ȇ":"e","ē":"e","ḗ":"e","ḕ":"e","ⱸ":"e","ę":"e","ᶒ":"e","ɇ":"e","ẽ":"e","ḛ":"e","ꝫ":"et","ḟ":"f","ƒ":"f","ᵮ":"f","ᶂ":"f","ǵ":"g","ğ":"g","ǧ":"g","ģ":"g","ĝ":"g","ġ":"g","ɠ":"g","ḡ":"g","ᶃ":"g","ǥ":"g","ḫ":"h","ȟ":"h","ḩ":"h","ĥ":"h","ⱨ":"h","ḧ":"h","ḣ":"h","ḥ":"h","ɦ":"h","ẖ":"h","ħ":"h","ƕ":"hv","í":"i","ĭ":"i","ǐ":"i","î":"i","ï":"i","ḯ":"i","ị":"i","ȉ":"i","ì":"i","ỉ":"i","ȋ":"i","ī":"i","į":"i","ᶖ":"i","ɨ":"i","ĩ":"i","ḭ":"i","ꝺ":"d","ꝼ":"f","ᵹ":"g","ꞃ":"r","ꞅ":"s","ꞇ":"t","ꝭ":"is","ǰ":"j","ĵ":"j","ʝ":"j","ɉ":"j","ḱ":"k","ǩ":"k","ķ":"k","ⱪ":"k","ꝃ":"k","ḳ":"k","ƙ":"k","ḵ":"k","ᶄ":"k","ꝁ":"k","ꝅ":"k","ĺ":"l","ƚ":"l","ɬ":"l","ľ":"l","ļ":"l","ḽ":"l","ȴ":"l","ḷ":"l","ḹ":"l","ⱡ":"l","ꝉ":"l","ḻ":"l","ŀ":"l","ɫ":"l","ᶅ":"l","ɭ":"l","ł":"l","lj":"lj","ſ":"s","ẜ":"s","ẛ":"s","ẝ":"s","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ᵯ":"m","ᶆ":"m","ń":"n","ň":"n","ņ":"n","ṋ":"n","ȵ":"n","ṅ":"n","ṇ":"n","ǹ":"n","ɲ":"n","ṉ":"n","ƞ":"n","ᵰ":"n","ᶇ":"n","ɳ":"n","ñ":"n","nj":"nj","ó":"o","ŏ":"o","ǒ":"o","ô":"o","ố":"o","ộ":"o","ồ":"o","ổ":"o","ỗ":"o","ö":"o","ȫ":"o","ȯ":"o","ȱ":"o","ọ":"o","ő":"o","ȍ":"o","ò":"o","ỏ":"o","ơ":"o","ớ":"o","ợ":"o","ờ":"o","ở":"o","ỡ":"o","ȏ":"o","ꝋ":"o","ꝍ":"o","ⱺ":"o","ō":"o","ṓ":"o","ṑ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","õ":"o","ṍ":"o","ṏ":"o","ȭ":"o","ƣ":"oi","ꝏ":"oo","ɛ":"e","ᶓ":"e","ɔ":"o","ᶗ":"o","ȣ":"ou","ṕ":"p","ṗ":"p","ꝓ":"p","ƥ":"p","ᵱ":"p","ᶈ":"p","ꝕ":"p","ᵽ":"p","ꝑ":"p","ꝙ":"q","ʠ":"q","ɋ":"q","ꝗ":"q","ŕ":"r","ř":"r","ŗ":"r","ṙ":"r","ṛ":"r","ṝ":"r","ȑ":"r","ɾ":"r","ᵳ":"r","ȓ":"r","ṟ":"r","ɼ":"r","ᵲ":"r","ᶉ":"r","ɍ":"r","ɽ":"r","ↄ":"c","ꜿ":"c","ɘ":"e","ɿ":"r","ś":"s","ṥ":"s","š":"s","ṧ":"s","ş":"s","ŝ":"s","ș":"s","ṡ":"s","ṣ":"s","ṩ":"s","ʂ":"s","ᵴ":"s","ᶊ":"s","ȿ":"s","ɡ":"g","ᴑ":"o","ᴓ":"o","ᴝ":"u","ť":"t","ţ":"t","ṱ":"t","ț":"t","ȶ":"t","ẗ":"t","ⱦ":"t","ṫ":"t","ṭ":"t","ƭ":"t","ṯ":"t","ᵵ":"t","ƫ":"t","ʈ":"t","ŧ":"t","ᵺ":"th","ɐ":"a","ᴂ":"ae","ǝ":"e","ᵷ":"g","ɥ":"h","ʮ":"h","ʯ":"h","ᴉ":"i","ʞ":"k","ꞁ":"l","ɯ":"m","ɰ":"m","ᴔ":"oe","ɹ":"r","ɻ":"r","ɺ":"r","ⱹ":"r","ʇ":"t","ʌ":"v","ʍ":"w","ʎ":"y","ꜩ":"tz","ú":"u","ŭ":"u","ǔ":"u","û":"u","ṷ":"u","ü":"u","ǘ":"u","ǚ":"u","ǜ":"u","ǖ":"u","ṳ":"u","ụ":"u","ű":"u","ȕ":"u","ù":"u","ủ":"u","ư":"u","ứ":"u","ự":"u","ừ":"u","ử":"u","ữ":"u","ȗ":"u","ū":"u","ṻ":"u","ų":"u","ᶙ":"u","ů":"u","ũ":"u","ṹ":"u","ṵ":"u","ᵫ":"ue","ꝸ":"um","ⱴ":"v","ꝟ":"v","ṿ":"v","ʋ":"v","ᶌ":"v","ⱱ":"v","ṽ":"v","ꝡ":"vy","ẃ":"w","ŵ":"w","ẅ":"w","ẇ":"w","ẉ":"w","ẁ":"w","ⱳ":"w","ẘ":"w","ẍ":"x","ẋ":"x","ᶍ":"x","ý":"y","ŷ":"y","ÿ":"y","ẏ":"y","ỵ":"y","ỳ":"y","ƴ":"y","ỷ":"y","ỿ":"y","ȳ":"y","ẙ":"y","ɏ":"y","ỹ":"y","ź":"z","ž":"z","ẑ":"z","ʑ":"z","ⱬ":"z","ż":"z","ẓ":"z","ȥ":"z","ẕ":"z","ᵶ":"z","ᶎ":"z","ʐ":"z","ƶ":"z","ɀ":"z","ff":"ff","ffi":"ffi","ffl":"ffl","fi":"fi","fl":"fl","ij":"ij","œ":"oe","st":"st","ₐ":"a","ₑ":"e","ᵢ":"i","ⱼ":"j","ₒ":"o","ᵣ":"r","ᵤ":"u","ᵥ":"v","ₓ":"x"};String.prototype.latinise=function(){return this.replace(/[^A-Za-z0-9\[\] ]/g,function(e){return Latinise.latin_map[e]||e})};String.prototype.latinize=String.prototype.latinise;String.prototype.isLatin=function(){return this==this.latinise()};array_unique=function(e){var t=new Array;e:for(var n=0,r=e.length;n ').appendTo("body");r.css({position:"absolute",top:"40%",left:"50%",marginLeft:"-150px",width:"300px",zIndex:"99999"}).append(t.return).find('input[type="submit"]',"#materio-flag-create-list-form").bind("click",function(t){t.preventDefault();switch(e(this).attr("name")){case"cancel":trace("cancel",t);e(this).parents("#modal").remove();break;case"create":trace("create",t);var i=e(this).parents("form").find('input[name*="flag-lists-name"]').val(),s=e(this).parents("form").find('input[name*="type"]').val();p(r,s,i,n)}return!1}).parents("form").find('input[type="text"]').focus()}function p(t,n,r,i){var s=Drupal.settings.basePath+Drupal.settings.pathPrefix+"flag-lists/add/"+n+"/js";e.getJSON(s,{name:r},function(e){if(e.error)trace(e.error);else{trace("created list : data",e);d(e.flag.name,i.attr("nid"),i.attr("token"));t.remove()}})}function d(t,n,r){e.ajax({type:"POST",url:Drupal.settings.basePath+Drupal.settings.pathPrefix+"flag-lists/flag/"+t+"/"+n,data:{js:!0,token:r},dataType:"json",success:function(e){trace("node taged with newly created list : data2",e);if(e.status){i(t);v()}else alert(e.errorMessage)},error:function(e){alert("An HTTP error "+e.status+" occurred.\n"+element.href)}})}function v(){var t=new Array;e(".flag-lists-entity-links").parents(".node").each(function(n){t.push(e(this).attr("class").match(/node-([0-9]+)/)[1])});trace("nids",t);var n=Drupal.settings.basePath+Drupal.settings.pathPrefix+"materioflag/nodelinks";e.getJSON(n,{nids:t.join(";")},function(t){trace("data",t);for(nid in t.links){trace("nid",nid);trace("data.links[nid]",t.links[nid]);e(".node-"+nid+" .flag-lists-entity-links").parent(".item-list").replaceWith(t.links[nid]);o(".node-"+nid+" .flag-lists-entity-links")}});var r=jQuery.Event("materioflag-nodelinks-updated");r.nids=t;e.event.trigger(r)}function m(e){T()&&e.pager.hide()}function g(e){T()&&y(e.href)}function y(n){if(!t){var r=n.match(/lists\/([^\/|\?]+)/),i=n.match(/\?page=([0-9]+)/),s=Drupal.settings.basePath+Drupal.settings.pathPrefix+"materioflag/ajax/list/"+r[1]+"/"+i[1];b(s,e(".materio-flags-list","#content"),".flaglist-items")}}function b(n,r,i){trace("loadNextPage");t=!0;r.addClass("loading");e.getJSON(n,function(e){trace("json",e);t=!1;r.removeClass("loading");w(e,i)})}function w(t,n){var r=e(t.return),i=e(n,r).children("article").addClass("just-added"),s=e("ul.pager",r);e(n,"#content").append(i);e("ul.pager","#content").replaceWith(s.hide());e(n,"#content").children(".just-added").each(function(t){var n=e(this);setTimeout(function(){n.removeClass("just-added")},150*t)});var o=jQuery.Event("resultscompleted");o.container=e(n,"#content");e.event.trigger(o)}function E(e){T()&&a(x())}function S(e){T()&&l()}function x(){return e(".materio-flags-list","#content").attr("fid")}function T(){return e(".materio-flags-list","#content").length}var t=!1;n()};var t=new MaterioFlag})(jQuery);
\ No newline at end of file
diff --git a/js/materio_flag.js b/js/materio_flag.js
index 133f7b54..9c36698e 100644
--- a/js/materio_flag.js
+++ b/js/materio_flag.js
@@ -3,55 +3,135 @@
(function($) {
MaterioFlag = function(){
+ var _isLoadingList = false ;
-
/**
* init()
*/
function init(){
trace('init MaterioFlag');
- $(document).bind('flagGlobalAfterLinkUpdate', onFlaging);
- $(document).bind('resultscompleted', onResultsUpdated);
+ $(document)
+ .bind('flagGlobalAfterLinkUpdate', onFlaging)
+ .bind('resultscompleted resultschanged', onResultsUpdated)
+ .bind('init-scroller-pager', onInitScrollerPager)
+ .bind('load-scroller-pager', onLoadScrollerPager)
+ .bind('view-mode-changed', onViewModeChanged)
+ .bind('history-state-change', onHistoryStateChange);
+
ajaxifyLinks();
+
+ // trigger updated event for direct html loading
+ setTimeout(function(){
+ triggerContentChanged();
+ }, 10);
};
function onFlaging(event){
trace('onFlaging', event);
+ refreshBlocks();
+ };
+
+ function refreshBlocks(name){
+ trace('refreshBlocks | name', name);
if($('#block-materio-flag-materio-flag-mybookmarks').length){
- $.getJSON('/materioflag/refresh/block/bookmarks', function(json){
- trace('json', json);
- $('#block-materio-flag-materio-flag-mybookmarks').replaceWith(json.block);
- Drupal.flagLink('#block-materio-flag-materio-flag-mybookmarks');
- // TODO: update flags stars on search results after unflaging from block
- $.event.trigger('mybookmarks-block-updated');
- });
- }
+ var type = 'bookmarks';
+ }else if($('#block-materio-flag-materio-flag-mylists').length){
+ var type = 'lists';
+ }
- if($('#block-materio-flag-materio-flag-mylists').length){
- $.getJSON('/materioflag/refresh/block/mylists', function(json){
- trace('json', json);
- $('#block-materio-flag-materio-flag-mylists').replaceWith(json.block);
- Drupal.flagLink('#block-materio-flag-materio-flag-mylists');
- // TODO: update flags stars on search results after unflaging from block
- $.event.trigger('mylists-block-updated');
+ if(type != undefined){
+ var id = '#block-materio-flag-materio-flag-my'+type;
+ $.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materioflag/refresh/block/'+type, function(json){
+ trace('block refreshed '+type, json);
+ $(id).replaceWith(json.block);
+
+ var event = jQuery.Event('my'+type+'-block-updated');
+ event.listname = name;
+ $.event.trigger(event);
});
}
+ ajaxifyLinks();
};
function onResultsUpdated(event){
trace('onResultsUpdated', event);
-
- ajaxifyLinks(event.container);
+ ajaxifyLinks(event.container);
};
- function ajaxifyLinks(cont){
- trace('ajaxifyLinks');
- var container = cont || 'body';
- $('a.flag-lists-create:not(.ajax)', container)
+ function ajaxifyLinks(container){
+ trace('ajaxifyLinks', container);
+
+ container = ((container != null) ? container : 'body');
+
+ // trace('typeof Drupal.flagLink', typeof Drupal.flagLink);
+ if (typeof Drupal.flagLink != 'undefined')
+ Drupal.flagLink(container);
+
+ $('a.flag-lists-create:not(.ajax-processed)', container)
.bind('click', onClickCreatLink)
- .addClass('ajax');
+ .addClass('ajax-processed');
+
+ $('a.open-list:not(.ajax-processed)', '#block-materio-flag-materio-flag-mylists')
+ .bind('click', onClickOpenLink)
+ .addClass('ajax-processed');
+ };
+
+ function onClickOpenLink(event){
+ event.preventDefault();
+ var $link = $(event.currentTarget);
+ var fid = $link.attr('href').match(/lists\/([0-9]+)$/);
+ // trace('type', type);
+ loadList(fid[1]);
+ return false;
+ };
+
+ function loadList(fid){
+ var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materioflag/ajax/list/'+fid;
+ $.event.trigger('loading-content');
+
+ $.getJSON(url, function(json){
+ trace('json', json);
+ changeContent(json);
+ });
+ };
+
+ function changeContent(json){
+ if(json.return){
+
+ $('.inner-content','#content').html(json.return);
+
+ $.event.trigger('loaded-content');
+
+ // no need of ajaxifylinks because it's triggered with resultschanged
+ // ajaxifyLinks('#content');
+
+ var path = Drupal.settings.basePath + Drupal.settings.pathPrefix + json.path;
+
+ var event = jQuery.Event('new-history-page');
+ event.path = path;
+ event.title = json.title;
+ event.content = json.return;
+ $.event.trigger(event);
+
+ // TODO: change language links for folders
+ // for (language in Drupal.settings.materio_search_api_ajax.languages) {
+ // var l = Drupal.settings.materio_search_api_ajax.languages[language];
+ // $('#block-locale-language li.'+language+' a').attr('href', Drupal.settings.basePath + l.prefix+'/' + json.search_path + '/' + json.keys)
+ // };
+
+ triggerContentChanged();
+
+ }else{
+ trace('no results');
+ }
+ };
+
+ function triggerContentChanged(){
+ var event = jQuery.Event('resultschanged');
+ event.container = '#content .flaglist-items';
+ $.event.trigger(event);
};
function onClickCreatLink(event){
@@ -59,40 +139,203 @@ MaterioFlag = function(){
var $link = $(event.currentTarget);
var type = $link.attr('href').match(/[^\/]*$/);
// trace('type', type);
- var url = 'materioflag/createlist/form/'+type[0];
+ var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materioflag/createlist/form/'+type[0];
$.getJSON(url, function(json){
trace('json', json);
- showCreateListForm(json);
+ showCreateListForm(json, $link);
});
return false;
- }
+ };
- function showCreateListForm(json){
- var $modal = $('
').appendTo('body');
+ function showCreateListForm(json, $link){
+ var $modal = $('
').appendTo('body');
$modal
.css({
position:'absolute',
top:'40%', left:'50%',
- marginLeft:'-200px', width:'400px',
+ marginLeft:'-150px', width:'300px',
zIndex:"99999"
})
- .append(json.return);
- // .find('#flag-lists-form').bind('submit', function(event) {
- // trace('submit',event);
- // var title = $(this).find('input[name*="title"]').val();
- // createList(title);
- // return false;
- // });
+ .append(json.return)
+ .find('input[type="submit"]', '#materio-flag-create-list-form').bind('click', function(event) {
+ event.preventDefault();
+ switch($(this).attr('name')){
+ case 'cancel':
+ trace('cancel',event);
+ $(this).parents('#modal').remove();
+ break;
+ case 'create':
+ trace('create',event);
+ var title = $(this).parents('form').find('input[name*="flag-lists-name"]').val();
+ var type = $(this).parents('form').find('input[name*="type"]').val();
+ createList($modal, type, title, $link);
+ break;
+ }
+
+ return false;
+ })
+ .parents('form').find('input[type="text"]').focus();
};
- function createList(title){
- var url = 'materioflag/createlist/'+title;
- $.getJSON(url, function(json){
- trace('json', json);
+ function createList($modal, type, title, $link){
+ var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'flag-lists/add/'+type+'/js';
+ $.getJSON(url, {name:title}, function(data) {
+ if (data.error) {
+ trace(data.error);
+ }
+ else {
+ // select.append(''+data.flag.title+' ');
+ // $('input.name', $(this)).val('');
+ // dialog.dialog('close');
+ trace('created list : data', data);
+
+ flagEntityWithList(data.flag.name, $link.attr('nid'), $link.attr('token'));
+ $modal.remove();
+ }
});
};
+ function flagEntityWithList(name, nid, token){
+ // var ret;
+ // Send POST request
+ $.ajax({
+ type: 'POST',
+ url: Drupal.settings.basePath+Drupal.settings.pathPrefix+'flag-lists/flag/'+name+'/'+nid,
+ data: { js: true, token: token },
+ dataType: 'json',
+ success: function (data2) {
+ trace('node taged with newly created list : data2', data2)
+ if (data2.status) {
+ // success
+ refreshBlocks(name);
+ refreshNodeLinks();
+ }else {
+ // Failure.
+ alert(data2.errorMessage);
+ }
+ },
+ error: function (xmlhttp) {
+ alert('An HTTP error '+ xmlhttp.status +' occurred.\n'+ element.href);
+ }
+ });
+ };
+
+ function refreshNodeLinks(){
+
+ var nids = new Array();
+ $('.flag-lists-entity-links').parents('.node').each(function(index) {
+ nids.push($(this).attr('class').match(/node-([0-9]+)/)[1]);
+ });
+ trace('nids', nids);
+
+ var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materioflag/nodelinks';
+ $.getJSON(url, {nids:nids.join(";")}, function(data) {
+ trace('data', data);
+ for(nid in data.links){
+ trace('nid', nid);
+ trace('data.links[nid]', data.links[nid]);
+ $('.node-'+nid+' .flag-lists-entity-links').parent('.item-list').replaceWith(data.links[nid]);
+
+ // trace('typeof Drupal.flagLink', typeof Drupal.flagLink);
+ // if (typeof Drupal.flagLink != 'undefined')
+ // Drupal.flagLink($('.node-'+nid+' .flag-lists-entity-links'));
+
+ ajaxifyLinks('.node-'+nid+' .flag-lists-entity-links');
+
+ }
+ });
+
+ var event = jQuery.Event('materioflag-nodelinks-updated');
+ event.nids = nids;
+ $.event.trigger(event);
+ };
+
+ function onInitScrollerPager(event){
+ // trace('MaterioFlag :: onInitScrollerPager');
+ if (isList()){
+ // trace('event.pager', event);
+ event.pager.hide();
+ }
+ };
+
+ function onLoadScrollerPager(event){
+ if (isList())
+ loadNextListPage(event.href);
+ };
+
+ function loadNextListPage(href){
+ // trace('loadNextListPage', href);
+ if(!_isLoadingList){
+ var fid = href.match(/lists\/([^\/|\?]+)/);
+ var page = href.match(/\?page=([0-9]+)/);
+ var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materioflag/ajax/list/'+fid[1]+'/'+page[1];
+ // trace('url', url);
+ loadNextPage(url, $('.materio-flags-list', '#content'), '.flaglist-items');
+ }
+ };
+
+ function loadNextPage(url, $container, target){
+ trace('loadNextPage');
+ _isLoadingList = true;
+ $container.addClass('loading');
+ $.getJSON(url, function(json){
+ trace('json', json);
+ _isLoadingList = false;
+ $container.removeClass('loading');
+ addNextpage(json, target);
+ });
+ };
+
+ function addNextpage(json, container_class){
+ var $newcontent = $(json.return),
+ $newitems = $(container_class, $newcontent).children('article').addClass('just-added'),
+ $newpager = $('ul.pager', $newcontent);
+
+ $(container_class, '#content').append($newitems);
+ $('ul.pager', '#content').replaceWith($newpager.hide());
+
+
+ // TODO: animation, this should be on theme side
+ $(container_class, '#content').children('.just-added').each(function(i){
+ // $(this).delay(5000*i).removeClass('just-added');
+ var $this = $(this);
+ setTimeout(function(){
+ $this.removeClass('just-added');
+ }, 150*i);
+ });
+
+ var event = jQuery.Event('resultscompleted');
+ event.container = $(container_class, '#content');
+ $.event.trigger(event);
+ };
+
+ function onViewModeChanged(event){
+ if (isList())
+ loadList(getFid());
+ };
+
+ /**
+ * history
+ */
+ function onHistoryStateChange(event){
+ if(isList())
+ triggerContentChanged();
+ };
+
+ /**
+ * Helpers
+ */
+
+ function getFid(){
+ return $('.materio-flags-list', '#content').attr('fid');;
+ };
+
+ function isList(){
+ return $('.materio-flags-list', '#content').length;
+ };
+
+
init();
diff --git a/js/materio_search_api_ajax-ck.js b/js/materio_search_api_ajax-ck.js
index d8237932..80677833 100644
--- a/js/materio_search_api_ajax-ck.js
+++ b/js/materio_search_api_ajax-ck.js
@@ -2,4 +2,4 @@
/**
* misc
*/// ------ TRACE ------
-function trace(e,t){window.console&&window.console.debug&&(arguments.length===2?window.console.debug(e,t):window.console.debug(e))}function Timeout(e,t){var n=setTimeout(e,t);this.cleared=!1;this.clear=function(){this.cleared=!0;clearTimeout(n)}}function HexToRGB(e){if(e.charAt(0)=="#"){var t=e.substring(1,7),n=parseInt(t.substring(0,2),16),r=parseInt(t.substring(2,4),16),i=parseInt(t.substring(4,6),16);return"rgb("+n+", "+r+", "+i+")"}return null}function pair(e){return typeof e=="number"?e%2==0?!0:!1:null}function random(e,t){return arguments.length===1&&typeof e=="number"?Math.random()*e:arguments.length===2&&typeof e==typeof t&&typeof e=="number"?e+Math.random()*(t-e):NaN}function round(e,t){if(arguments.length==1)e=Math.round(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.round(e*t)/t}return e}function floor(e,t){if(arguments.length==1)e=Math.floor(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.floor(e*t)/t}return e}function ceil(e,t){if(arguments.length==1)e=Math.ceil(e);else{t=t.toString();t=t.replace(/./gi,0);t=t.replace(/^./gi,1);t=parseInt(t);e=Math.ceil(e*t)/t}return e}function array_subtract(e,t){var n=new Array;for(var r=e.length-1;r>=0;r--)t.contains(e[r])||n.push(e[r]);return n}function objectSize(e){var t=e.length?--e.length:0;for(var n in e)t++;return t}function objectIsEmpty(e){for(var t in e)if(e.hasOwnProperty(t))return!1;return!0}function objectGetKey(e,t){var n=0;for(var r in e){if(r==="length"||!e.hasOwnProperty(r))continue;if(n==t)return r;n++}}function objectSort(e,t){var n=new Array;for(var r=objectSize(e)-1;r>=0;r--){var i=objectGetKey(e,r);for(var s=objectSize(e[i].wit)-1;s>=0;s--){var o=objectGetKey(e[i].wit,s);if(o==t){var u=parseFloat(e[i].wit[o]);n.push({wit:u,nid:i})}}}n.sort(function(e,t){return t.wit-e.wit});var a={};for(var r=n.length-1;r>=0;r--)a[n[r].nid]=e[n[r].nid];return a}function getElementAngle(e,t,n,r){var i=n-e,s=r-t,o=Math.abs(Math.atan(s/i)*180/Math.PI);i>0&&s<0?o=90-o:i>=0&&s>=0?o+=90:i<0&&s>=0?o=180+(90-o):o+=270;return o}String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/gi,"").replace(/[ ]{2,}/gi," ").replace(/\n /,"\n")};var Latinise={};Latinise.latin_map={"Á":"A","Ă":"A","Ắ":"A","Ặ":"A","Ằ":"A","Ẳ":"A","Ẵ":"A","Ǎ":"A","Â":"A","Ấ":"A","Ậ":"A","Ầ":"A","Ẩ":"A","Ẫ":"A","Ä":"A","Ǟ":"A","Ȧ":"A","Ǡ":"A","Ạ":"A","Ȁ":"A","À":"A","Ả":"A","Ȃ":"A","Ā":"A","Ą":"A","Å":"A","Ǻ":"A","Ḁ":"A","Ⱥ":"A","Ã":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ḃ":"B","Ḅ":"B","Ɓ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ć":"C","Č":"C","Ç":"C","Ḉ":"C","Ĉ":"C","Ċ":"C","Ƈ":"C","Ȼ":"C","Ď":"D","Ḑ":"D","Ḓ":"D","Ḋ":"D","Ḍ":"D","Ɗ":"D","Ḏ":"D","Dz":"D","Dž":"D","Đ":"D","Ƌ":"D","DZ":"DZ","DŽ":"DZ","É":"E","Ĕ":"E","Ě":"E","Ȩ":"E","Ḝ":"E","Ê":"E","Ế":"E","Ệ":"E","Ề":"E","Ể":"E","Ễ":"E","Ḙ":"E","Ë":"E","Ė":"E","Ẹ":"E","Ȅ":"E","È":"E","Ẻ":"E","Ȇ":"E","Ē":"E","Ḗ":"E","Ḕ":"E","Ę":"E","Ɇ":"E","Ẽ":"E","Ḛ":"E","Ꝫ":"ET","Ḟ":"F","Ƒ":"F","Ǵ":"G","Ğ":"G","Ǧ":"G","Ģ":"G","Ĝ":"G","Ġ":"G","Ɠ":"G","Ḡ":"G","Ǥ":"G","Ḫ":"H","Ȟ":"H","Ḩ":"H","Ĥ":"H","Ⱨ":"H","Ḧ":"H","Ḣ":"H","Ḥ":"H","Ħ":"H","Í":"I","Ĭ":"I","Ǐ":"I","Î":"I","Ï":"I","Ḯ":"I","İ":"I","Ị":"I","Ȉ":"I","Ì":"I","Ỉ":"I","Ȋ":"I","Ī":"I","Į":"I","Ɨ":"I","Ĩ":"I","Ḭ":"I","Ꝺ":"D","Ꝼ":"F","Ᵹ":"G","Ꞃ":"R","Ꞅ":"S","Ꞇ":"T","Ꝭ":"IS","Ĵ":"J","Ɉ":"J","Ḱ":"K","Ǩ":"K","Ķ":"K","Ⱪ":"K","Ꝃ":"K","Ḳ":"K","Ƙ":"K","Ḵ":"K","Ꝁ":"K","Ꝅ":"K","Ĺ":"L","Ƚ":"L","Ľ":"L","Ļ":"L","Ḽ":"L","Ḷ":"L","Ḹ":"L","Ⱡ":"L","Ꝉ":"L","Ḻ":"L","Ŀ":"L","Ɫ":"L","Lj":"L","Ł":"L","LJ":"LJ","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ń":"N","Ň":"N","Ņ":"N","Ṋ":"N","Ṅ":"N","Ṇ":"N","Ǹ":"N","Ɲ":"N","Ṉ":"N","Ƞ":"N","Nj":"N","Ñ":"N","NJ":"NJ","Ó":"O","Ŏ":"O","Ǒ":"O","Ô":"O","Ố":"O","Ộ":"O","Ồ":"O","Ổ":"O","Ỗ":"O","Ö":"O","Ȫ":"O","Ȯ":"O","Ȱ":"O","Ọ":"O","Ő":"O","Ȍ":"O","Ò":"O","Ỏ":"O","Ơ":"O","Ớ":"O","Ợ":"O","Ờ":"O","Ở":"O","Ỡ":"O","Ȏ":"O","Ꝋ":"O","Ꝍ":"O","Ō":"O","Ṓ":"O","Ṑ":"O","Ɵ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Õ":"O","Ṍ":"O","Ṏ":"O","Ȭ":"O","Ƣ":"OI","Ꝏ":"OO","Ɛ":"E","Ɔ":"O","Ȣ":"OU","Ṕ":"P","Ṗ":"P","Ꝓ":"P","Ƥ":"P","Ꝕ":"P","Ᵽ":"P","Ꝑ":"P","Ꝙ":"Q","Ꝗ":"Q","Ŕ":"R","Ř":"R","Ŗ":"R","Ṙ":"R","Ṛ":"R","Ṝ":"R","Ȑ":"R","Ȓ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꜿ":"C","Ǝ":"E","Ś":"S","Ṥ":"S","Š":"S","Ṧ":"S","Ş":"S","Ŝ":"S","Ș":"S","Ṡ":"S","Ṣ":"S","Ṩ":"S","Ť":"T","Ţ":"T","Ṱ":"T","Ț":"T","Ⱦ":"T","Ṫ":"T","Ṭ":"T","Ƭ":"T","Ṯ":"T","Ʈ":"T","Ŧ":"T","Ɐ":"A","Ꞁ":"L","Ɯ":"M","Ʌ":"V","Ꜩ":"TZ","Ú":"U","Ŭ":"U","Ǔ":"U","Û":"U","Ṷ":"U","Ü":"U","Ǘ":"U","Ǚ":"U","Ǜ":"U","Ǖ":"U","Ṳ":"U","Ụ":"U","Ű":"U","Ȕ":"U","Ù":"U","Ủ":"U","Ư":"U","Ứ":"U","Ự":"U","Ừ":"U","Ử":"U","Ữ":"U","Ȗ":"U","Ū":"U","Ṻ":"U","Ų":"U","Ů":"U","Ũ":"U","Ṹ":"U","Ṵ":"U","Ꝟ":"V","Ṿ":"V","Ʋ":"V","Ṽ":"V","Ꝡ":"VY","Ẃ":"W","Ŵ":"W","Ẅ":"W","Ẇ":"W","Ẉ":"W","Ẁ":"W","Ⱳ":"W","Ẍ":"X","Ẋ":"X","Ý":"Y","Ŷ":"Y","Ÿ":"Y","Ẏ":"Y","Ỵ":"Y","Ỳ":"Y","Ƴ":"Y","Ỷ":"Y","Ỿ":"Y","Ȳ":"Y","Ɏ":"Y","Ỹ":"Y","Ź":"Z","Ž":"Z","Ẑ":"Z","Ⱬ":"Z","Ż":"Z","Ẓ":"Z","Ȥ":"Z","Ẕ":"Z","Ƶ":"Z","IJ":"IJ","Œ":"OE","ᴀ":"A","ᴁ":"AE","ʙ":"B","ᴃ":"B","ᴄ":"C","ᴅ":"D","ᴇ":"E","ꜰ":"F","ɢ":"G","ʛ":"G","ʜ":"H","ɪ":"I","ʁ":"R","ᴊ":"J","ᴋ":"K","ʟ":"L","ᴌ":"L","ᴍ":"M","ɴ":"N","ᴏ":"O","ɶ":"OE","ᴐ":"O","ᴕ":"OU","ᴘ":"P","ʀ":"R","ᴎ":"N","ᴙ":"R","ꜱ":"S","ᴛ":"T","ⱻ":"E","ᴚ":"R","ᴜ":"U","ᴠ":"V","ᴡ":"W","ʏ":"Y","ᴢ":"Z","á":"a","ă":"a","ắ":"a","ặ":"a","ằ":"a","ẳ":"a","ẵ":"a","ǎ":"a","â":"a","ấ":"a","ậ":"a","ầ":"a","ẩ":"a","ẫ":"a","ä":"a","ǟ":"a","ȧ":"a","ǡ":"a","ạ":"a","ȁ":"a","à":"a","ả":"a","ȃ":"a","ā":"a","ą":"a","ᶏ":"a","ẚ":"a","å":"a","ǻ":"a","ḁ":"a","ⱥ":"a","ã":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ḃ":"b","ḅ":"b","ɓ":"b","ḇ":"b","ᵬ":"b","ᶀ":"b","ƀ":"b","ƃ":"b","ɵ":"o","ć":"c","č":"c","ç":"c","ḉ":"c","ĉ":"c","ɕ":"c","ċ":"c","ƈ":"c","ȼ":"c","ď":"d","ḑ":"d","ḓ":"d","ȡ":"d","ḋ":"d","ḍ":"d","ɗ":"d","ᶑ":"d","ḏ":"d","ᵭ":"d","ᶁ":"d","đ":"d","ɖ":"d","ƌ":"d","ı":"i","ȷ":"j","ɟ":"j","ʄ":"j","dz":"dz","dž":"dz","é":"e","ĕ":"e","ě":"e","ȩ":"e","ḝ":"e","ê":"e","ế":"e","ệ":"e","ề":"e","ể":"e","ễ":"e","ḙ":"e","ë":"e","ė":"e","ẹ":"e","ȅ":"e","è":"e","ẻ":"e","ȇ":"e","ē":"e","ḗ":"e","ḕ":"e","ⱸ":"e","ę":"e","ᶒ":"e","ɇ":"e","ẽ":"e","ḛ":"e","ꝫ":"et","ḟ":"f","ƒ":"f","ᵮ":"f","ᶂ":"f","ǵ":"g","ğ":"g","ǧ":"g","ģ":"g","ĝ":"g","ġ":"g","ɠ":"g","ḡ":"g","ᶃ":"g","ǥ":"g","ḫ":"h","ȟ":"h","ḩ":"h","ĥ":"h","ⱨ":"h","ḧ":"h","ḣ":"h","ḥ":"h","ɦ":"h","ẖ":"h","ħ":"h","ƕ":"hv","í":"i","ĭ":"i","ǐ":"i","î":"i","ï":"i","ḯ":"i","ị":"i","ȉ":"i","ì":"i","ỉ":"i","ȋ":"i","ī":"i","į":"i","ᶖ":"i","ɨ":"i","ĩ":"i","ḭ":"i","ꝺ":"d","ꝼ":"f","ᵹ":"g","ꞃ":"r","ꞅ":"s","ꞇ":"t","ꝭ":"is","ǰ":"j","ĵ":"j","ʝ":"j","ɉ":"j","ḱ":"k","ǩ":"k","ķ":"k","ⱪ":"k","ꝃ":"k","ḳ":"k","ƙ":"k","ḵ":"k","ᶄ":"k","ꝁ":"k","ꝅ":"k","ĺ":"l","ƚ":"l","ɬ":"l","ľ":"l","ļ":"l","ḽ":"l","ȴ":"l","ḷ":"l","ḹ":"l","ⱡ":"l","ꝉ":"l","ḻ":"l","ŀ":"l","ɫ":"l","ᶅ":"l","ɭ":"l","ł":"l","lj":"lj","ſ":"s","ẜ":"s","ẛ":"s","ẝ":"s","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ᵯ":"m","ᶆ":"m","ń":"n","ň":"n","ņ":"n","ṋ":"n","ȵ":"n","ṅ":"n","ṇ":"n","ǹ":"n","ɲ":"n","ṉ":"n","ƞ":"n","ᵰ":"n","ᶇ":"n","ɳ":"n","ñ":"n","nj":"nj","ó":"o","ŏ":"o","ǒ":"o","ô":"o","ố":"o","ộ":"o","ồ":"o","ổ":"o","ỗ":"o","ö":"o","ȫ":"o","ȯ":"o","ȱ":"o","ọ":"o","ő":"o","ȍ":"o","ò":"o","ỏ":"o","ơ":"o","ớ":"o","ợ":"o","ờ":"o","ở":"o","ỡ":"o","ȏ":"o","ꝋ":"o","ꝍ":"o","ⱺ":"o","ō":"o","ṓ":"o","ṑ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","õ":"o","ṍ":"o","ṏ":"o","ȭ":"o","ƣ":"oi","ꝏ":"oo","ɛ":"e","ᶓ":"e","ɔ":"o","ᶗ":"o","ȣ":"ou","ṕ":"p","ṗ":"p","ꝓ":"p","ƥ":"p","ᵱ":"p","ᶈ":"p","ꝕ":"p","ᵽ":"p","ꝑ":"p","ꝙ":"q","ʠ":"q","ɋ":"q","ꝗ":"q","ŕ":"r","ř":"r","ŗ":"r","ṙ":"r","ṛ":"r","ṝ":"r","ȑ":"r","ɾ":"r","ᵳ":"r","ȓ":"r","ṟ":"r","ɼ":"r","ᵲ":"r","ᶉ":"r","ɍ":"r","ɽ":"r","ↄ":"c","ꜿ":"c","ɘ":"e","ɿ":"r","ś":"s","ṥ":"s","š":"s","ṧ":"s","ş":"s","ŝ":"s","ș":"s","ṡ":"s","ṣ":"s","ṩ":"s","ʂ":"s","ᵴ":"s","ᶊ":"s","ȿ":"s","ɡ":"g","ᴑ":"o","ᴓ":"o","ᴝ":"u","ť":"t","ţ":"t","ṱ":"t","ț":"t","ȶ":"t","ẗ":"t","ⱦ":"t","ṫ":"t","ṭ":"t","ƭ":"t","ṯ":"t","ᵵ":"t","ƫ":"t","ʈ":"t","ŧ":"t","ᵺ":"th","ɐ":"a","ᴂ":"ae","ǝ":"e","ᵷ":"g","ɥ":"h","ʮ":"h","ʯ":"h","ᴉ":"i","ʞ":"k","ꞁ":"l","ɯ":"m","ɰ":"m","ᴔ":"oe","ɹ":"r","ɻ":"r","ɺ":"r","ⱹ":"r","ʇ":"t","ʌ":"v","ʍ":"w","ʎ":"y","ꜩ":"tz","ú":"u","ŭ":"u","ǔ":"u","û":"u","ṷ":"u","ü":"u","ǘ":"u","ǚ":"u","ǜ":"u","ǖ":"u","ṳ":"u","ụ":"u","ű":"u","ȕ":"u","ù":"u","ủ":"u","ư":"u","ứ":"u","ự":"u","ừ":"u","ử":"u","ữ":"u","ȗ":"u","ū":"u","ṻ":"u","ų":"u","ᶙ":"u","ů":"u","ũ":"u","ṹ":"u","ṵ":"u","ᵫ":"ue","ꝸ":"um","ⱴ":"v","ꝟ":"v","ṿ":"v","ʋ":"v","ᶌ":"v","ⱱ":"v","ṽ":"v","ꝡ":"vy","ẃ":"w","ŵ":"w","ẅ":"w","ẇ":"w","ẉ":"w","ẁ":"w","ⱳ":"w","ẘ":"w","ẍ":"x","ẋ":"x","ᶍ":"x","ý":"y","ŷ":"y","ÿ":"y","ẏ":"y","ỵ":"y","ỳ":"y","ƴ":"y","ỷ":"y","ỿ":"y","ȳ":"y","ẙ":"y","ɏ":"y","ỹ":"y","ź":"z","ž":"z","ẑ":"z","ʑ":"z","ⱬ":"z","ż":"z","ẓ":"z","ȥ":"z","ẕ":"z","ᵶ":"z","ᶎ":"z","ʐ":"z","ƶ":"z","ɀ":"z","ff":"ff","ffi":"ffi","ffl":"ffl","fi":"fi","fl":"fl","ij":"ij","œ":"oe","st":"st","ₐ":"a","ₑ":"e","ᵢ":"i","ⱼ":"j","ₒ":"o","ᵣ":"r","ᵤ":"u","ᵥ":"v","ₓ":"x"};String.prototype.latinise=function(){return this.replace(/[^A-Za-z0-9\[\] ]/g,function(e){return Latinise.latin_map[e]||e})};String.prototype.latinize=String.prototype.latinise;String.prototype.isLatin=function(){return this==this.latinise()};array_unique=function(e){var t=new Array;e:for(var n=0,r=e.length;n=0;r--)t.contains(e[r])||n.push(e[r]);return n}function objectSize(e){var t=e.length?--e.length:0;for(var n in e)t++;return t}function objectIsEmpty(e){for(var t in e)if(e.hasOwnProperty(t))return!1;return!0}function objectGetKey(e,t){var n=0;for(var r in e){if(r==="length"||!e.hasOwnProperty(r))continue;if(n==t)return r;n++}}function objectSort(e,t){var n=new Array;for(var r=objectSize(e)-1;r>=0;r--){var i=objectGetKey(e,r);for(var s=objectSize(e[i].wit)-1;s>=0;s--){var o=objectGetKey(e[i].wit,s);if(o==t){var u=parseFloat(e[i].wit[o]);n.push({wit:u,nid:i})}}}n.sort(function(e,t){return t.wit-e.wit});var a={};for(var r=n.length-1;r>=0;r--)a[n[r].nid]=e[n[r].nid];return a}function getElementAngle(e,t,n,r){var i=n-e,s=r-t,o=Math.abs(Math.atan(s/i)*180/Math.PI);i>0&&s<0?o=90-o:i>=0&&s>=0?o+=90:i<0&&s>=0?o=180+(90-o):o+=270;return o}String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/gi,"").replace(/[ ]{2,}/gi," ").replace(/\n /,"\n")};var Latinise={};Latinise.latin_map={"Á":"A","Ă":"A","Ắ":"A","Ặ":"A","Ằ":"A","Ẳ":"A","Ẵ":"A","Ǎ":"A","Â":"A","Ấ":"A","Ậ":"A","Ầ":"A","Ẩ":"A","Ẫ":"A","Ä":"A","Ǟ":"A","Ȧ":"A","Ǡ":"A","Ạ":"A","Ȁ":"A","À":"A","Ả":"A","Ȃ":"A","Ā":"A","Ą":"A","Å":"A","Ǻ":"A","Ḁ":"A","Ⱥ":"A","Ã":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ḃ":"B","Ḅ":"B","Ɓ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ć":"C","Č":"C","Ç":"C","Ḉ":"C","Ĉ":"C","Ċ":"C","Ƈ":"C","Ȼ":"C","Ď":"D","Ḑ":"D","Ḓ":"D","Ḋ":"D","Ḍ":"D","Ɗ":"D","Ḏ":"D","Dz":"D","Dž":"D","Đ":"D","Ƌ":"D","DZ":"DZ","DŽ":"DZ","É":"E","Ĕ":"E","Ě":"E","Ȩ":"E","Ḝ":"E","Ê":"E","Ế":"E","Ệ":"E","Ề":"E","Ể":"E","Ễ":"E","Ḙ":"E","Ë":"E","Ė":"E","Ẹ":"E","Ȅ":"E","È":"E","Ẻ":"E","Ȇ":"E","Ē":"E","Ḗ":"E","Ḕ":"E","Ę":"E","Ɇ":"E","Ẽ":"E","Ḛ":"E","Ꝫ":"ET","Ḟ":"F","Ƒ":"F","Ǵ":"G","Ğ":"G","Ǧ":"G","Ģ":"G","Ĝ":"G","Ġ":"G","Ɠ":"G","Ḡ":"G","Ǥ":"G","Ḫ":"H","Ȟ":"H","Ḩ":"H","Ĥ":"H","Ⱨ":"H","Ḧ":"H","Ḣ":"H","Ḥ":"H","Ħ":"H","Í":"I","Ĭ":"I","Ǐ":"I","Î":"I","Ï":"I","Ḯ":"I","İ":"I","Ị":"I","Ȉ":"I","Ì":"I","Ỉ":"I","Ȋ":"I","Ī":"I","Į":"I","Ɨ":"I","Ĩ":"I","Ḭ":"I","Ꝺ":"D","Ꝼ":"F","Ᵹ":"G","Ꞃ":"R","Ꞅ":"S","Ꞇ":"T","Ꝭ":"IS","Ĵ":"J","Ɉ":"J","Ḱ":"K","Ǩ":"K","Ķ":"K","Ⱪ":"K","Ꝃ":"K","Ḳ":"K","Ƙ":"K","Ḵ":"K","Ꝁ":"K","Ꝅ":"K","Ĺ":"L","Ƚ":"L","Ľ":"L","Ļ":"L","Ḽ":"L","Ḷ":"L","Ḹ":"L","Ⱡ":"L","Ꝉ":"L","Ḻ":"L","Ŀ":"L","Ɫ":"L","Lj":"L","Ł":"L","LJ":"LJ","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ń":"N","Ň":"N","Ņ":"N","Ṋ":"N","Ṅ":"N","Ṇ":"N","Ǹ":"N","Ɲ":"N","Ṉ":"N","Ƞ":"N","Nj":"N","Ñ":"N","NJ":"NJ","Ó":"O","Ŏ":"O","Ǒ":"O","Ô":"O","Ố":"O","Ộ":"O","Ồ":"O","Ổ":"O","Ỗ":"O","Ö":"O","Ȫ":"O","Ȯ":"O","Ȱ":"O","Ọ":"O","Ő":"O","Ȍ":"O","Ò":"O","Ỏ":"O","Ơ":"O","Ớ":"O","Ợ":"O","Ờ":"O","Ở":"O","Ỡ":"O","Ȏ":"O","Ꝋ":"O","Ꝍ":"O","Ō":"O","Ṓ":"O","Ṑ":"O","Ɵ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Õ":"O","Ṍ":"O","Ṏ":"O","Ȭ":"O","Ƣ":"OI","Ꝏ":"OO","Ɛ":"E","Ɔ":"O","Ȣ":"OU","Ṕ":"P","Ṗ":"P","Ꝓ":"P","Ƥ":"P","Ꝕ":"P","Ᵽ":"P","Ꝑ":"P","Ꝙ":"Q","Ꝗ":"Q","Ŕ":"R","Ř":"R","Ŗ":"R","Ṙ":"R","Ṛ":"R","Ṝ":"R","Ȑ":"R","Ȓ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꜿ":"C","Ǝ":"E","Ś":"S","Ṥ":"S","Š":"S","Ṧ":"S","Ş":"S","Ŝ":"S","Ș":"S","Ṡ":"S","Ṣ":"S","Ṩ":"S","Ť":"T","Ţ":"T","Ṱ":"T","Ț":"T","Ⱦ":"T","Ṫ":"T","Ṭ":"T","Ƭ":"T","Ṯ":"T","Ʈ":"T","Ŧ":"T","Ɐ":"A","Ꞁ":"L","Ɯ":"M","Ʌ":"V","Ꜩ":"TZ","Ú":"U","Ŭ":"U","Ǔ":"U","Û":"U","Ṷ":"U","Ü":"U","Ǘ":"U","Ǚ":"U","Ǜ":"U","Ǖ":"U","Ṳ":"U","Ụ":"U","Ű":"U","Ȕ":"U","Ù":"U","Ủ":"U","Ư":"U","Ứ":"U","Ự":"U","Ừ":"U","Ử":"U","Ữ":"U","Ȗ":"U","Ū":"U","Ṻ":"U","Ų":"U","Ů":"U","Ũ":"U","Ṹ":"U","Ṵ":"U","Ꝟ":"V","Ṿ":"V","Ʋ":"V","Ṽ":"V","Ꝡ":"VY","Ẃ":"W","Ŵ":"W","Ẅ":"W","Ẇ":"W","Ẉ":"W","Ẁ":"W","Ⱳ":"W","Ẍ":"X","Ẋ":"X","Ý":"Y","Ŷ":"Y","Ÿ":"Y","Ẏ":"Y","Ỵ":"Y","Ỳ":"Y","Ƴ":"Y","Ỷ":"Y","Ỿ":"Y","Ȳ":"Y","Ɏ":"Y","Ỹ":"Y","Ź":"Z","Ž":"Z","Ẑ":"Z","Ⱬ":"Z","Ż":"Z","Ẓ":"Z","Ȥ":"Z","Ẕ":"Z","Ƶ":"Z","IJ":"IJ","Œ":"OE","ᴀ":"A","ᴁ":"AE","ʙ":"B","ᴃ":"B","ᴄ":"C","ᴅ":"D","ᴇ":"E","ꜰ":"F","ɢ":"G","ʛ":"G","ʜ":"H","ɪ":"I","ʁ":"R","ᴊ":"J","ᴋ":"K","ʟ":"L","ᴌ":"L","ᴍ":"M","ɴ":"N","ᴏ":"O","ɶ":"OE","ᴐ":"O","ᴕ":"OU","ᴘ":"P","ʀ":"R","ᴎ":"N","ᴙ":"R","ꜱ":"S","ᴛ":"T","ⱻ":"E","ᴚ":"R","ᴜ":"U","ᴠ":"V","ᴡ":"W","ʏ":"Y","ᴢ":"Z","á":"a","ă":"a","ắ":"a","ặ":"a","ằ":"a","ẳ":"a","ẵ":"a","ǎ":"a","â":"a","ấ":"a","ậ":"a","ầ":"a","ẩ":"a","ẫ":"a","ä":"a","ǟ":"a","ȧ":"a","ǡ":"a","ạ":"a","ȁ":"a","à":"a","ả":"a","ȃ":"a","ā":"a","ą":"a","ᶏ":"a","ẚ":"a","å":"a","ǻ":"a","ḁ":"a","ⱥ":"a","ã":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ḃ":"b","ḅ":"b","ɓ":"b","ḇ":"b","ᵬ":"b","ᶀ":"b","ƀ":"b","ƃ":"b","ɵ":"o","ć":"c","č":"c","ç":"c","ḉ":"c","ĉ":"c","ɕ":"c","ċ":"c","ƈ":"c","ȼ":"c","ď":"d","ḑ":"d","ḓ":"d","ȡ":"d","ḋ":"d","ḍ":"d","ɗ":"d","ᶑ":"d","ḏ":"d","ᵭ":"d","ᶁ":"d","đ":"d","ɖ":"d","ƌ":"d","ı":"i","ȷ":"j","ɟ":"j","ʄ":"j","dz":"dz","dž":"dz","é":"e","ĕ":"e","ě":"e","ȩ":"e","ḝ":"e","ê":"e","ế":"e","ệ":"e","ề":"e","ể":"e","ễ":"e","ḙ":"e","ë":"e","ė":"e","ẹ":"e","ȅ":"e","è":"e","ẻ":"e","ȇ":"e","ē":"e","ḗ":"e","ḕ":"e","ⱸ":"e","ę":"e","ᶒ":"e","ɇ":"e","ẽ":"e","ḛ":"e","ꝫ":"et","ḟ":"f","ƒ":"f","ᵮ":"f","ᶂ":"f","ǵ":"g","ğ":"g","ǧ":"g","ģ":"g","ĝ":"g","ġ":"g","ɠ":"g","ḡ":"g","ᶃ":"g","ǥ":"g","ḫ":"h","ȟ":"h","ḩ":"h","ĥ":"h","ⱨ":"h","ḧ":"h","ḣ":"h","ḥ":"h","ɦ":"h","ẖ":"h","ħ":"h","ƕ":"hv","í":"i","ĭ":"i","ǐ":"i","î":"i","ï":"i","ḯ":"i","ị":"i","ȉ":"i","ì":"i","ỉ":"i","ȋ":"i","ī":"i","į":"i","ᶖ":"i","ɨ":"i","ĩ":"i","ḭ":"i","ꝺ":"d","ꝼ":"f","ᵹ":"g","ꞃ":"r","ꞅ":"s","ꞇ":"t","ꝭ":"is","ǰ":"j","ĵ":"j","ʝ":"j","ɉ":"j","ḱ":"k","ǩ":"k","ķ":"k","ⱪ":"k","ꝃ":"k","ḳ":"k","ƙ":"k","ḵ":"k","ᶄ":"k","ꝁ":"k","ꝅ":"k","ĺ":"l","ƚ":"l","ɬ":"l","ľ":"l","ļ":"l","ḽ":"l","ȴ":"l","ḷ":"l","ḹ":"l","ⱡ":"l","ꝉ":"l","ḻ":"l","ŀ":"l","ɫ":"l","ᶅ":"l","ɭ":"l","ł":"l","lj":"lj","ſ":"s","ẜ":"s","ẛ":"s","ẝ":"s","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ᵯ":"m","ᶆ":"m","ń":"n","ň":"n","ņ":"n","ṋ":"n","ȵ":"n","ṅ":"n","ṇ":"n","ǹ":"n","ɲ":"n","ṉ":"n","ƞ":"n","ᵰ":"n","ᶇ":"n","ɳ":"n","ñ":"n","nj":"nj","ó":"o","ŏ":"o","ǒ":"o","ô":"o","ố":"o","ộ":"o","ồ":"o","ổ":"o","ỗ":"o","ö":"o","ȫ":"o","ȯ":"o","ȱ":"o","ọ":"o","ő":"o","ȍ":"o","ò":"o","ỏ":"o","ơ":"o","ớ":"o","ợ":"o","ờ":"o","ở":"o","ỡ":"o","ȏ":"o","ꝋ":"o","ꝍ":"o","ⱺ":"o","ō":"o","ṓ":"o","ṑ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","õ":"o","ṍ":"o","ṏ":"o","ȭ":"o","ƣ":"oi","ꝏ":"oo","ɛ":"e","ᶓ":"e","ɔ":"o","ᶗ":"o","ȣ":"ou","ṕ":"p","ṗ":"p","ꝓ":"p","ƥ":"p","ᵱ":"p","ᶈ":"p","ꝕ":"p","ᵽ":"p","ꝑ":"p","ꝙ":"q","ʠ":"q","ɋ":"q","ꝗ":"q","ŕ":"r","ř":"r","ŗ":"r","ṙ":"r","ṛ":"r","ṝ":"r","ȑ":"r","ɾ":"r","ᵳ":"r","ȓ":"r","ṟ":"r","ɼ":"r","ᵲ":"r","ᶉ":"r","ɍ":"r","ɽ":"r","ↄ":"c","ꜿ":"c","ɘ":"e","ɿ":"r","ś":"s","ṥ":"s","š":"s","ṧ":"s","ş":"s","ŝ":"s","ș":"s","ṡ":"s","ṣ":"s","ṩ":"s","ʂ":"s","ᵴ":"s","ᶊ":"s","ȿ":"s","ɡ":"g","ᴑ":"o","ᴓ":"o","ᴝ":"u","ť":"t","ţ":"t","ṱ":"t","ț":"t","ȶ":"t","ẗ":"t","ⱦ":"t","ṫ":"t","ṭ":"t","ƭ":"t","ṯ":"t","ᵵ":"t","ƫ":"t","ʈ":"t","ŧ":"t","ᵺ":"th","ɐ":"a","ᴂ":"ae","ǝ":"e","ᵷ":"g","ɥ":"h","ʮ":"h","ʯ":"h","ᴉ":"i","ʞ":"k","ꞁ":"l","ɯ":"m","ɰ":"m","ᴔ":"oe","ɹ":"r","ɻ":"r","ɺ":"r","ⱹ":"r","ʇ":"t","ʌ":"v","ʍ":"w","ʎ":"y","ꜩ":"tz","ú":"u","ŭ":"u","ǔ":"u","û":"u","ṷ":"u","ü":"u","ǘ":"u","ǚ":"u","ǜ":"u","ǖ":"u","ṳ":"u","ụ":"u","ű":"u","ȕ":"u","ù":"u","ủ":"u","ư":"u","ứ":"u","ự":"u","ừ":"u","ử":"u","ữ":"u","ȗ":"u","ū":"u","ṻ":"u","ų":"u","ᶙ":"u","ů":"u","ũ":"u","ṹ":"u","ṵ":"u","ᵫ":"ue","ꝸ":"um","ⱴ":"v","ꝟ":"v","ṿ":"v","ʋ":"v","ᶌ":"v","ⱱ":"v","ṽ":"v","ꝡ":"vy","ẃ":"w","ŵ":"w","ẅ":"w","ẇ":"w","ẉ":"w","ẁ":"w","ⱳ":"w","ẘ":"w","ẍ":"x","ẋ":"x","ᶍ":"x","ý":"y","ŷ":"y","ÿ":"y","ẏ":"y","ỵ":"y","ỳ":"y","ƴ":"y","ỷ":"y","ỿ":"y","ȳ":"y","ẙ":"y","ɏ":"y","ỹ":"y","ź":"z","ž":"z","ẑ":"z","ʑ":"z","ⱬ":"z","ż":"z","ẓ":"z","ȥ":"z","ẕ":"z","ᵶ":"z","ᶎ":"z","ʐ":"z","ƶ":"z","ɀ":"z","ff":"ff","ffi":"ffi","ffl":"ffl","fi":"fi","fl":"fl","ij":"ij","œ":"oe","st":"st","ₐ":"a","ₑ":"e","ᵢ":"i","ⱼ":"j","ₒ":"o","ᵣ":"r","ᵤ":"u","ᵥ":"v","ₓ":"x"};String.prototype.latinise=function(){return this.replace(/[^A-Za-z0-9\[\] ]/g,function(e){return Latinise.latin_map[e]||e})};String.prototype.latinize=String.prototype.latinise;String.prototype.isLatin=function(){return this==this.latinise()};array_unique=function(e){var t=new Array;e:for(var n=0,r=e.length;n array(3),
);
- $items['materioflag/refresh/block/mylists'] = $base+array(
+ $items['materioflag/refresh/block/lists'] = $base+array(
'access arguments' => array('create flag lists'),
'page callback' => 'materio_flag_refresh_block',
'page arguments' => array(3),
@@ -57,11 +57,26 @@ function materio_flag_menu() {
'page arguments' => array(3),
);
- $items['materioflag/createlist/%'] = $base+array(
+
+ $items['materioflag/nodelinks'] = $base+array(
'access arguments' => array('create flag lists'),
'access callback' => 'user_access',
- 'page callback' => 'materio_flag_createlist',
- 'page arguments' => array(2, 3),
+ 'page callback' => 'materio_flag_nodelinks',
+ // 'page arguments' => array(3),
+ );
+
+ $items['lists/%'] = $base+array(
+ 'access arguments' => array('create flag lists'),
+ 'access callback' => 'user_access',
+ 'page callback' => 'materio_flag_user_lists',
+ 'page arguments' => array(1),
+ );
+
+ $items['materioflag/ajax/list/%'] = $base+array(
+ 'page callback' => 'materio_flag_ajax_list',
+ 'access arguments' => array('create flag lists'),
+ 'access callback' => 'user_access',
+ 'page arguments' => array(3, 4),
);
return $items;
@@ -83,6 +98,10 @@ function materio_flag_block_info() {
'cache' => DRUPAL_NO_CACHE
);
+$blocks['materio_flag_mylists_nav'] = array(
+ 'info' => t('My Materio flag lists navigation'),
+ 'cache' => DRUPAL_NO_CACHE
+);
return $blocks;
}
@@ -122,6 +141,7 @@ function materio_flag_block_view($delta = '') {
// dsm($flags, 'flags');
foreach ($flags as $name => $flag) {
+ $flag->path = url('lists/'.$flag->fid);
$flaged_content = flag_lists_get_flagged_content($flag->fid, $user->uid);
// dsm($flaged_content, 'flaged_content');
$fcn = array();
@@ -134,6 +154,7 @@ function materio_flag_block_view($delta = '') {
$fcn[] = $node;
}
}
+
$lists[$name] = array(
'list' => $flag,
'content' => $fcn,
@@ -152,6 +173,19 @@ function materio_flag_block_view($delta = '') {
drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/materio_flag-ck.js');
}
break;
+ case 'materio_flag_mylists_nav':
+ if(user_access('create flag lists')){
+ $flags = flag_lists_get_user_flags(NULL, $user);
+ // foreach ($flags as $name => $flag) {
+ // # code...
+ // }
+
+
+ $block['subject'] = t('My !listname'.'s', array('!listname'=>variable_get('flag_lists_name', 'list')));
+ $block['content'] = theme('materio_flag_mylists_nav_block', array("flags"=>$flags));
+ // $block['content'] = theme('flag_lists_user_page', array('uid' => $user->uid));
+ }
+ break;
}
return $block;
}
@@ -174,120 +208,136 @@ function materio_flag_entity_info_alter(&$entity_info) {
function materio_flag_entity_view($entity, $type, $view_mode, $langcode) {
if($type == 'node'){
- // dsm($entity, 'entity');
- // Do we have a list template for this node type, or are we s
- if (!flag_lists_template_exists($entity->type)) {
- return;
- }
+ $flaglists_links = materio_flag_get_entity_links($entity, $type, $view_mode);
+ // dsm($flaglists_links, 'flaglists_links');
- global $user;
+ $entity->content['links']['flaglistslinks'] = array('#markup' => $flaglists_links,"#html"=>true);
- if ($flags = flag_lists_get_user_flags($entity->type, $user)) {
- // dsm($flags, 'flags');
- # if flag name is provided we are on flaglists content list (block mylists)
- if(isset($entity->flag_names)){
- // TODO: limit flag link by current flag list
- foreach ($flags as $flag) {
- //dsm($flag->name, 'flag');
- if(in_array($flag->name, $entity->flag_names)){
- if ($flag->module == 'flag_lists') {
- $action = _flag_lists_is_flagged($flag, $entity->nid, $user->uid, 0) ? 'unflag' : 'flag';
- } else {
- $action = $flag->is_flagged($entity->nid) ? 'unflag' : 'flag';
- }
- $flag->module = 'materio_flag';
- $link = $flag->theme($action, $entity->nid);
-
- // If it's a list, fix the link.
- if ($flag->module == 'flag_lists') {
- flag_lists_fix_link($link, $action);
- }
-
- $items[] = array(
- 'data' => $link,
- 'class' => array('flag-lists-link', $action.'-action'),
- );
-
- // array_splice($entity->flag_names, array_search($flag->name, $entity->flag_names), 1);
-
- // dsm($entity->flag_names, 'entity->flag_name');
-
- // break;
- }
-
- }
-
- #normal display
- }else{
- // Build the list of lists for this node.
- foreach ($flags as $flag) {
- if ($flag->module == 'flag_lists') {
- $action = _flag_lists_is_flagged($flag, $entity->nid, $user->uid, 0) ? 'unflag' : 'flag';
- }
- else {
- $action = $flag->is_flagged($entity->nid) ? 'unflag' : 'flag';;
- }
-
- // dsm($flag, 'flag');
-
- // $flag->module = 'materio_flag';
-
- $link = $flag->theme($action, $entity->nid);
-
- // If it's a list, fix the link.
- if ($flag->module == 'flag_lists') {
- flag_lists_fix_link($link, $action);
- }
-
- $items[] = array(
- 'data' => $link,
- 'class' => array('flag-lists-link', $action.'-action'),
- );
- }
-
- #create new list
- $link = l(
- t('New @name', array('@name' => variable_get('flag_lists_name', t('list')))),
- 'flag-lists/add/' . $entity->type,
- array(
- // 'query' => drupal_get_destination(),
- 'attributes' => array(
- 'class' => array('flag-lists-create'),
- 'title' => t('create a new @name and use it.', array('@name'=>variable_get('flag_lists_name', t('list'))))
- )
- )
- );
-
- $create = array(
- 'data' => $link,// . ' ',
- 'class' => array('flag-lists-create'),
- );
-
-
-
- }
-
- if( (!isset($items) || !count($items)) && !isset($create))
- return;
-
- $ops = array(
- 'node' => $entity,
- 'items' => $items,
- );
-
- if(isset($create))
- $ops['create'] = $create;
-
- drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/materio_flag-ck.js');
-
- $flaglists_links = theme('materio_flag_mylists_entity_links', $ops);
-
- $entity->content['links']['flaglistslinks'] = array('#markup' => $flaglists_links,"#html"=>true);
-
- }
+ drupal_add_css(drupal_get_path('module', 'flag') . '/theme/flag.css');
+ drupal_add_js(drupal_get_path('module', 'flag') . '/theme/flag.js');
}
}
+function materio_flag_get_entity_links($entity, $type, $view_mode = null){
+ // dsm($entity, 'entity');
+
+ // Do we have a list template for this node type, or are we s
+ if (!flag_lists_template_exists($entity->type)) {
+ return;
+ }
+
+ global $user;
+
+ # if flag name is provided we are on flaglists content list (block mylists)
+ if($view_mode == 'bookmark'){
+ // TODO: define view mode in settings
+ // if (isset($entity->flag_names) && $flags = flag_lists_get_user_flags($entity->type, $user)) {
+ // // dsm($flags, 'flags');
+ // // TODO: limit flag link by current flag list
+ // foreach ($flags as $flag) {
+ // //dsm($flag->name, 'flag');
+ // if(in_array($flag->name, $entity->flag_names)){
+ // if ($flag->module == 'flag_lists') {
+ // $action = _flag_lists_is_flagged($flag, $entity->nid, $user->uid, 0) ? 'unflag' : 'flag';
+ // } else {
+ // $action = $flag->is_flagged($entity->nid) ? 'unflag' : 'flag';
+ // }
+ // $flag->module = 'materio_flag';
+ // $link = $flag->theme($action, $entity->nid);
+
+ // // If it's a list, fix the link.
+ // if ($flag->module == 'flag_lists') {
+ // flag_lists_fix_link($link, $action);
+ // }
+
+ // $items[] = array(
+ // 'data' => $link,
+ // 'class' => array('flag-lists-link', $action.'-action'),
+ // );
+
+ // // array_splice($entity->flag_names, array_search($flag->name, $entity->flag_names), 1);
+ // // dsm($entity->flag_names, 'entity->flag_name');
+ // // break;
+ // }
+ // }
+ // }
+ #normal display
+ }else{
+ if ($flags = flag_lists_get_user_flags($entity->type, $user)) {
+ // dsm($flags, 'flags');
+ // Build the list of lists for this node.
+ foreach ($flags as $flag) {
+ // dsm($flag, 'flag');
+ if ($flag->module == 'flag_lists') {
+ $action = _flag_lists_is_flagged($flag, $entity->nid, $user->uid, 0) ? 'unflag' : 'flag';
+ }
+ else {
+ $action = $flag->is_flagged($entity->nid) ? 'unflag' : 'flag';;
+ }
+
+ $link = $flag->theme($action, $entity->nid);
+
+ // If it's a list, fix the link.
+ if ($flag->module == 'flag_lists') {
+ flag_lists_fix_link($link, $action);
+ }
+
+ $items[] = array(
+ 'data' => $link,
+ 'class' => array('flag-lists-link', $action.'-action'),
+ );
+ }
+ }
+
+ #create new list
+ $link = l(
+ '' . t('New @name', array('@name' => variable_get('flag_lists_name', t('list')))) . ' ',
+ 'flag-lists/add/' . $entity->type,
+ array(
+ // 'query' => drupal_get_destination(),
+ 'attributes' => array(
+ 'class' => array('flag-lists-create'),
+ 'title' => t('create a new @name and use it.', array('@name'=>variable_get('flag_lists_name', t('list')))),
+ 'nid' => $entity->nid,
+ 'token' => flag_get_token($entity->nid),
+ ),
+ 'html' => TRUE,
+ )
+ );
+
+ $create = array(
+ 'data' => $link,
+ 'class' => array('flag-lists-create'),
+ );
+ }
+
+ // if( (!isset($items) || !count($items)) && !isset($create))
+ // return;
+
+ if(isset($items)){
+ $ops = array(
+ 'node' => $entity,
+ 'items' => $items,
+ );
+ }
+
+ if(isset($create)){
+ $ops['create'] = $create;
+ // drupal_add_css(drupal_get_path('module', 'flag') . '/theme/flag.css');
+ // drupal_add_js(drupal_get_path('module', 'flag') . '/theme/flag.js');
+ }
+
+ if(isset($ops)){
+ // dsm($ops, 'ops');
+ drupal_add_js(drupal_get_path('module', 'materio_flag').'/js/materio_flag-ck.js');
+
+ return theme('materio_flag_mylists_entity_links', $ops);
+ }
+
+ return;
+}
+
+
/**
* Implements hook_theme().
*/
@@ -303,18 +353,40 @@ function materio_flag_theme($existing, $type, $theme, $path) {
'template' => 'materio-flag-mylists-block',
'path' => drupal_get_path('module', 'materio_flag').'/templates',
),
+ 'materio_flag_mylists_nav_block' => array(
+ 'arguments' => array(),
+ 'template' => 'materio-flag-mylists-nav-block',
+ 'path' => drupal_get_path('module', 'materio_flag').'/templates',
+ ),
'materio_flag_mylists_entity_links' => array(
'variables' => array('node' => NULL, 'create' => NULL, 'items' => array()),
),
+ 'materio_flag_mylists_list' => array(
+ 'template' => 'materio-flag-mylists-list',
+ 'path' => drupal_get_path('module', 'materio_flag').'/templates',
+ 'variables' => array(
+ 'count' => 0,
+ 'items' => array(),
+ 'view_mode' => 'teaser',
+ 'pager' => NULL,
+ 'fid' => null,
+ 'name' => null,
+ 'title' => null,
+ ),
+ ),
);
}
-function template_preprocess_materio_flag_mybookmarks_block($vars){
+function template_preprocess_materio_flag_mybookmarks_block(&$vars){
// dsm($vars, 'vars');
}
-function template_preprocess_materio_flag_mylists_block($vars){
+function template_preprocess_materio_flag_mylists_block(&$vars){
+ // dsm($vars, 'vars');
+}
+
+function template_preprocess_materio_flag_mylists_nav_block(&$vars){
// dsm($vars, 'vars');
}
@@ -335,4 +407,20 @@ function theme_materio_flag_mylists_entity_links($vars){
return theme('item_list', array('items' => $items, 'type' => 'ul', 'attributes' => array('class' => 'flag-lists-entity-links')));
-}
\ No newline at end of file
+}
+
+function template_preprocess_materio_flag_mylists_list(&$vars) {
+
+ $vars['list_count'] = format_plural(
+ $vars['count'],
+ '@name @title contains 1 item.', // in @sec seconds
+ '@name @title contains @count items.', // in @sec seconds
+ array(
+ '@name' => $vars['name'],
+ '@title' => $vars['title'],
+ )
+ );
+
+ // dsm($vars, '$vars');
+}
+
diff --git a/materio_flag.pages.inc b/materio_flag.pages.inc
index 300b90c3..1456c088 100644
--- a/materio_flag.pages.inc
+++ b/materio_flag.pages.inc
@@ -11,7 +11,7 @@ function materio_flag_refresh_block($flag){
case 'bookmarks':
$block_name = 'materio_flag_mybookmarks';
break;
- case 'mylists':
+ case 'lists':
$block_name = 'materio_flag_mylists';
break;
}
@@ -62,17 +62,167 @@ function materio_flag_createlist_form($type){
// break;
// }
// } elseif (isset($return)) {
- $form_state['build_info']['args'] = array(null, $type);
- // $form = drupal_get_form('flag_lists_form', $form_state);//, NULL, $type
- $form = drupal_build_form('flag_lists_form', $form_state);
- dsm($form, 'form');
+
+ $form_state['build_info']['args'] = array(NULL, 'breve');
+ // $f = drupal_get_form('flag_lists_form', $form_state);
+ // dsm($f);
- // if (is_array($return)) {
- $return = drupal_render($form);
- // }
+ $form = array(
+ '#type' => 'form',
+ '#id' => 'materio-flag-create-list-form',
+ );
+
+ $form['type'] = array(
+ '#type' => 'hidden',
+ '#value' => $type,
+ '#name' => 'type',
+ );
+
+ $form['listname'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Create new @name', array('@name'=>variable_get('flag_lists_name', 'list'))),
+ '#default_value' => '',
+ // '#size' => 100,
+ '#maxlength' => 255,
+ '#name' => 'flag-lists-name',
+ '#description' => t('A short, descriptive title for this Folder list. Limit to 255 characters.'),
+ );
+
+ $form['actions'] = array(
+ '#prefix' => '',
+ '#suffix' => '
',
+ );
+
+
+ $form['actions']['cancel'] = array(
+ '#type' => 'button',
+ '#value' => t('cancel'),
+ '#name' => 'cancel',
+ );
+
+ $form['actions']['create'] = array(
+ '#type' => 'submit',
+ '#value' => t('create'),
+ '#name' => 'create',
+ );
+
+
+ // dsm($form, 'form');
+
+ $return = drupal_render($form);
+
+ $rep = array(
+ 'return'=>$return,
+ );
+
+ if ($debug) {
+ dsm($rep, 'rep');
+ return "debug display";
+ }else{
+ drupal_json_output($rep);
+ }
+
+}
+
+function materio_flag_nodelinks(){
+ $nids = explode(';', $_REQUEST['nids']);
+
+ if(count($nids)){
+ foreach ($nids as $nid) {
+ $node = node_load($nid);
+ $lks = materio_flag_get_entity_links($node, 'node');
+ $links[$nid] = $lks;
+ }
$rep = array(
- 'return'=>$return,
+ "status" => 1,
+ "nids" => $nids,
+ 'links' => $links,
+ );
+ }else{
+ $rep['status'] = 0;
+ }
+
+ drupal_json_output($rep);
+}
+
+function materio_flag_user_lists($fid){
+ global $user;
+ $flag = flag_lists_get_flag($fid);
+ // dsm($flag, 'flag');
+
+ $flaged_content = flag_lists_get_flagged_content($fid, $user->uid);
+ // dsm($flaged_content, 'flaged_content');
+
+ $viewmode = isset($user->data['materiosearchapi_viewmode']) ? $user->data['materiosearchapi_viewmode'] : variable_get('defaultviewmode', 'full');
+
+ $limit = variable_get($viewmode.'_limite', '10');
+ $offset = pager_find_page() * $limit;
+ $count = count($flaged_content);
+ $max = $offset+$limit > $count ? $count : $offset+$limit;
+
+ for ($i=$offset; $i < $max; $i++) {
+ if($flaged_content[$i]->entity_type == 'node'){
+ $items[] = node_load($flaged_content[$i]->entity_id);
+ }
+ }
+
+ $ret['#items'] = $items;
+ $ret['#theme'] = 'materio_flag_mylists_list';
+ $ret['#view_mode'] = $viewmode;
+ $ret['#fid'] = $fid;
+ $ret['#count'] = $count;
+ $ret['#name'] = variable_get('flag_lists_name', 'list');
+ $ret['#title'] = $flag->title;
+
+ pager_default_initialize($count, $limit);
+ $ret['#pager'] = theme('pager');
+
+ return $ret;
+
+}
+
+function materio_flag_ajax_list($fid, $page = 0){
+ $debug = false;
+
+ $_GET['page'] = $page;
+
+ $path = 'lists/'.$fid;
+
+ // check if request is ajax, if not rediret to search_api_page page with right keys
+ if (!$debug && (!isset($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest')) {
+ drupal_goto($path, array('query'=>array('page'=>$page)), 301);
+ exit;
+ }
+
+ // get results
+ menu_set_active_item($path);
+ $return = menu_execute_active_handler($path, FALSE);
+
+ // dsm($return, '$return');
+
+ if (is_int($return)) {
+ switch ($return) {
+ case MENU_NOT_FOUND :
+ drupal_add_http_header('Status', '404 Not Found');
+ break;
+ case MENU_ACCESS_DENIED :
+ drupal_add_http_header('Status', '403 Forbidden');
+ break;
+ case MENU_SITE_OFFLINE :
+ drupal_add_http_header('Status', '503 Service unavailable');
+ break;
+ }
+ } elseif (isset($return)) {
+
+ if (is_array($return)) {
+ $return = drupal_render($return);
+ }
+
+ $rep = array(
+ 'return' => $return,
+ 'path' => $path,
+ 'title' => 'folder',
);
if ($debug) {
@@ -81,19 +231,5 @@ function materio_flag_createlist_form($type){
}else{
drupal_json_output($rep);
}
- // }
-
-}
-
-
-/**
- * materio_flag_createlist($type, $nid)
- *
- */
-function materio_flag_createlist($title, $nid = null){
- drupal_get_form('flag_lists_form', $title);
-
-
-
-
+ }
}
\ No newline at end of file
diff --git a/materio_search_api.module b/materio_search_api.module
index ca99620e..22547ac5 100644
--- a/materio_search_api.module
+++ b/materio_search_api.module
@@ -227,6 +227,21 @@ function materio_search_api_search_form($form, &$form_state){
global $user;
$form = array();
+
+ $args = arg();
+ $path = array_shift($args);
+ $keys = implode('/', $args);
+
+ $form['searchfield'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $path == 'explore' ? $keys : "", // TODO: set the search page path global or a variable in settings
+ // '#value' => $keys,
+ '#autocomplete_path' => 'materiosearchapi/autocomplete/searchapi',
+ //'#autocomplete_path' => 'materiosearchapi/autocomplete/dbselect',
+ '#size' => 30,
+ '#maxlength' => 1024,
+ );
+
if(user_access('use materio search api filters')){
$index = search_api_index_load(variable_get('mainsearchindex', -1));
@@ -247,20 +262,6 @@ function materio_search_api_search_form($form, &$form_state){
);
}
- $args = arg();
- $path = array_shift($args);
- $keys = implode('/', $args);
-
- $form['searchfield'] = array(
- '#type' => 'textfield',
- '#default_value' => $path == 'explore' ? $keys : "", // TODO: set the search page path global or a variable in settings
- // '#value' => $keys,
- '#autocomplete_path' => 'materiosearchapi/autocomplete/searchapi',
- //'#autocomplete_path' => 'materiosearchapi/autocomplete/dbselect',
- '#size' => 30,
- '#maxlength' => 1024,
- );
-
$form['create'] = array(
'#type' => 'image_button',
'#src' => drupal_get_path('module', 'materio_search_api') . '/images/search.png',
@@ -307,22 +308,27 @@ function materio_search_api_search_form_submit($form, &$form_state){
/**
- * Implements hook_form_alter().
- *
- * Adds language fields to user forms.
+ * viewmode
*/
-// TODO: user can choose preferred view mode
-// function materio_search_api_form_alter(&$form, &$form_state, $form_id) {
-// if (user_access('use materio search api viewmode selection')) {
-// if ($form_id == 'user_register_form' || ($form_id == 'user_profile_form' && $form['#user_category'] == 'account')) {
-// materio_search_api_viewmode_selector_form($form, $form_state, $form['#user']);
-// }
-// }
-// }
-// function materio_search_api_viewmode_selector_form(&$form, &$form_state, $user) {
+function _materio_search_api_change_viewmode($vm){
+ // dsm($vm, '_materio_search_api_change_viewmode');
-// }
+ global $user;
+ // dsm($user, 'user');
+
+ $entity_infos = entity_get_info();
+ // dsm($entity_infos, 'entity_infos');
+
+ if (in_array($vm, variable_get('availableviewmodes', array()))) {
+ user_save($user, array("data"=>array('materiosearchapi_viewmode' => $vm)));
+ $rep = array('statut'=>'saved');
+ }else{
+ $rep = array('statut'=>'viewmode not allowed');
+ }
+
+ return $rep;
+}
/**
* - - - - - - - - - - - - THEME - - - - - - - - - - - -
@@ -409,10 +415,29 @@ function template_preprocess_materio_search_api_select_viewmode_block(&$vars){
$entity_infos = entity_get_info();
// dsm($entity_infos, 'entity_infos');
+ // TODO: refaire les boutons view modes pour qu'il fonctionne sans javascript
+ // faire un lien vers l'enregistrement du mode puis un reload de la page courante
$content = '';
foreach ($entity_infos['node']['view modes'] as $viewmode => $value) {
if(in_array($viewmode, $availableviewmodes)){
- $content .= '
'.$value['label'].'
';
+ $link = l(
+ '
'.$value['label'].' ',
+ 'materiosearchapi/viewmode/change/'.$viewmode,
+ array(
+ 'query' => drupal_get_destination(),
+ 'html' => true,
+ 'attributes' => array(
+ 'class' => array(
+ 'viewmode-link',
+ 'viewmode-'.$viewmode,
+ $active == $viewmode ? " active" : ''
+ ),
+ 'rel' => $viewmode
+ )
+ )
+ );
+
+ $content .= $link;
}
}
$content .= '
';
@@ -471,11 +496,11 @@ function template_preprocess_materio_search_api_results(array &$variables) {
$variables['result_count'] = $results['result count'];
$variables['sec'] = round($results['performance']['complete'], 3);
$variables['search_performance'] = format_plural(
- $results['result count'],
- 'The search found 1 result.', // in @sec seconds
- 'The search found @count results.', // in @sec seconds
- array('@sec' => $variables['sec'])
- );
+ $results['result count'],
+ 'The search found 1 result.', // in @sec seconds
+ 'The search found @count results.', // in @sec seconds
+ array('@sec' => $variables['sec'])
+ );
// $variables['search_results'] = array(
// '#theme' => 'search_results_list',
@@ -497,7 +522,7 @@ function template_preprocess_materio_search_api_actuality(&$vars){
// $items[] = node_load($nid);
// }
// $vars['items'] = $items;
-
+ $vars['actualities_infos'] = t('Actualities by materiO\'');
}
/**
diff --git a/materio_search_api.pages.inc b/materio_search_api.pages.inc
index 9b4dc61e..5279fdf3 100644
--- a/materio_search_api.pages.inc
+++ b/materio_search_api.pages.inc
@@ -119,7 +119,7 @@ function materio_search_api_autocomplete_searchapi($typed = ''){
*
*
*/
-function materio_search_api_results_search(){//, $limit = 20, $page = 0
+function materio_search_api_results_search(){
global $user;
//dsm("materio_search_api_results_search");
@@ -166,8 +166,6 @@ function materio_search_api_results_search(){//, $limit = 20, $page = 0
$query = search_api_query($index_machine_name, array('parse mode'=>'direct'))
->keys(implode(' ', $keys))
- // TODO: add bundle filter
- // ->condition('type', 'breve')
->range($offset, $limit);
$filter = $query->createFilter('OR');
@@ -256,11 +254,14 @@ function materio_search_api_results_search(){//, $limit = 20, $page = 0
*
*/
function materio_search_api_actuality(){
-
+ global $user;
+
$date = strtotime('-6 month');
+ $viewmode = isset($user->data['materiosearchapi_viewmode']) ? $user->data['materiosearchapi_viewmode'] : variable_get('defaultviewmode', 'full');
$limit = 10;//variable_get($viewmode.'_limite', '10');
$offset = pager_find_page() * $limit;
+ // dsm($offset);
$query = new EntityFieldQuery;
$query
@@ -308,9 +309,20 @@ function materio_search_api_actuality(){
return theme('materio_search_api_actuality', array(
'items' => $items,
- 'view_mode' => 'cardmedium',
+ 'view_mode' => $viewmode,
'count' => $count,
'pager' => theme('pager'),
));
}
+
+function materio_search_api_viewmode_change($vm){
+ dsm($vm, 'materio_search_api_viewmode_change');
+ $rep = _materio_search_api_change_viewmode($vm);
+
+ //return 'debug mode for materio_search_api_viewmode_change';
+ // drupal_json_output($rep);
+
+ drupal_goto();
+
+}
diff --git a/materio_search_api_ajax.pages.inc b/materio_search_api_ajax.pages.inc
index 1033c08d..04be430d 100644
--- a/materio_search_api_ajax.pages.inc
+++ b/materio_search_api_ajax.pages.inc
@@ -90,20 +90,21 @@ function materio_search_api_ajax_search($keys, $page = 0){
function materio_search_api_ajax_viewmode_change($vm){
// dsm($vm);
- global $user;
- // dsm($user, 'user');
+ // global $user;
+ // // dsm($user, 'user');
- $entity_infos = entity_get_info();
- // dsm($entity_infos, 'entity_infos');
+ // $entity_infos = entity_get_info();
+ // // dsm($entity_infos, 'entity_infos');
- if (in_array($vm, variable_get('availableviewmodes', array()))) {
- user_save($user, array("data"=>array('materiosearchapi_viewmode' => $vm)));
- $rep = array('statut'=>'saved');
- }else{
- $rep = array('statut'=>'viewmode not allowed');
- }
-
- //return 'debug mode for materio_search_api_viewmode_change';
+ // if (in_array($vm, variable_get('availableviewmodes', array()))) {
+ // user_save($user, array("data"=>array('materiosearchapi_viewmode' => $vm)));
+ // $rep = array('statut'=>'saved');
+ // }else{
+ // $rep = array('statut'=>'viewmode not allowed');
+ // }
+ $_GET['page'] = 0;
+ $rep = _materio_search_api_change_viewmode($vm);
+
drupal_json_output($rep);
}
diff --git a/templates/materio-flag-mylists-block.tpl.php b/templates/materio-flag-mylists-block.tpl.php
index cbf8476d..d4f2db82 100644
--- a/templates/materio-flag-mylists-block.tpl.php
+++ b/templates/materio-flag-mylists-block.tpl.php
@@ -1,6 +1,10 @@
$list): ?>
- title; ?>
-
+
+
+
\ No newline at end of file
diff --git a/templates/materio-flag-mylists-list.tpl.php b/templates/materio-flag-mylists-list.tpl.php
new file mode 100644
index 00000000..04c369f9
--- /dev/null
+++ b/templates/materio-flag-mylists-list.tpl.php
@@ -0,0 +1,9 @@
+
+
+
diff --git a/templates/materio-flag-mylists-nav-block.tpl.php b/templates/materio-flag-mylists-nav-block.tpl.php
new file mode 100644
index 00000000..e3b4bf25
--- /dev/null
+++ b/templates/materio-flag-mylists-nav-block.tpl.php
@@ -0,0 +1,7 @@
+
+
+ $flag): ?>
+ title; ?>
+
+
+
\ No newline at end of file
diff --git a/templates/materio-search-api-actuality.tpl.php b/templates/materio-search-api-actuality.tpl.php
index f160ccf3..860277f4 100644
--- a/templates/materio-search-api-actuality.tpl.php
+++ b/templates/materio-search-api-actuality.tpl.php
@@ -3,6 +3,7 @@
?>