diff --git a/templates/2k11/UTF-8/lang_de.inc.php b/templates/2k11/UTF-8/lang_de.inc.php index 4560eb05..2f45d710 100644 --- a/templates/2k11/UTF-8/lang_de.inc.php +++ b/templates/2k11/UTF-8/lang_de.inc.php @@ -9,6 +9,7 @@ // Sprachkonstanten @define('TWOK11_NAV_TITLE', 'Navigation'); @define('TWOK11_PAG_TITLE', 'Pagination'); +@define('TWOK11_SIDEBAR', 'Seitenleiste'); @define('TWOK11_PLINK_TEXT', 'Link'); @define('TWOK11_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar'); @define('TWOK11_PLACE_SEARCH', 'Suchbegriff(e)'); @@ -24,3 +25,4 @@ @define('TWOK11_EMPTYTRACKBACK', 'Die Anzeige des Inhaltes dieses Trackbacks ist leider nicht möglich.'); @define('TWOK11_TRACKBACKPREVIEW', 'Vorschau anzeigen'); @define('TWOK11_REPLYORIGIN', 'Ursprung'); +@define('TWOK11_FORMOPTIONS', 'Formular-Optionen'); diff --git a/templates/2k11/UTF-8/lang_en.inc.php b/templates/2k11/UTF-8/lang_en.inc.php index b5b15ede..6dd4caa7 100644 --- a/templates/2k11/UTF-8/lang_en.inc.php +++ b/templates/2k11/UTF-8/lang_en.inc.php @@ -9,12 +9,13 @@ // Lang constants @define('TWOK11_NAV_TITLE', 'Navigation'); @define('TWOK11_PAG_TITLE', 'Pagination'); +@define('TWOK11_SIDEBAR', 'Sidebar'); @define('TWOK11_PLINK_TEXT', 'Link'); @define('TWOK11_PLINK_TITLE', 'Permanent link for this comment'); @define('TWOK11_PLACE_SEARCH', 'Search term(s)'); -@define('TWOK11_PLACE_NAME', 'i.e. John Doe'); -@define('TWOK11_PLACE_MAIL', 'i.e. mail@example.org'); -@define('TWOK11_PLACE_URL', 'i.e. http://example.org'); +@define('TWOK11_PLACE_NAME', 'e.g. John Doe'); +@define('TWOK11_PLACE_MAIL', 'e.g. mail@example.org'); +@define('TWOK11_PLACE_URL', 'e.g. http://example.org'); @define('TWOK11_PLACE_MESSAGE', 'What do you want to say?'); @define('TWOK11_SEND_MAIL', 'Send'); @define('TWOK11_TWEET_THIS', 'Share article on Twitter'); @@ -24,3 +25,4 @@ @define('TWOK11_EMPTYTRACKBACK', 'Unfortunately, the contents of this trackback can not be displayed.'); @define('TWOK11_TRACKBACKPREVIEW', 'Show preview'); @define('TWOK11_REPLYORIGIN', 'Origin'); +@define('TWOK11_FORMOPTIONS', 'Form options'); diff --git a/templates/2k11/commentform.tpl b/templates/2k11/commentform.tpl index 04c66120..7c521ac5 100644 --- a/templates/2k11/commentform.tpl +++ b/templates/2k11/commentform.tpl @@ -37,7 +37,8 @@ {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry} {if $is_commentform_showToolbar} -
+
+ {$CONST.TWOK11_FORMOPTIONS}
@@ -46,7 +47,7 @@
{/if} - + {/if} {if $is_moderate_comments}

{$CONST.COMMENTS_WILL_BE_MODERATED}

diff --git a/templates/2k11/config.inc.php b/templates/2k11/config.inc.php index f532f786..fca8b759 100644 --- a/templates/2k11/config.inc.php +++ b/templates/2k11/config.inc.php @@ -6,40 +6,43 @@ if (IN_serendipity !== true) { die ("Don't hack!"); } $serendipity['smarty']->assign(array('currpage' => "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], 'currpage2' => $_SERVER['REQUEST_URI'])); -function serendipity_smarty_html5time($timestamp) { return date("c", $timestamp); } -if( defined('Smarty::SMARTY_VERSION') ) { - $serendipity['smarty']->registerPlugin('modifier', 'serendipity_html5time', 'serendipity_smarty_html5time'); -} else { - // old Smarty 2 syntax - $serendipity['smarty']->register_modifier('serendipity_html5time', 'serendipity_smarty_html5time'); -} +if (!function_exists('serendipity_smarty_html5time')) { + function serendipity_smarty_html5time($timestamp) { return date("c", $timestamp); } -// function serendipity_smarty_html5time($timestamp) { return date("c", $timestamp); } -// $serendipity['smarty']->register_modifier('serendipity_smarty_html5time', 'serendipity_smarty_html5time'); + if( defined('Smarty::SMARTY_VERSION') ) { + $serendipity['smarty']->registerPlugin('modifier', 'serendipity_html5time', 'serendipity_smarty_html5time'); + } else { + // old Smarty 2 syntax + $serendipity['smarty']->register_modifier('serendipity_html5time', 'serendipity_smarty_html5time'); + } +} if (class_exists('serendipity_event_spamblock')) { - $required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%spamblock%required_fields'", true, 'assoc'); + $required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%spamblock%required_fields'", true, 'assoc'); } elseif (class_exists('serendipity_event_commentspice')) { - $required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%commentspice%required_fields'", true, 'assoc'); + $required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%commentspice%required_fields'", true, 'assoc'); } if (is_array($required_fieldlist)) { - $required_fields = explode(',', $required_fieldlist['value']); - $smarty_required_fields = array(); - foreach($required_fields AS $required_field) { - $required_field = trim($required_field); - if (empty($required_field)) continue; - $smarty_required_fields[$required_field] = $required_field; - } - $serendipity['smarty']->assign('required_fields', $smarty_required_fields); + $required_fields = explode(',', $required_fieldlist['value']); + $smarty_required_fields = array(); + + foreach($required_fields AS $required_field) { + $required_field = trim($required_field); + + if (empty($required_field)) continue; + $smarty_required_fields[$required_field] = $required_field; + } + + $serendipity['smarty']->assign('required_fields', $smarty_required_fields); } $template_config = array( - array( - 'var' => 'date_format', - 'name' => GENERAL_PLUGIN_DATEFORMAT . " (http://php.net/strftime)", - 'type' => 'select', - 'default' => DATE_FORMAT_ENTRY, - 'select_values' => array(DATE_FORMAT_ENTRY => DATE_FORMAT_ENTRY, + array( + 'var' => 'date_format', + 'name' => GENERAL_PLUGIN_DATEFORMAT . " (http://php.net/strftime)", + 'type' => 'select', + 'default' => DATE_FORMAT_ENTRY, + 'select_values' => array(DATE_FORMAT_ENTRY => DATE_FORMAT_ENTRY, '%A, %e. %B %Y' => '%A, %e. %B %Y', '%a, %e. %B %Y' => '%a, %e. %B %Y', '%e. %B %Y' => '%e. %B %Y', @@ -50,44 +53,44 @@ $template_config = array( '%m/%d/%y' => '%m/%d/%y', '%m/%d/%Y' => '%m/%d/%Y', '%Y-%m-%d' => '%Y-%m-%d') - ), - array( - 'var' => 'header_img', - 'name' => TWOK11_HEADER_IMG, - 'type' => 'media', - 'default' => serendipity_getTemplateFile('header.jpg') - ), - array( - 'var' => 'webfonts', - 'name' => TWOK11_WEBFONTS, - 'type' => 'select', - 'default' => 'none', - 'select_values' => array('none' => TWOK11_NOWEBFONT, + ), + array( + 'var' => 'header_img', + 'name' => TWOK11_HEADER_IMG, + 'type' => 'media', + 'default' => serendipity_getTemplateFile('header.jpg') + ), + array( + 'var' => 'webfonts', + 'name' => TWOK11_WEBFONTS, + 'type' => 'select', + 'default' => 'none', + 'select_values' => array('none' => TWOK11_NOWEBFONT, 'droid' => 'Droid Sans', 'ptsans' => 'PT Sans', 'osans' => 'Open Sans', 'cabin' => 'Cabin', 'ubuntu' => 'Ubuntu', 'dserif' => 'Droid Serif') - ), - array( - 'var' => 'userstyles', - 'name' => TWOK11_USERSTYLES, - 'type' => 'boolean', - 'default' => false - ), - array( - 'var' => 'refcomments', - 'name' => TWOK11_REFCOMMENTS, - 'type' => 'boolean', - 'default' => false - ), - array( - 'var' => 'use_corenav', - 'name' => TWOK11_USE_CORENAV, - 'type' => 'boolean', - 'default' => true - ) + ), + array( + 'var' => 'userstyles', + 'name' => TWOK11_USERSTYLES, + 'type' => 'boolean', + 'default' => false + ), + array( + 'var' => 'refcomments', + 'name' => TWOK11_REFCOMMENTS, + 'type' => 'boolean', + 'default' => false + ), + array( + 'var' => 'use_corenav', + 'name' => TWOK11_USE_CORENAV, + 'type' => 'boolean', + 'default' => true + ) ); $template_global_config = array('navigation' => true); diff --git a/templates/2k11/info.txt b/templates/2k11/info.txt index a30d7084..0ef63fdf 100644 --- a/templates/2k11/info.txt +++ b/templates/2k11/info.txt @@ -1,4 +1,4 @@ Name: 2k11 Author: Matthias Mees, Veit Lehmann -Date: 2012-10-15 +Date: 2012-11-14 Require Serendipity: 1.6 diff --git a/templates/2k11/js/2k11.min.js b/templates/2k11/js/2k11.min.js index 691021b8..bacbc4de 100644 --- a/templates/2k11/js/2k11.min.js +++ b/templates/2k11/js/2k11.min.js @@ -1,58 +1,80 @@ -/*! Respond.js v1.1.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs */ -(function(e){e.respond={};respond.update=function(){}; -respond.mediaQueriesSupported=e.matchMedia&&e.matchMedia("only all").matches;if(respond.mediaQueriesSupported){return;}var o=e.document,v=o.documentElement,i=[],m=[],t=[],r={},h=30,f=o.getElementsByTagName("head")[0]||v,g=o.getElementsByTagName("base")[0],b=f.getElementsByTagName("link"),d=[],a=function(){var D=b,z=D.length,A=0,x,B,C,y; -for(;A-1,minw:y.match(/\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:y.match(/\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")}); -}}j();},n,u,l=function(){var A,x=o.createElement("div"),y=o.body,z=false;x.style.cssText="position:absolute;font-size:1em;width:1em";if(!y){y=z=o.createElement("body"); -y.style.background="none";}y.appendChild(x);v.insertBefore(y,v.firstChild);A=x.offsetWidth;if(z){v.removeChild(y);}else{y.removeChild(x);}A=s=parseFloat(A); -return A;},s,j=function(B){var C="clientWidth",K=v[C],A=o.compatMode==="CSS1Compat"&&K||o.body[C]||K,M={},z=b[b.length-1],G=(new Date()).getTime();if(B&&n&&G-n-1?(s||l()):1); -}if(!!D){D=parseFloat(D)*(D.indexOf(F)>-1?(s||l()):1);}if(!E.hasquery||(!J||!H)&&(J||A>=L)&&(H||A<=D)){if(!M[E.media]){M[E.media]=[];}M[E.media].push(m[E.rules]); -}}for(var x in t){if(t[x]&&t[x].parentNode===f){f.removeChild(t[x]);}}for(var x in M){var I=o.createElement("style"),y=M[x].join("\n");I.type="text/css"; -I.media=x;f.insertBefore(I,z.nextSibling);if(I.styleSheet){I.styleSheet.cssText=y;}else{I.appendChild(o.createTextNode(y));}t.push(I);}},q=function(y,x){var z=c(); -if(!z){return;}z.open("GET",y,true);z.onreadystatechange=function(){if(z.readyState!=4||z.status!=200&&z.status!=304){return;}x(z.responseText);};if(z.readyState==4){return; -}z.send(null);},c=(function(){var y=false;try{y=new XMLHttpRequest();}catch(x){y=new ActiveXObject("Microsoft.XMLHTTP");}return function(){return y;};})(); -a();respond.update=a;function w(){j(true);}if(e.addEventListener){e.addEventListener("resize",w,false);}else{if(e.attachEvent){e.attachEvent("onresize",w); -}}})(this);(function(d){var g=navigator.userAgent;if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(g)&&g.indexOf("AppleWebKit")>-1)){return; -}var b=d.document;if(!b.querySelector){return;}var f=b.querySelector("meta[name=viewport]"),a=f&&f.getAttribute("content"),o=a+",maximum-scale=1",h=a+",maximum-scale=10",k=true,n,m,l,e; -if(!f){return;}function j(){f.setAttribute("content",h);k=true;}function c(){f.setAttribute("content",o);k=false;}function i(p){e=p.accelerationIncludingGravity; -n=Math.abs(e.x);m=Math.abs(e.y);l=Math.abs(e.z);if((!d.orientation||d.orientation===180)&&(n>7||((l>6&&m<8||l<8&&m>6)&&n>5))){if(k){c();}}else{if(!k){j(); -}}}d.addEventListener("orientationchange",j,false);d.addEventListener("devicemotion",i,false);})(this);(function(a){a.fn.fitVids=function(b){var c={customSelector:null}; +/*! Respond.js v1.1.0 (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs */ +(function(e){e.respond={};respond.update=function(){};respond.mediaQueriesSupported=e.matchMedia&&e.matchMedia("only all").matches; +if(respond.mediaQueriesSupported){return;}var w=e.document,s=w.documentElement,i=[],k=[],q=[],o={},h=30,f=w.getElementsByTagName("head")[0]||s,g=w.getElementsByTagName("base")[0],b=f.getElementsByTagName("link"),d=[],a=function(){var D=b,y=D.length,B=0,A,z,C,x; +for(;B-1,minw:F.match(/\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:F.match(/\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")}); +}}j();},l,r,v=function(){var z,A=w.createElement("div"),x=w.body,y=false;A.style.cssText="position:absolute;font-size:1em;width:1em";if(!x){x=y=w.createElement("body"); +x.style.background="none";}x.appendChild(A);s.insertBefore(x,s.firstChild);z=A.offsetWidth;if(y){s.removeChild(x);}else{x.removeChild(A);}z=p=parseFloat(z); +return z;},p,j=function(I){var x="clientWidth",B=s[x],H=w.compatMode==="CSS1Compat"&&B||w.body[x]||B,D={},G=b[b.length-1],z=(new Date()).getTime();if(I&&l&&z-l-1?(p||v()):1); +}if(!!J){J=parseFloat(J)*(J.indexOf(y)>-1?(p||v()):1);}if(!K.hasquery||(!A||!L)&&(A||H>=C)&&(L||H<=J)){if(!D[K.media]){D[K.media]=[];}D[K.media].push(k[K.rules]); +}}for(var E in q){if(q[E]&&q[E].parentNode===f){f.removeChild(q[E]);}}for(var E in D){var M=w.createElement("style"),F=D[E].join("\n");M.type="text/css"; +M.media=E;f.insertBefore(M,G.nextSibling);if(M.styleSheet){M.styleSheet.cssText=F;}else{M.appendChild(w.createTextNode(F));}q.push(M);}},n=function(x,z){var y=c(); +if(!y){return;}y.open("GET",x,true);y.onreadystatechange=function(){if(y.readyState!=4||y.status!=200&&y.status!=304){return;}z(y.responseText);};if(y.readyState==4){return; +}y.send(null);},c=(function(){var x=false;try{x=new XMLHttpRequest();}catch(y){x=new ActiveXObject("Microsoft.XMLHTTP");}return function(){return x;};})(); +a();respond.update=a;function t(){j(true);}if(e.addEventListener){e.addEventListener("resize",t,false);}else{if(e.attachEvent){e.attachEvent("onresize",t); +}}})(this); +/*! A fix for the iOS orientationchange zoom bug. Script by @scottjehl, rebound by @wilto. MIT / GPLv2 License. */ +(function(n){var d=navigator.userAgent; +if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(d)&&d.indexOf("AppleWebKit")>-1)){return;}var m=n.document;if(!m.querySelector){return; +}var o=m.querySelector("meta[name=viewport]"),a=o&&o.getAttribute("content"),l=a+",maximum-scale=1",e=a+",maximum-scale=10",h=true,k,j,i,c;if(!o){return; +}function g(){o.setAttribute("content",e);h=true;}function b(){o.setAttribute("content",l);h=false;}function f(p){c=p.accelerationIncludingGravity;k=Math.abs(c.x); +j=Math.abs(c.y);i=Math.abs(c.z);if((!n.orientation||n.orientation===180)&&(k>7||((i>6&&j<8||i<8&&j>6)&&k>5))){if(h){b();}}else{if(!h){g();}}}n.addEventListener("orientationchange",g,false); +n.addEventListener("devicemotion",f,false);})(this); +/*! FitVids 1.0 + * Copyright 2011, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com + * Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/ + * Released under the WTFPL license - http://sam.zoy.org/wtfpl/ + * Date: Thu Sept 01 18:00:00 2011 -0500 + */ +(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*='player.vimeo.com']","iframe[src*='www.youtube.com']","iframe[src*='www.kickstarter.com']","object","embed"]; -if(c.customSelector){f.push(c.customSelector);}var g=a(this).find(f.join(","));g.each(function(){var l=a(this);if(this.tagName.toLowerCase()=="embed"&&l.parent("object").length||l.parent(".fluid-width-video-wrapper").length){return; -}var h=(this.tagName.toLowerCase()=="object"||l.attr("height"))?l.attr("height"):l.height(),i=l.attr("width")?l.attr("width"):l.width(),j=h/i;if(!l.attr("id")){var k="fitvid"+Math.floor(Math.random()*999999); -l.attr("id",k);}l.wrap('
').parent(".fluid-width-video-wrapper").css("padding-top",(j*100)+"%");l.removeAttr("height").removeAttr("width"); -});});};})(jQuery);jQuery(function(a){(function(){var b=this;this.hideDetailChildren=function(e){var f=e instanceof jQuery?e[0].childNodes:e.childNodes,g=f.length; -a(e).attr("open",!1);if(a.browser.safari==!0){for(var m=0;m");n.text(f[m].textContent).hide(),a(f[m]).after(n),f[m].textContent="",g++; -}}}a.each(f,function(i,k){if(a(k)[0].nodeType==1&&k==a(k).parent().find("> summary:first-of-type")[0]){a(k).data("processed")!=!0&&(a(k).css({display:"block",cursor:"pointer"}).data("processed",!0).addClass("detailHidden").bind("click",function(){b.toggleDetailChildren(a(this)); -}),a(e).prepend(a(k)));}else{if(a(k)[0].nodeType==3&&!k.isElementContentWhitespace&&!!a.browser.safari==!1){var h=a("");h.text(k.textContent).hide(),a(k).after(h),k.textContent=""; -}else{if(a(e).find("> summary").length==0){var j=a("").text("Details").css({display:"block",cursor:"pointer"}).data("processed",!0).addClass("detailHidden").bind("click",function(){b.toggleDetailChildren(a(this)); -});a(e).prepend(j);}}}a(e).find("> :visible:not(summary:first-child)").hide();});},this.showDetailChildren=function(e){a(e).attr("open",!0),a.each(a(e).find("> *"),function(h,f){a(f).show(); -});},this.toggleDetailChildren=function(e){e.hasClass("detailHidden")?(e.removeClass("detailHidden"),b.showDetailChildren(e.parents("details")[0])):(e.addClass("detailHidden"),b.hideDetailChildren(e.parents("details")[0])); -};var c=function(m){var n=m.createElement("details"),e,f,l;return"open" in n?(f=m.body||function(){var g=m.documentElement;return e=!0,g.insertBefore(m.createElement("body"),g.firstElementChild||g.firstChild); -}(),n.innerHTML="ab",n.style.display="block",f.appendChild(n),l=n.offsetHeight,n.open=!0,l=l!=n.offsetHeight,f.removeChild(n),e&&f.parentNode.removeChild(f),l):!1; -}(document);if(c==!1){if(a("details").length!==0){var d=a("