diff --git a/templates/2k11/commentform.tpl b/templates/2k11/commentform.tpl index ab7f952a..f5d9de75 100644 --- a/templates/2k11/commentform.tpl +++ b/templates/2k11/commentform.tpl @@ -3,10 +3,6 @@
-
- - {$commentform_replyTo} -
@@ -23,6 +19,10 @@
+
+ + {$commentform_replyTo} +
{serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry} {if $is_commentform_showToolbar}
diff --git a/templates/2k11/index.tpl b/templates/2k11/index.tpl index 733afd35..28d93931 100644 --- a/templates/2k11/index.tpl +++ b/templates/2k11/index.tpl @@ -24,7 +24,7 @@ {if $template_option.userstyles == true} {/if} - + {if $entry_id} @@ -50,7 +50,7 @@
- +
@@ -89,7 +89,7 @@ Powered by Serendipity & the 2k11 theme.
- + {/if} {$raw_data} {serendipity_hookPlugin hook="frontend_footer"} diff --git a/templates/2k11/info.txt b/templates/2k11/info.txt index aeeaec25..82703ee6 100644 --- a/templates/2k11/info.txt +++ b/templates/2k11/info.txt @@ -1,4 +1,4 @@ Name: 2k11 Author: Matthias Mees, Veit Lehmann -Date: 2012-02-08 +Date: 2012-03-15 Require Serendipity: 1.6 diff --git a/templates/2k11/js/2k11.js b/templates/2k11/js/2k11.js deleted file mode 100644 index f85c02e0..00000000 --- a/templates/2k11/js/2k11.js +++ /dev/null @@ -1,36 +0,0 @@ -// https://github.com/davatron5000/FitVids.js -(function(a){a.fn.fitVids=function(b){var c={customSelector:null};var e=document.createElement("div"),d=document.getElementsByTagName("base")[0]||document.getElementsByTagName("script")[0];e.className="fit-vids-style";e.innerHTML="­";d.parentNode.insertBefore(e,d);if(b){a.extend(c,b)}return this.each(function(){var f=["iframe[src^='http://player.vimeo.com']","iframe[src^='http://www.youtube.com']","iframe[src^='http://www.kickstarter.com']","object","embed"];if(c.customSelector){f.push(c.customSelector)}var g=a(this).find(f.join(","));g.each(function(){var k=a(this);if(this.tagName.toLowerCase()=="embed"&&k.parent("object").length||k.parent(".fluid-width-video-wrapper").length){return}var h=this.tagName.toLowerCase()=="object"?k.attr("height"):k.height(),i=h/k.width();if(!k.attr("id")){var j="fitvid"+Math.floor(Math.random()*999999);k.attr("id",j)}k.wrap('
').parent(".fluid-width-video-wrapper").css("padding-top",(i*100)+"%");k.removeAttr("height").removeAttr("width")})})}})(jQuery); -/*! http://mths.be/placeholder v1.8.7 by @mathias */ -jQuery(function(f,h,c){var a='placeholder' in h.createElement('input'),d='placeholder' in h.createElement('textarea'),i=c.fn,j;if(a&&d){j=i.placeholder=function(){return this};j.input=j.textarea=true}else{j=i.placeholder=function(){return this.filter((a?'textarea':':input')+'[placeholder]').not('.placeholder').bind('focus.placeholder',b).bind('blur.placeholder',e).trigger('blur.placeholder').end()};j.input=a;j.textarea=d;c(function(){c(h).delegate('form','submit.placeholder',function(){var k=c('.placeholder',this).each(b);setTimeout(function(){k.each(e)},10)})});c(f).bind('unload.placeholder',function(){c('.placeholder').val('')})}function g(l){var k={},m=/^jQuery\d+$/;c.each(l.attributes,function(o,n){if(n.specified&&!m.test(n.name)){k[n.name]=n.value}});return k}function b(){var k=c(this);if(k.val()===k.attr('placeholder')&&k.hasClass('placeholder')){if(k.data('placeholder-password')){k.hide().next().show().focus().attr('id',k.removeAttr('id').data('placeholder-id'))}else{k.val('').removeClass('placeholder')}}}function e(){var o,n=c(this),k=n,m=this.id;if(n.val()===''){if(n.is(':password')){if(!n.data('placeholder-textinput')){try{o=n.clone().attr({type:'text'})}catch(l){o=c('').attr(c.extend(g(this),{type:'text'}))}o.removeAttr('name').data('placeholder-password',true).data('placeholder-id',m).bind('focus.placeholder',b);n.data('placeholder-textinput',o).data('placeholder-id',m).before(o)}n=n.removeAttr('id').hide().prev().attr('id',m).show()}n.addClass('placeholder').val(n.attr('placeholder'))}else{n.removeClass('placeholder')}}}(this,document,jQuery)); -// https://github.com/manuelbieh/Details-Polyfill -jQuery(function(a){(function(){var b=this;this.hideDetailChildren=function(c){var d=c instanceof jQuery?c[0].childNodes:c.childNodes,e=d.length;a(c).attr("open",!1);if(a.browser.safari==!0)for(var f=0;f");g.text(d[f].textContent).hide(),a(d[f]).after(g),d[f].textContent="",e++}a.each(d,function(d,e){if(a(e)[0].nodeType==1&&e==a(e).parent().find("> summary:first-of-type")[0])a(e).data("processed")!=!0&&(a(e).css({display:"block",cursor:"pointer"}).data("processed",!0).addClass("detailHidden").bind("click",function(){b.toggleDetailChildren(a(this))}),a(c).prepend(a(e)));else if(a(e)[0].nodeType==3&&!e.isElementContentWhitespace&&!!a.browser.safari==!1){var f=a("");f.text(e.textContent).hide(),a(e).after(f),e.textContent=""}else if(a(c).find("> summary").length==0){var g=a("").text("Details").css({display:"block",cursor:"pointer"}).data("processed",!0).addClass("detailHidden").bind("click",function(){b.toggleDetailChildren(a(this))});a(c).prepend(g)}a(c).find("> :visible:not(summary:first-child)").hide()})},this.showDetailChildren=function(b){a(b).attr("open",!0),a.each(a(b).find("> *"),function(b,c){a(c).show()})},this.toggleDetailChildren=function(a){a.hasClass("detailHidden")?(a.removeClass("detailHidden"),b.showDetailChildren(a.parents("details")[0])):(a.addClass("detailHidden"),b.hideDetailChildren(a.parents("details")[0]))};var c=function(a){var b=a.createElement("details"),c,d,e;return"open"in b?(d=a.body||function(){var b=a.documentElement;return c=!0,b.insertBefore(a.createElement("body"),b.firstElementChild||b.firstChild)}(),b.innerHTML="ab",b.style.display="block",d.appendChild(b),e=b.offsetHeight,b.open=!0,e=e!=b.offsetHeight,d.removeChild(b),c&&d.parentNode.removeChild(d),e):!1}(document);if(c==!1){if(a("details").length!==0){var d=a(""; +g.parentNode.insertBefore(f,g);if(a){b.extend(h,a);}return this.each(function(){var d=["iframe[src^='http://player.vimeo.com']","iframe[src^='http://www.youtube.com']","iframe[src^='https://www.youtube.com']","iframe[src^='http://www.kickstarter.com']","object","embed"]; +if(h.customSelector){d.push(h.customSelector);}var c=b(this).find(d.join(","));c.each(function(){var e=b(this);if(this.tagName.toLowerCase()=="embed"&&e.parent("object").length||e.parent(".fluid-width-video-wrapper").length){return; +}var n=this.tagName.toLowerCase()=="object"?e.attr("height"):e.height(),m=n/e.width();if(!e.attr("id")){var l="fitvid"+Math.floor(Math.random()*999999); +e.attr("id",l);}e.wrap('
').parent(".fluid-width-video-wrapper").css("padding-top",(m*100)+"%");e.removeAttr("height").removeAttr("width"); +});});};})(jQuery);jQuery(function(b){(function(){var a=this;this.hideDetailChildren=function(l){var k=l instanceof jQuery?l[0].childNodes:l.childNodes,j=k.length; +b(l).attr("open",!1);if(b.browser.safari==!0){for(var i=0;i");h.text(k[i].textContent).hide(),b(k[i]).after(h),k[i].textContent="",j++; +}}}b.each(k,function(o,n){if(b(n)[0].nodeType==1&&n==b(n).parent().find("> summary:first-of-type")[0]){b(n).data("processed")!=!0&&(b(n).css({display:"block",cursor:"pointer"}).data("processed",!0).addClass("detailHidden").bind("click",function(){a.toggleDetailChildren(b(this)); +}),b(l).prepend(b(n)));}else{if(b(n)[0].nodeType==3&&!n.isElementContentWhitespace&&!!b.browser.safari==!1){var m=b("");m.text(n.textContent).hide(),b(n).after(m),n.textContent=""; +}else{if(b(l).find("> summary").length==0){var c=b("").text("Details").css({display:"block",cursor:"pointer"}).data("processed",!0).addClass("detailHidden").bind("click",function(){a.toggleDetailChildren(b(this)); +});b(l).prepend(c);}}}b(l).find("> :visible:not(summary:first-child)").hide();});},this.showDetailChildren=function(c){b(c).attr("open",!0),b.each(b(c).find("> *"),function(d,g){b(g).show(); +});},this.toggleDetailChildren=function(c){c.hasClass("detailHidden")?(c.removeClass("detailHidden"),a.showDetailChildren(c.parents("details")[0])):(c.addClass("detailHidden"),a.hideDetailChildren(c.parents("details")[0])); +};var f=function(h){var g=h.createElement("details"),k,j,i;return"open" in g?(j=h.body||function(){var c=h.documentElement;return k=!0,c.insertBefore(h.createElement("body"),c.firstElementChild||c.firstChild); +}(),g.innerHTML="ab",g.style.display="block",j.appendChild(g),i=g.offsetHeight,g.open=!0,i=i!=g.offsetHeight,j.removeChild(g),k&&j.parentNode.removeChild(j),i):!1; +}(document);if(f==!1){if(b("details").length!==0){var e=b(""].join(""),k.id=i,k.innerHTML+=f,g.appendChild(k),h=c(k,a),k.parentNode.removeChild(k);return!!h},v=function(b){if(a.matchMedia)return matchMedia(b).matches;var c;u("@media "+b+" { #"+i+" { position: absolute; } }",function(b){c=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).position=="absolute"});return c},w,x={}.hasOwnProperty,y;!B(x,c)&&!B(x.call,c)?y=function(a,b){return x.call(a,b)}:y=function(a,b){return b in a&&B(a.constructor.prototype[b],c)};var F=function(c,d){var f=c.join(""),g=d.length;u(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||j.touch.offsetTop===9,e.generatedcontent=j.generatedcontent.offsetHeight>=1},g,d)}([,["@media (",o.join("touch-enabled),("),i,")","{#touch{top:9px;position:absolute}}"].join(""),['#generatedcontent:after{content:"',m,'";visibility:hidden}'].join("")],[,"touch","generatedcontent"]);q.touch=function(){return e.touch},q.boxshadow=function(){return E("boxShadow")},q.generatedcontent=function(){return e.generatedcontent};for(var G in q)y(q,G)&&(w=G.toLowerCase(),e[w]=q[G](),t.push((e[w]?"":"no-")+w));z(""),j=l=null,a.attachEvent&&function(){var a=b.createElement("div");a.innerHTML="";return a.childNodes.length!==1}()&&function(a,b){function s(a){var b=-1;while(++b",t,""].join(""),h.id=ao,b.innerHTML+=p,b.appendChild(h),g||(b.style.background="",ap.appendChild(b)),o=s(h,t),g?h.parentNode.removeChild(h):b.parentNode.removeChild(b),!!o; +},X=function(a){var f=aw.matchMedia||aw.msMatchMedia;if(f){return f(a).matches;}var e;return Y("@media "+a+" { #"+ao+" { position: absolute; } }",function(c){e=(aw.getComputedStyle?getComputedStyle(c,null):c.currentStyle)["position"]=="absolute"; +}),e;},W={}.hasOwnProperty,V;!S(W,"undefined")&&!S(W.call,"undefined")?V=function(d,c){return W.call(d,c);}:V=function(d,c){return c in d&&S(d.constructor.prototype[c],"undefined"); +},Function.prototype.bind||(Function.prototype.bind=function(a){var h=this;if(typeof h!="function"){throw new TypeError;}var g=aa.call(arguments,1),f=function(){if(this instanceof f){var b=function(){}; +b.prototype=h.prototype;var d=new b,c=h.apply(d,g.concat(aa.call(arguments)));return Object(c)===c?c:d;}return h.apply(a,g.concat(aa.call(arguments))); +};return f;});var N=function(h,e){var b=h.join(""),a=e.length;Y(b,function(o,n){var m=av.styleSheets[av.styleSheets.length-1],l=m?m.cssRules&&m.cssRules[0]?m.cssRules[0].cssText:m.cssText||"":"",k=o.childNodes,g={}; +while(a--){g[k[a].id]=k[a];}ar.touch="ontouchstart" in aw||aw.DocumentTouch&&av instanceof DocumentTouch||(g.touch&&g.touch.offsetTop)===9,ar.generatedcontent=(g.generatedcontent&&g.generatedcontent.offsetHeight)>=1; +},a,e);}([,["@media (",ai.join("touch-enabled),("),ao,")","{#touch{top:9px;position:absolute}}"].join(""),['#generatedcontent:after{content:"',ak,'";visibility:hidden}'].join("")],[,"touch","generatedcontent"]); +ae.touch=function(){return ar.touch;},ae.boxshadow=function(){return O("boxShadow");},ae.generatedcontent=function(){return ar.generatedcontent;};for(var L in ae){V(ae,L)&&(Z=L.toLowerCase(),ar[Z]=ae[L](),ab.push((ar[Z]?"":"no-")+Z)); +}return ar.input||M(),U(""),an=al=null,function(v,u){function p(f,e){var h=f.createElement("p"),g=f.getElementsByTagName("head")[0]||f.documentElement; +return h.innerHTML="x",g.insertBefore(h.lastChild,g.firstChild);}function o(){var b=l.elements;return typeof b=="string"?b.split(" "):b; +}function n(g){var d={},j=g.createElement,i=g.createDocumentFragment,h=i();g.createElement=function(b){var c=(d[b]||(d[b]=j(b))).cloneNode();return l.shivMethods&&c.canHaveChildren&&!s.test(b)?h.appendChild(c):c; +},g.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+o().join().replace(/\w+/g,function(b){return d[b]=j(b),h.createElement(b),'c("'+b+'")'; +})+");return n}")(l,h);}function m(d){var c;return d.documentShived?d:(l.shivCSS&&!r&&(c=!!p(d,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),q||(c=!n(d)),c&&(d.documentShived=c),d); +}var t=v.html5||{},s=/^<|^(?:button|form|map|select|textarea)$/i,r,q;(function(){var b=u.createElement("a");b.innerHTML="",r="hidden" in b,q=b.childNodes.length==1||function(){try{u.createElement("a"); +}catch(d){return !0;}var e=u.createDocumentFragment();return typeof e.cloneNode=="undefined"||typeof e.createDocumentFragment=="undefined"||typeof e.createElement=="undefined"; +}();})();var l={elements:t.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:t.shivCSS!==!1,shivMethods:t.shivMethods!==!1,type:"default",shivDocument:m}; +v.html5=l,m(u);}(this,av),ar._version=at,ar._prefixes=ai,ar._domPrefixes=af,ar._cssomPrefixes=ag,ar.mq=X,ar.testProp=function(b){return Q([b]);},ar.testAllProps=O,ar.testStyles=Y,ap.className=ap.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(aq?" js "+ab.join(" "):""),ar; +}(this,this.document),function(ad,ac,ab){function aa(b){return P.call(b)=="[object Function]";}function Z(b){return typeof b=="string";}function Y(){}function X(b){return !b||b=="loaded"||b=="complete"||b=="uninitialized"; +}function W(){var b=O.shift();M=1,b?b.t?R(function(){(b.t=="c"?L.injectCss:L.injectJs)(b.s,0,b.a,b.x,b.e,1);},0):(b(),W()):M=0;}function V(w,v,t,s,q,p,n){function m(a){if(!g&&X(h.readyState)&&(x.r=g=1,!M&&W(),h.onload=h.onreadystatechange=null,a)){w!="img"&&R(function(){I.removeChild(h); +},50);for(var c in D[v]){D[v].hasOwnProperty(c)&&D[v][c].onload();}}}var n=n||L.errorTimeout,h={},g=0,b=0,x={t:t,s:v,e:q,a:p,x:n};D[v]===1&&(b=1,D[v]=[],h=ac.createElement(w)),w=="object"?h.data=v:(h.src=v,h.type=w),h.width=h.height="0",h.onerror=h.onload=h.onreadystatechange=function(){m.call(this,b); +},O.splice(s,0,x),w!="img"&&(b||D[v]===2?(I.insertBefore(h,J?null:Q),R(m,n)):D[v].push(h));}function U(g,e,j,i,h){return M=0,e=e||"j",Z(g)?V(e=="c"?G:H,g,e,this.i++,j,i,h):(O.splice(this.i++,0,g),O.length==1&&W()),this; +}function T(){var b=L;return b.loader={load:U,i:0},b;}var S=ac.documentElement,R=ad.setTimeout,Q=ac.getElementsByTagName("script")[0],P={}.toString,O=[],M=0,K="MozAppearance" in S.style,J=K&&!!ac.createRange().compareNode,I=J?S:Q.parentNode,S=ad.opera&&P.call(ad.opera)=="[object Opera]",S=!!ac.attachEvent&&!S,H=K?"object":S?"script":"img",G=S?"script":H,F=Array.isArray||function(b){return P.call(b)=="[object Array]"; +},E=[],D={},C={timeout:function(d,c){return c.length&&(d.timeout=c[0]),d;}},N,L;L=function(f){function d(j){var j=j.split("!"),i=E.length,q=j.pop(),p=j.length,q={url:q,origUrl:q,prefixes:j},o,m,l; +for(m=0;m").attr("id","frame-onFontResize"+Date.parse(new Date)).addClass("div-onfontresize").css({width:"100em",height:"10px",position:"absolute",borderWidth:0,top:"-5000px",left:"-5000px"}).appendTo("body"); +if(a.browser.msie){c.bind("resize",function(){a.onFontResize.trigger(c[0].offsetWidth/100);});}else{var b=c[0].contentWindow||c[0].contentDocument||c[0].document; +b=b.document||b;b.open();b.write('