Updated 2k11 to v1.1.8.

2012-08-01 14:25:01 +02:00 · 2012-08-01 14:25:01 +02:00 · c04aeca1d7
commit c04aeca1d7
parent 03e8d3ce7b
15 changed files with 195 additions and 142 deletions
--- a/templates/2k11/commentform.tpl
+++ b/templates/2k11/commentform.tpl
@ -11,10 +11,22 @@
        <label for="serendipity_commentform_email">{$CONST.EMAIL}{if $required_fields.email}*{/if}</label>
        <input id="serendipity_commentform_email" name="serendipity[email]" type="email" value="{$commentform_email}" placeholder="{$CONST.TWOK11_PLACE_MAIL}"{if $required_fields.email} required{/if}>
    </div>
+{if $spice.inputtwitter}
+    <div id="serendipity_commentspice_twitter" class="form_field">
+        <label for="serendipity_commentform_twitter">{$spice.inputtwitterlabel}</label>
+        <input id="serendipity_commentform_twitter" name="serendipity[twitter]" type="text" value="{$spice.inputtwittervalue}" placeholder="{$spice.inputtwitterplaceholder}">
+    </div>
+{/if}
    <div class="form_field">
        <label for="serendipity_commentform_url">{$CONST.HOMEPAGE}{if $required_fields.url}*{/if}</label>
        <input id="serendipity_commentform_url" name="serendipity[url]" type="url" value="{$commentform_url}" placeholder="{$CONST.TWOK11_PLACE_URL}"{if $required_fields.url} required{/if}>
    </div>
+{if $spice.inputarticle}
+    <div id="serendipity_commentspice_rss"  class="form_tarea spicehidden">
+        <label for="serendipity_commentform_rss">{$spice.inputarticlelabel}</label>
+        <select class="commentspice_rss_input" id="serendipity_commentform_rss" name="serendipity[promorss]"></select>
+    </div>
+{/if}
    <div class="form_tarea">
        <label for="serendipity_commentform_comment">{$CONST.COMMENT}{if $required_fields.comment}*{/if}</label>
        <textarea id="serendipity_commentform_comment" name="serendipity[comment]" rows="10" placeholder="{$CONST.TWOK11_PLACE_MESSAGE}"{if $required_fields.comment} required{/if}>{$commentform_data}</textarea>
--- a/templates/2k11/comments.tpl
+++ b/templates/2k11/comments.tpl
@ -1,6 +1,13 @@
 {foreach from=$comments item=comment name="comments"}
 <article id="c{$comment.id}" class="serendipity_comment{if $entry.author == $comment.author} serendipity_comment_author_self{/if} {cycle values="odd,even"} {if $comment.depth > 8}commentlevel-9{else}commentlevel-{$comment.depth}{/if}">
-    <h4>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|@default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if} {$CONST.ON} <time datetime="{$comment.timestamp|@serendipity_html5time}" pubdate>{$comment.timestamp|@formatTime:$template_option.date_format}</time>:</h4>
+    <header class="clearfix">
+        <h4{if $comment.spice_twitter_name} class="short-heading"{/if}>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|@default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if} {$CONST.ON} <time datetime="{$comment.timestamp|@serendipity_html5time}" pubdate>{$comment.timestamp|@formatTime:$template_option.date_format}</time>:</h4>
+    {if $comment.spice_twitter_name}
+        <div class="twitter_follow"><a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}><span class="visuallyhidden">@{$comment.spice_twitter_name}</span></a>
+        {if $comment.spice_twitter_followme}{$comment.spice_twitter_followme}{/if}
+        </div>
+    {/if}
+    </header>

    <div class="serendipity_commentBody clearfix content">
    {if $comment.avatar}{$comment.avatar}{/if}
--- a/templates/2k11/entries.tpl
+++ b/templates/2k11/entries.tpl
@ -16,7 +16,7 @@
        {/if}
        </div>
        {if $entry.is_extended}
-        <div id="extended" class="content">
+        <div id="extended" class="clearfix content">
        {$entry.extended}
        </div>
        {/if}
@ -25,10 +25,14 @@
        {if $entry.categories}
            <span class="visuallyhidden">{$CONST.CATEGORIES}: </span>{foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
        {/if}
-        {if $entry.categories and $entry.has_comments} | {/if}
-        {if $entry.has_comments}
+        {if $entry.categories and ($entry.has_comments or $entry.has_disqus)} | {/if}
+        {if ($entry.has_comments or $entry.has_disqus)}
+        {if $entry.has_disqus }
+            {$entry.comments}{if $entry.has_trackbacks}, <a href="{$entry.link}#trackbacks">{$entry.trackbacks} {$entry.label_trackbacks}</a>{/if}
+        {else}
            <a href="{$entry.link}#comments" title="{$entry.comments} {$entry.label_comments}{if $entry.has_trackbacks}, {$entry.trackbacks} {$entry.label_trackbacks}{/if}">{$entry.comments} {$entry.label_comments}</a>
        {/if}
+        {/if}
        {if $entry.url_tweetthis}
            | <a href="{$entry.url_tweetthis}" title="{$CONST.TWOK11_TWEET_THIS}">Twitter</a>
        {/if}
@ -71,7 +75,7 @@
        <p class="serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</p>
        {/if}

-        <section id="trackbacks" class="serendipity_comments">
+        <section id="trackbacks" class="serendipity_comments serendipity_section_trackbacks">
            <h3>{$CONST.TRACKBACKS}</h3>

            <div id="trackback_url"><a rel="nofollow" href="{$entry.link_trackback}" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a></div>
@ -79,7 +83,7 @@
            {serendipity_printTrackbacks entry=$entry.id}
        </section>

-        <section id="comments" class="serendipity_comments">
+        <section id="comments" class="serendipity_comments serendipity_section_comments">
            <h3>{$CONST.COMMENTS}</h3>

            <p class="manage_comments">{$CONST.DISPLAY_COMMENTS_AS}
--- a/templates/2k11/entries_archives.tpl
+++ b/templates/2k11/entries_archives.tpl
@ -1,8 +1,8 @@
 {serendipity_hookPlugin hook="entries_header"}
-<div class="archives">
+<article class="archives clearfix">
    <h2>{$CONST.ARCHIVES}</h2>
 {foreach from=$archives item="archive"}
-    <section class="archives_year {cycle values="arch_odd,arch_even"}">
+    <section class="archives_year clearfix {cycle values="arch_odd,arch_even"}">
        <h3>{$archive.year}</h3>

        <ul class="plainList">
@ -15,5 +15,5 @@
        </ul>
    </section>
 {/foreach}
-</div>
+</article>
 {serendipity_hookPlugin hook="entries_footer"}
--- a/templates/2k11/entries_summary.tpl
+++ b/templates/2k11/entries_summary.tpl
@ -1,5 +1,5 @@
 {serendipity_hookPlugin hook="entries_header"}
-<div class="archives">
+<article class="archives">
    <h2>{$CONST.TOPICS_OF} {$dateRange.0|@formatTime:"%B %Y"}</h2>

    <ul class="archives_summary plainList">
@ -11,5 +11,5 @@
        {/foreach}
    {/foreach}
    </ul>
-</div>
+</article>
 {serendipity_hookPlugin hook="entries_footer"}
--- a/templates/2k11/index.tpl
+++ b/templates/2k11/index.tpl
@ -24,7 +24,7 @@
 {if $template_option.userstyles == true}
    <link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
 {/if}
-    <script src="{serendipity_getFile file="js/modernizr-2.5.3.min.js"}"></script>
+    <script src="{serendipity_getFile file="js/modernizr-2.6.1.min.js"}"></script>
    <link rel="alternate" type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2">
    <link rel="alternate" type="application/x.atom+xml"  title="{$blogTitle} Atom feed"  href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml">
 {if $entry_id}
--- a/templates/2k11/info.txt
+++ b/templates/2k11/info.txt
@ -1,4 +1,4 @@
 Name: 2k11
 Author: Matthias Mees, Veit Lehmann
-Date: 2012-04-19
+Date: 2012-08-01
 Require Serendipity: 1.6
--- a/templates/2k11/js/2k11.min.js
+++ b/templates/2k11/js/2k11.min.js
@ -16,13 +16,14 @@ e.media=p;O.insertBefore(e,n.nextSibling);if(e.styleSheet){e.styleSheet.cssText=
 if(!c){return;}c.open("GET",a,true);c.onreadystatechange=function(){if(c.readyState!=4||c.status!=200&&c.status!=304){return;}b(c.responseText);};if(c.readyState==4){return;
 }c.send(null);},R=(function(){var a=false;try{a=new XMLHttpRequest();}catch(b){a=new ActiveXObject("Microsoft.XMLHTTP");}return function(){return a;};})();
 T();respond.update=T;function A(){K(true);}if(P.addEventListener){P.addEventListener("resize",A,false);}else{if(P.attachEvent){P.attachEvent("onresize",A);
-}}})(this);(function(p){if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1)){return;}var q=p.document;if(!q.querySelector){return;
-}var o=q.querySelector("meta[name=viewport]"),B=o&&o.getAttribute("content"),r=B+",maximum-scale=1",y=B+",maximum-scale=10",v=true,s,t,u,z;if(!o){return;
-}function w(){o.setAttribute("content",y);v=true;}function A(){o.setAttribute("content",r);v=false;}function x(a){z=a.accelerationIncludingGravity;s=Math.abs(z.x);
-t=Math.abs(z.y);u=Math.abs(z.z);if(!p.orientation&&(s>7||((u>6&&t<8||u<8&&t>6)&&s>5))){if(v){A();}}else{if(!v){w();}}}p.addEventListener("orientationchange",w,false);
-p.addEventListener("devicemotion",x,false);})(this);(function(b){b.fn.fitVids=function(a){var h={customSelector:null};var f=document.createElement("div"),g=document.getElementsByTagName("base")[0]||document.getElementsByTagName("script")[0];
-f.className="fit-vids-style";f.innerHTML="&shy;<style>.fluid-width-video-wrapper{width: 100%;position: relative;padding: 0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed{position: absolute;top: 0;left: 0;width: 100%;height: 100%;}</style>";
-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"];
+}}})(this);(function(q){var A=navigator.userAgent;if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(A)&&A.indexOf("AppleWebKit")>-1)){return;
+}var r=q.document;if(!r.querySelector){return;}var p=r.querySelector("meta[name=viewport]"),D=p&&p.getAttribute("content"),s=D+",maximum-scale=1",z=D+",maximum-scale=10",w=true,t,u,v,B;
+if(!p){return;}function x(){p.setAttribute("content",z);w=true;}function C(){p.setAttribute("content",s);w=false;}function y(a){B=a.accelerationIncludingGravity;
+t=Math.abs(B.x);u=Math.abs(B.y);v=Math.abs(B.z);if((!q.orientation||q.orientation===180)&&(t>7||((v>6&&u<8||v<8&&u>6)&&t>5))){if(w){C();}}else{if(!w){x();
+}}}q.addEventListener("orientationchange",x,false);q.addEventListener("devicemotion",y,false);})(this);(function(b){b.fn.fitVids=function(a){var h={customSelector:null};
+var f=document.createElement("div"),g=document.getElementsByTagName("base")[0]||document.getElementsByTagName("script")[0];f.className="fit-vids-style";
+f.innerHTML="&shy;<style>.fluid-width-video-wrapper {width: 100%;position: relative;padding: 0;}.fluid-width-video-wrapper iframe,.fluid-width-video-wrapper object,.fluid-width-video-wrapper embed {position: absolute;top: 0;left: 0;width: 100%;height: 100%;}</style>";
+g.parentNode.insertBefore(f,g);if(a){b.extend(h,a);}return this.each(function(){var d=["iframe[src*='player.vimeo.com']","iframe[src*='www.youtube.com']","iframe[src*='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('<div class="fluid-width-video-wrapper"></div>').parent(".fluid-width-video-wrapper").css("padding-top",(m*100)+"%");e.removeAttr("height").removeAttr("width");
@ -40,19 +41,19 @@ b("head").append(e);}b.each(b("details"),function(d,g){a.hideDetailChildren(g);}
 if(c){if(c.header){d[c.header]={role:"banner"};}if(c.footer){d[c.footer]={role:"contentinfo"};}if(c.main){d[c.main]={role:"main"};}}jQuery.each(d,function(b,a){jQuery(b).attr(a);
 });};
 /*! http://mths.be/placeholder v2.0.6 by @mathias */
-(function(r,p,u){var x="placeholder" in p.createElement("input"),t="placeholder" in p.createElement("textarea"),o=u.fn,v=u.valHooks,m,n;
-if(x&&t){n=o.placeholder=function(){return this;};n.input=n.textarea=true;}else{n=o.placeholder=function(){var a=this;a.filter((x?"textarea":":input")+"[placeholder]").not(".placeholder").bind({"focus.placeholder":w,"blur.placeholder":s}).data("placeholder-enabled",true).trigger("blur.placeholder");
-return a;};n.input=x;n.textarea=t;m={get:function(b){var a=u(b);return a.data("placeholder-enabled")&&a.hasClass("placeholder")?"":b.value;},set:function(c,b){var a=u(c);
-if(!a.data("placeholder-enabled")){return c.value=b;}if(b==""){c.value=b;if(c!=p.activeElement){s.call(c);}}else{if(a.hasClass("placeholder")){w.call(c,true,b)||(c.value=b);
-}else{c.value=b;}}return a;}};x||(v.input=m);t||(v.textarea=m);u(function(){u(p).delegate("form","submit.placeholder",function(){var a=u(".placeholder",this).each(w);
-setTimeout(function(){a.each(s);},10);});});u(r).bind("beforeunload.placeholder",function(){u(".placeholder").each(function(){this.value="";});});}function q(c){var a={},b=/^jQuery\d+$/;
-u.each(c.attributes,function(d,e){if(e.specified&&!b.test(e.name)){a[e.name]=e.value;}});return a;}function w(d,c){var e=this,b=u(e),a;if(e.value==b.attr("placeholder")&&b.hasClass("placeholder")){a=e==p.activeElement;
-if(b.data("placeholder-password")){b=b.hide().next().show().attr("id",b.removeAttr("id").data("placeholder-id"));if(d===true){return b[0].value=c;}b.focus();
-}else{e.value="";b.removeClass("placeholder");}a&&e.select();}}function s(){var b,a=this,c=u(a),f=c,d=this.id;if(a.value==""){if(a.type=="password"){if(!c.data("placeholder-textinput")){try{b=c.clone().attr({type:"text"});
-}catch(e){b=u("<input>").attr(u.extend(q(this),{type:"text"}));}b.removeAttr("name").data({"placeholder-password":true,"placeholder-id":d}).bind("focus.placeholder",w);
-c.data({"placeholder-textinput":b,"placeholder-id":d}).before(b);}c=c.removeAttr("id").hide().prev().attr("id",d).show();}c.addClass("placeholder");c[0].value=c.attr("placeholder");
-}else{c.removeClass("placeholder");}}}(this,document,jQuery));jQuery(document).ready(function(b){AccessifyHTML5({header:"#banner",main:"#main",footer:"#colophon"});
-b("input[type=search]").parents("form").attr("role","search");var a=b("<select/>");b("#primary-nav li").each(function(){var c=b(this);if(c.find("span").length){b("<option/>",{selected:"selected",value:"",text:c.text()}).appendTo(a);
+(function(r,p,n){var w="placeholder" in p.createElement("input"),t="placeholder" in p.createElement("textarea"),o=n.fn,u=n.valHooks,l,m;
+if(w&&t){m=o.placeholder=function(){return this;};m.input=m.textarea=true;}else{m=o.placeholder=function(){var a=this;a.filter((w?"textarea":":input")+"[placeholder]").not(".placeholder").bind({"focus.placeholder":v,"blur.placeholder":s}).data("placeholder-enabled",true).trigger("blur.placeholder");
+return a;};m.input=w;m.textarea=t;l={get:function(a){var b=n(a);return b.data("placeholder-enabled")&&b.hasClass("placeholder")?"":a.value;},set:function(a,c){var b=n(a);
+if(!b.data("placeholder-enabled")){return a.value=c;}if(c==""){a.value=c;if(a!=p.activeElement){s.call(a);}}else{if(b.hasClass("placeholder")){v.call(a,true,c)||(a.value=c);
+}else{a.value=c;}}return b;}};w||(u.input=l);t||(u.textarea=l);n(function(){n(p).delegate("form","submit.placeholder",function(){var a=n(".placeholder",this).each(v);
+setTimeout(function(){a.each(s);},10);});});n(r).bind("beforeunload.placeholder",function(){n(".placeholder").each(function(){this.value="";});});}function q(a){var b={},c=/^jQuery\d+$/;
+n.each(a.attributes,function(d,e){if(e.specified&&!c.test(e.name)){b[e.name]=e.value;}});return b;}function v(a,d){var b=this,c=n(b);if(b.value==c.attr("placeholder")&&c.hasClass("placeholder")){if(c.data("placeholder-password")){c=c.hide().next().show().attr("id",c.removeAttr("id").data("placeholder-id"));
+if(a===true){return c[0].value=d;}c.focus();}else{b.value="";c.removeClass("placeholder");b==p.activeElement&&b.select();}}}function s(){var c,b=this,d=n(b),a=d,e=this.id;
+if(b.value==""){if(b.type=="password"){if(!d.data("placeholder-textinput")){try{c=d.clone().attr({type:"text"});}catch(f){c=n("<input>").attr(n.extend(q(this),{type:"text"}));
+}c.removeAttr("name").data({"placeholder-password":true,"placeholder-id":e}).bind("focus.placeholder",v);d.data({"placeholder-textinput":c,"placeholder-id":e}).before(c);
+}d=d.removeAttr("id").hide().prev().attr("id",e).show();}d.addClass("placeholder");d[0].value=d.attr("placeholder");}else{d.removeClass("placeholder");
+}}}(this,document,jQuery));jQuery(document).ready(function(b){AccessifyHTML5({header:"#banner",main:"#main",footer:"#colophon"});b("input[type=search]").parents("form").attr("role","search");
+var a=b("<select/>");b("#primary-nav li").each(function(){var c=b(this);if(c.find("span").length){b("<option/>",{selected:"selected",value:"",text:c.text()}).appendTo(a);
 }else{b("<option/>",{value:c.find("a").attr("href"),text:c.text()}).appendTo(a);}});if(a.children().size()>0){a.appendTo("#primary-nav").change(function(){window.location=b(this).find("option:selected").val();
 });}if(typeof(lsbase)=="string"){b('<div id="LSResult" style="display: none;"><div id="LSShadow"></div></div>').appendTo("#searchform>div");}b("input, textarea").placeholder();
 b("#content>article").fitVids();b("#trackback_url>a,.short-url").click(function(){var c=b(this).attr("title");alert(c);return false;});b(".comment_reply").click(function(){var c=b(this).attr("id").replace(/serendipity_reply_/g,"");
--- a/templates/2k11/js/modernizr-2.5.3.min.js
+++ b/templates/2k11/js/modernizr-2.5.3.min.js
@ -1,41 +0,0 @@
-window.Modernizr=function(aw,av,au){function U(b){am.cssText=b;}function T(d,c){return U(ai.join(d+";")+(c||""));}function S(d,c){return typeof d===c;}function R(d,c){return !!~(""+d).indexOf(c);
-}function Q(e,c){for(var f in e){if(am[e[f]]!==au){return c=="pfx"?e[f]:!0;}}return !1;}function P(g,c,j){for(var i in g){var h=c[g[i]];if(h!==au){return j===!1?g[i]:S(h,"function")?h.bind(j||c):h;
-}}return !1;}function O(g,f,j){var i=g.charAt(0).toUpperCase()+g.substr(1),h=(g+" "+ag.join(i+" ")+i).split(" ");return S(f,"string")||S(f,"undefined")?Q(h,f):(h=(g+" "+af.join(i+" ")+i).split(" "),P(h,f,j));
-}function M(){ar.input=function(f){for(var b=0,a=f.length;b<a;b++){ac[f[b]]=f[b] in al;}return ac.list&&(ac.list=!!av.createElement("datalist")&&!!aw.HTMLDataListElement),ac;
-}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" "));}var at="2.5.3",ar={},aq=!0,ap=av.documentElement,ao="modernizr",an=av.createElement(ao),am=an.style,al=av.createElement("input"),ak=":)",aj={}.toString,ai=" -webkit- -moz- -o- -ms- ".split(" "),ah="Webkit Moz O ms",ag=ah.split(" "),af=ah.toLowerCase().split(" "),ae={},ad={},ac={},ab=[],aa=ab.slice,Z,Y=function(t,s,r,q){var p,o,n,h=av.createElement("div"),g=av.body,b=g?g:av.createElement("body");
-if(parseInt(r,10)){while(r--){n=av.createElement("div"),n.id=q?q[r]:ao+(r+1),h.appendChild(n);}}return p=["&#173;","<style>",t,"</style>"].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<style>"+e+"</style>",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="<xyz></xyz>",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<p;m++){l=j[m].split("="),(o=C[l.shift()])&&(q=o(q,l));}for(m=0;m<i;m++){q=E[m](q);}return q;}function n(m,s,r,q,p){var o=d(m),b=o.autoCallback;
-o.url.split(".").pop().split("?").shift(),o.bypass||(s&&(s=aa(s)?s:s[m]||s[q]||s[m.split("/").pop().split("?")[0]]||W),o.instead?o.instead(m,s,r,q,p):(D[o.url]?o.noexec=!0:D[o.url]=1,r.load(o.url,o.forceCSS||!o.forceJS&&"css"==o.url.split(".").pop().split("?").shift()?"c":ab,o.noexec,o.attrs,o.timeout),(aa(s)||aa(b))&&r.load(function(){T(),s&&s(o.origUrl,p,q),b&&b(o.origUrl,p,q),D[o.url]=2;
-})));}function k(w,v){function u(b,i){if(b){if(Z(b)){i||(r=function(){var j=[].slice.call(arguments);q.apply(this,j),p();}),n(b,r,v,0,t);}else{if(Object(b)===b){for(g in o=function(){var a=0,j;
-for(j in b){b.hasOwnProperty(j)&&a++;}return a;}(),b){b.hasOwnProperty(g)&&(!i&&!--o&&(aa(r)?r=function(){var j=[].slice.call(arguments);q.apply(this,j),p();
-}:r[g]=function(j){return function(){var a=[].slice.call(arguments);j&&j.apply(this,a),p();};}(q[g])),n(b[g],r,v,g,t));}}}}else{!i&&p();}}var t=!!w.test,s=w.load||w.both,r=w.callback||Y,q=r,p=w.complete||Y,o,g;
-u(t?w.yep:w.nope,!!s),s&&u(s);}var h,e,c=this.yepnope.loader;if(Z(f)){n(f,0,c,0);}else{if(F(f)){for(h=0;h<f.length;h++){e=f[h],Z(e)?n(e,0,c,0):F(e)?L(e):Object(e)===e&&k(e,c);
-}}else{Object(f)===f&&k(f,c);}}},L.addPrefix=function(d,c){C[d]=c;},L.addFilter=function(b){E.push(b);},L.errorTimeout=10000,ac.readyState==null&&ac.addEventListener&&(ac.readyState="loading",ac.addEventListener("DOMContentLoaded",N=function(){ac.removeEventListener("DOMContentLoaded",N,0),ac.readyState="complete";
-},0)),ad.yepnope=T(),ad.yepnope.executeStack=W,ad.yepnope.injectJs=function(r,q,p,n,m,h){var g=ac.createElement("script"),f,b,n=n||L.errorTimeout;g.src=r;
-for(b in p){g.setAttribute(b,p[b]);}q=h?W:q||Y,g.onreadystatechange=g.onload=function(){!f&&X(g.readyState)&&(f=1,q(),g.onload=g.onreadystatechange=null);
-},R(function(){f||(f=1,q(1));},n),m?g.onload():Q.parentNode.insertBefore(g,Q);},ad.yepnope.injectCss=function(b,n,m,l,k,h){var l=ac.createElement("link"),f,n=h?W:n||Y;
-l.href=b,l.rel="stylesheet",l.type="text/css";for(f in m){l.setAttribute(f,m[f]);}k||(Q.parentNode.insertBefore(l,Q),R(n,0));};}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0));
-};
--- a/templates/2k11/js/modernizr-2.6.1.min.js
+++ b/templates/2k11/js/modernizr-2.6.1.min.js
@ -0,0 +1,35 @@
+window.Modernizr=function(au,at,ar){function S(b){ak.cssText=b;}function R(d,c){return S(ag.join(d+";")+(c||""));}function Q(d,c){return typeof d===c;}function P(d,c){return !!~(""+d).indexOf(c);
+}function O(f,c){for(var h in f){var g=f[h];if(!P(g,"-")&&ak[g]!==ar){return c=="pfx"?g:!0;}}return !1;}function N(g,c,j){for(var i in g){var h=c[g[i]];
+if(h!==ar){return j===!1?g[i]:Q(h,"function")?h.bind(j||c):h;}}return !1;}function M(g,f,j){var i=g.charAt(0).toUpperCase()+g.slice(1),h=(g+" "+ae.join(i+" ")+i).split(" ");
+return Q(f,"string")||Q(f,"undefined")?O(h,f):(h=(g+" "+ad.join(i+" ")+i).split(" "),N(h,f,j));}function L(){ap.input=function(f){for(var b=0,a=f.length;
+b<a;b++){aa[f[b]]=f[b] in aj;}return aa.list&&(aa.list=!!at.createElement("datalist")&&!!au.HTMLDataListElement),aa;}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" "));
+}var aq="2.6.1",ap={},ao=!0,an=at.documentElement,am="modernizr",al=at.createElement(am),ak=al.style,aj=at.createElement("input"),ai=":)",ah={}.toString,ag=" -webkit- -moz- -o- -ms- ".split(" "),af="Webkit Moz O ms",ae=af.split(" "),ad=af.toLowerCase().split(" "),ac={},ab={},aa={},Z=[],Y=Z.slice,X,W=function(t,s,r,q){var p,o,n,h=at.createElement("div"),g=at.body,b=g?g:at.createElement("body");
+if(parseInt(r,10)){while(r--){n=at.createElement("div"),n.id=q?q[r]:am+(r+1),h.appendChild(n);}}return p=["&#173;",'<style id="s',am,'">',t,"</style>"].join(""),h.id=am,(g?h:b).innerHTML+=p,b.appendChild(h),g||(b.style.background="",an.appendChild(b)),o=s(h,t),g?h.parentNode.removeChild(h):b.parentNode.removeChild(b),!!o;
+},V=function(a){var f=au.matchMedia||au.msMatchMedia;if(f){return f(a).matches;}var e;return W("@media "+a+" { #"+am+" { position: absolute; } }",function(c){e=(au.getComputedStyle?getComputedStyle(c,null):c.currentStyle)["position"]=="absolute";
+}),e;},U={}.hasOwnProperty,T;!Q(U,"undefined")&&!Q(U.call,"undefined")?T=function(d,c){return U.call(d,c);}:T=function(d,c){return c in d&&Q(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=Y.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(Y.call(arguments)));return Object(c)===c?c:d;}return h.apply(a,g.concat(Y.call(arguments)));};
+return f;}),ac.touch=function(){var a;return"ontouchstart" in au||au.DocumentTouch&&at instanceof DocumentTouch?a=!0:W(["@media (",ag.join("touch-enabled),("),am,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(b){a=b.offsetTop===9;
+}),a;},ac.boxshadow=function(){return M("boxShadow");},ac.generatedcontent=function(){var b;return W(['#modernizr:after{content:"',ai,'";visibility:hidden}'].join(""),function(a){b=a.offsetHeight>=1;
+}),b;};for(var K in ac){T(ac,K)&&(X=K.toLowerCase(),ap[X]=ac[K](),Z.push((ap[X]?"":"no-")+X));}return ap.input||L(),ap.addTest=function(e,c){if(typeof e=="object"){for(var f in e){T(e,f)&&ap.addTest(f,e[f]);
+}}else{e=e.toLowerCase();if(ap[e]!==ar){return ap;}c=typeof c=="function"?c():c,ao&&(an.className+=" "+(c?"":"no-")+e),ap[e]=c;}return ap;},S(""),al=aj=null,ap._version=aq,ap._prefixes=ag,ap._domPrefixes=ad,ap._cssomPrefixes=ae,ap.mq=V,ap.testProp=function(b){return O([b]);
+},ap.testAllProps=M,ap.testStyles=W,an.className=an.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(ao?" js "+Z.join(" "):""),ap;}(this,this.document),function(Z,Y){function P(f,e){var h=f.createElement("p"),g=f.getElementsByTagName("head")[0]||f.documentElement;
+return h.innerHTML="x<style>"+e+"</style>",g.insertBefore(h.lastChild,g.firstChild);}function O(){var b=I.elements;return typeof b=="string"?b.split(" "):b;
+}function N(d){var c=R[d[T]];return c||(c={},S++,d[T]=S,R[S]=c),c;}function M(b,h,e){h||(h=Y);if(Q){return h.createElement(b);}e||(e=N(h));var d;return e.cache[b]?d=e.cache[b].cloneNode():V.test(b)?d=(e.cache[b]=e.createElem(b)).cloneNode():d=e.createElem(b),d.canHaveChildren&&!W.test(b)?e.frag.appendChild(d):d;
+}function L(b,l){b||(b=Y);if(Q){return b.createDocumentFragment();}l=l||N(b);var k=l.frag.cloneNode(),j=0,i=O(),h=i.length;for(;j<h;j++){k.createElement(i[j]);
+}return k;}function K(d,c){c.cache||(c.cache={},c.createElem=d.createElement,c.createFrag=d.createDocumentFragment,c.frag=c.createFrag()),d.createElement=function(a){return I.shivMethods?M(a,d,c):c.createElem(a);
+},d.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+O().join().replace(/\w+/g,function(b){return c.createElem(b),c.frag.createElement(b),'c("'+b+'")';
+})+");return n}")(I,c.frag);}function J(b){b||(b=Y);var d=N(b);return I.shivCSS&&!U&&!d.hasCSS&&(d.hasCSS=!!P(b,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),Q||K(b,d),b;
+}function E(h){var g,l=h.getElementsByTagName("*"),k=l.length,j=RegExp("^(?:"+O().join("|")+")$","i"),i=[];while(k--){g=l[k],j.test(g.nodeName)&&i.push(g.applyElement(D(g)));
+}return i;}function D(g){var f,j=g.attributes,i=j.length,h=g.ownerDocument.createElement(G+":"+g.nodeName);while(i--){f=j[i],f.specified&&h.setAttribute(f.nodeName,f.nodeValue);
+}return h.style.cssText=g.style.cssText,h;}function C(h){var g,l=h.split("{"),k=l.length,j=RegExp("(^|[\\s,>+~])("+O().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),i="$1"+G+"\\:$2";
+while(k--){g=l[k]=l[k].split("}"),g[g.length-1]=g[g.length-1].replace(j,i),l[k]=g.join("}");}return l.join("{");}function B(d){var c=d.length;while(c--){d[c].removeNode();
+}}function A(i){function j(){clearTimeout(m._removeSheetTimer),h&&h.removeNode(!0),h=null;}var h,n,m=N(i),l=i.namespaces,k=i.parentWindow;return !F||i.printShived?i:(typeof l[G]=="undefined"&&l.add(G),k.attachEvent("onbeforeprint",function(){j();
+var r,q,p,o=i.styleSheets,g=[],c=o.length,b=Array(c);while(c--){b[c]=o[c];}while(p=b.pop()){if(!p.disabled&&H.test(p.media)){try{r=p.imports,q=r.length;
+}catch(a){q=0;}for(c=0;c<q;c++){b.push(r[c]);}try{g.push(p.cssText);}catch(a){}}}g=C(g.reverse().join("")),n=E(i),h=P(i,g);}),k.attachEvent("onafterprint",function(){B(n),clearTimeout(m._removeSheetTimer),m._removeSheetTimer=setTimeout(j,500);
+}),i.printShived=!0,i);}var X=Z.html5||{},W=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,V=/^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i,U,T="_html5shiv",S=0,R={},Q;
+(function(){try{var b=Y.createElement("a");b.innerHTML="<xyz></xyz>",U="hidden" in b,Q=b.childNodes.length==1||function(){Y.createElement("a");var c=Y.createDocumentFragment();
+return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined";}();}catch(d){U=!0,Q=!0;}})();
+var I={elements:X.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:X.shivCSS!==!1,supportsUnknownElements:Q,shivMethods:X.shivMethods!==!1,type:"default",shivDocument:J,createElement:M,createDocumentFragment:L};
+Z.html5=I,J(Y);var H=/^$|\b(?:all|print)\b/,G="html5shiv",F=!Q&&function(){var a=Y.documentElement;return typeof Y.namespaces!="undefined"&&typeof Y.parentWindow!="undefined"&&typeof a.applyElement!="undefined"&&typeof a.removeNode!="undefined"&&typeof Z.attachEvent!="undefined";
+}();I.type+=" print",I.shivPrint=A,A(Y);}(this,document);
--- a/templates/2k11/plugin_contactform.tpl
+++ b/templates/2k11/plugin_contactform.tpl
@ -1,50 +1,49 @@
-    <div class="serendipity_staticpage{if $plugin_contactform_articleformat} serendipity_entry{/if}">
-        <h2>{if $plugin_contactform_articleformat}{$plugin_contactform_name}{else}{$plugin_contactform_pagetitle}{/if}</h2>
+<article class="clearfix serendipity_staticpage{if $plugin_contactform_articleformat} serendipity_entry{/if}">
+    <h2>{if $plugin_contactform_articleformat}{$plugin_contactform_name}{else}{$plugin_contactform_pagetitle}{/if}</h2>

-        <div class="serendpity_preface content">
-        {$plugin_contactform_preface}
-        </div>
-
-    {if $is_contactform_sent}
-        <p class="serendipity_msg_notice">{$plugin_contactform_sent}</p>
-    {else}
-        {if $is_contactform_error}
-        <p class="serendipity_msg_important">{$plugin_contactform_error}</p>
-        {foreach from=$comments_messagestack item="message"}
-        <p class="serendipity_msg_important">{$message}</p>
-        {/foreach}
-        {/if}
-
-        <div class="serendipityCommentForm">
-            <a id="serendipity_CommentForm"></a>
-
-            <form id="serendipity_comment" action="{$commentform_action}#feedback" method="post">
-            <div>
-	            <input type="hidden" name="serendipity[subpage]" value="{$commentform_sname}">
-	            <input type="hidden" name="serendipity[commentform]" value="true">
-            </div>
-            <div class="form_field">
-                <label for="serendipity_commentform_name">{$CONST.NAME}{if $required_fields.name}*{/if}</label>
-                <input id="serendipity_commentform_name" name="serendipity[name]" type="text" value="{$commentform_name}" placeholder="{$CONST.TWOK11_PLACE_NAME}"{if $required_fields.name} required{/if}>
-            </div>
-
-            <div class="form_field">
-                <label for="serendipity_commentform_email">{$CONST.EMAIL}{if $required_fields.email}*{/if}</label>
-                <input id="serendipity_commentform_email" name="serendipity[email]" type="email" value="{$commentform_email}" placeholder="{$CONST.TWOK11_PLACE_MAIL}"{if $required_fields.email} required{/if}>
-            </div>
-
-            <div class="form_field">
-                <label for="serendipity_commentform_url">{$CONST.HOMEPAGE}{if $required_fields.url}*{/if}</label>
-                <input id="serendipity_commentform_url" name="serendipity[url]" type="url" value="{$commentform_url}" placeholder="{$CONST.TWOK11_PLACE_URL}"{if $required_fields.url} required{/if}>
-            </div>
-
-            <div class="form_tarea">
-                <label for="serendipity_commentform_comment">{$plugin_contactform_message}{if $required_fields.comment}*{/if}</label>
-                <textarea id="serendipity_commentform_comment" name="serendipity[comment]" rows="10" placeholder="{$CONST.TWOK11_PLACE_MESSAGE}"{if $required_fields.comment} required{/if}>{$commentform_data}</textarea>
-            </div>
-            {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry}
-            <input id="serendipity_submit" name="serendipity[submit]" type="submit" value="{$CONST.TWOK11_SEND_MAIL}">
-            </form>
-        </div>
-    {/if}
+    <div class="clearfix content serendpity_preface">
+    {$plugin_contactform_preface}
    </div>
+{if $is_contactform_sent}
+    <p class="serendipity_msg_notice">{$plugin_contactform_sent}</p>
+{else}
+    {if $is_contactform_error}
+    <p class="serendipity_msg_important">{$plugin_contactform_error}</p>
+    {foreach from=$comments_messagestack item="message"}
+    <p class="serendipity_msg_important">{$message}</p>
+    {/foreach}
+    {/if}
+
+    <div class="serendipityCommentForm">
+        <a id="serendipity_CommentForm"></a>
+
+        <form id="serendipity_comment" action="{$commentform_action}#feedback" method="post">
+        <div>
+            <input type="hidden" name="serendipity[subpage]" value="{$commentform_sname}">
+            <input type="hidden" name="serendipity[commentform]" value="true">
+        </div>
+        <div class="form_field">
+            <label for="serendipity_commentform_name">{$CONST.NAME}{if $required_fields.name}*{/if}</label>
+            <input id="serendipity_commentform_name" name="serendipity[name]" type="text" value="{$commentform_name}" placeholder="{$CONST.TWOK11_PLACE_NAME}"{if $required_fields.name} required{/if}>
+        </div>
+
+        <div class="form_field">
+            <label for="serendipity_commentform_email">{$CONST.EMAIL}{if $required_fields.email}*{/if}</label>
+            <input id="serendipity_commentform_email" name="serendipity[email]" type="email" value="{$commentform_email}" placeholder="{$CONST.TWOK11_PLACE_MAIL}"{if $required_fields.email} required{/if}>
+        </div>
+
+        <div class="form_field">
+            <label for="serendipity_commentform_url">{$CONST.HOMEPAGE}{if $required_fields.url}*{/if}</label>
+            <input id="serendipity_commentform_url" name="serendipity[url]" type="url" value="{$commentform_url}" placeholder="{$CONST.TWOK11_PLACE_URL}"{if $required_fields.url} required{/if}>
+        </div>
+
+        <div class="form_tarea">
+            <label for="serendipity_commentform_comment">{$plugin_contactform_message}{if $required_fields.comment}*{/if}</label>
+            <textarea id="serendipity_commentform_comment" name="serendipity[comment]" rows="10" placeholder="{$CONST.TWOK11_PLACE_MESSAGE}"{if $required_fields.comment} required{/if}>{$commentform_data}</textarea>
+        </div>
+        {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry}
+        <input id="serendipity_submit" name="serendipity[submit]" type="submit" value="{$CONST.TWOK11_SEND_MAIL}">
+        </form>
+    </div>
+{/if}
+</article>
--- a/templates/2k11/plugin_staticpage.tpl
+++ b/templates/2k11/plugin_staticpage.tpl
@ -1,4 +1,4 @@
-<div id="staticpage_{$staticpage_pagetitle|@makeFilename}" class="{if $staticpage_articleformat}serendipity_entry {/if}serendipity_staticpage">
+<article id="staticpage_{$staticpage_pagetitle|@makeFilename}" class="clearfix serendipity_staticpage {if $staticpage_articleformat} serendipity_entry{/if}">
    <header>
        <h2>{if $staticpage_articleformat}{if $staticpage_articleformattitle}{$staticpage_articleformattitle|@escape}{else}{$staticpage_pagetitle}{/if}{else}{if $staticpage_headline}{$staticpage_headline|@escape}{else}{$staticpage_pagetitle}{/if}{/if}</h2>
    {if is_array($staticpage_childpages)}
@ -44,4 +44,4 @@
        </small>
    </footer>
 {/if}
-</div>
+</article>
--- a/templates/2k11/sidebar.tpl
+++ b/templates/2k11/sidebar.tpl
@ -3,11 +3,11 @@
 {/if}
 {foreach from=$plugindata item=item}
 {if $item.class != "serendipity_quicksearch_plugin"}
-    <section class="sidebar_plugin {cycle values="odd,even"} {$item.class}">
+    <section class="sidebar_plugin clearfix {cycle values="odd,even"} {$item.class}">
        {if $item.title != ""}
        <h3>{$item.title}</h3>
        {/if}
-        <div class="sidebar_content">{$item.content}</div>
+        <div class="sidebar_content clearfix">{$item.content}</div>
    </section>
 {/if}
 {/foreach}
--- a/templates/2k11/style.css
+++ b/templates/2k11/style.css
@ -369,13 +369,13 @@ fieldset,
 #primary-nav,
 .serendipity_calendar thead,
 .serendipity_calendar tfoot {
-    background: #294564 url({TEMPLATE_PATH}img/gradient-dblue.png) left top repeat-x; /* Fallback */
-    background: -moz-linear-gradient(top, #3e5f81 0%, #294564 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3e5f81), color-stop(100%,#294564)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #3e5f81 0%, #294564 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #3e5f81 0%, #294564 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, #3e5f81 0%, #294564 100%); /* IE10+ */
-    background: linear-gradient(top, #3e5f81 0%, #294564 100%); /* W3C */
+    background: #294564;
+    background-image: url({TEMPLATE_PATH}img/gradient-dblue.png) left top repeat-x; /* Fallback */
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #3e5f81), color-stop(100%, #294564));
+    background-image: -webkit-linear-gradient(#3e5f81, #294564);
+    background-image: -moz-linear-gradient(#3e5f81, #294564);
+    background-image: -o-linear-gradient(#3e5f81, #294564);
+    background-image: linear-gradient(#3e5f81, #294564);
 }

 #primary-nav span,
@ -410,13 +410,13 @@ fieldset,

 #primary-nav a:hover,
 #primary-nav a:focus {
-    background: #aabcc5 url({TEMPLATE_PATH}img/gradient-lblue.png) left top repeat-x; /* Fallback */
-    background: -moz-linear-gradient(top, #ccdee7 0%, #aabcc5 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ccdee7), color-stop(100%,#aabcc5)); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, #ccdee7 0%, #aabcc5 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, #ccdee7 0%, #aabcc5 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, #ccdee7 0%, #aabcc5 100%); /* IE10+ */
-    background: linear-gradient(top, #ccdee7 0%, #aabcc5 100%); /* W3C */
+    background: #aabcc5;
+    background-image: url({TEMPLATE_PATH}img/gradient-lblue.png) left top repeat-x; /* Fallback */
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ccdee7), color-stop(100%, #aabcc5));
+    background-image: -webkit-linear-gradient(#ccdee7, #aabcc5);
+    background-image: -moz-linear-gradient(#ccdee7, #aabcc5);
+    background-image: -o-linear-gradient(#ccdee7, #aabcc5);
+    background-image: linear-gradient(#ccdee7, #aabcc5);
 }

 .serendipity_entry,
@ -444,9 +444,11 @@ fieldset,
    line-height: 1.8462;
 }

+#staticpage_childpages,
 .serendipity_entry_body ul,
 .serendipity_entry_body ol { margin: 0 0 1em 2em; }

+#staticpage_childpages li ul,
 .serendipity_entry_body li ul,
 .serendipity_entry_body li ol { margin: 0 0 0 2em; }

@ -551,7 +553,7 @@ pre .geshi {

 #c,
 .serendipity_commentDirection {
-    background: #eee;
+    background-color: #eee;
    border: 1px solid #ddd;
    color: #aaa;
    -webkit-border-radius: 3px;
@ -841,6 +843,40 @@ pre .geshi {
    top: 6px!important;
 }

+/* Comment Spice */
+.serendipity_comment_spice { background: #eee; }
+
+.commentspice_rss_input {
+    background: #fff;
+    border: 1px solid #aaa;
+    color: #666;
+    max-width: 320px;
+    min-width: 52%;
+    overflow: hidden;
+    padding-left: 0;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+}
+
+.commentspice_announce_article {
+    clear: both;
+    font-size: .8125em;
+    margin-bottom: 0;
+    padding-top: 0;
+    text-align: left;
+}
+
+.short-heading {
+    float: left;
+    width: 64%;
+}
+
+.twitter_follow {
+    float: right;
+    width: 34%;
+}
+
 /* Helper classes  */
 .visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }

--- a/templates/2k11/trackbacks.tpl
+++ b/templates/2k11/trackbacks.tpl
@ -1,5 +1,5 @@
 {foreach from=$trackbacks item=trackback}
-<article id="c{$trackback.id}" class="serendipity_comment {cycle values="odd,even"}">
+<article id="c{$trackback.id}" class="clearfix serendipity_comment {cycle values="odd,even"}">
    <h4><cite>{$trackback.author|@default:$CONST.ANONYMOUS}</cite> {$CONST.ON} <time datetime="{$trackback.timestamp|@serendipity_html5time}" pubdate>{$trackback.timestamp|@formatTime:$template_option.date_format}</time>: <a href="{$trackback.url|@strip_tags}">{$trackback.title}</a></h4>

    <details>