From 54e310b1e476d479e71564fcd15a4706ab20c565 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Tue, 17 Apr 2012 11:37:53 +0200
Subject: [PATCH 1/4] fixed Smarty const check
---
include/plugin_api.inc.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/plugin_api.inc.php b/include/plugin_api.inc.php
index d3600005..46a2db52 100644
--- a/include/plugin_api.inc.php
+++ b/include/plugin_api.inc.php
@@ -1577,7 +1577,7 @@ class serendipity_plugin
$tfile = dirname($this->pluginFile) . '/' . $filename;
}
- if( !SMARTY_VERSION ) {
+ if( !defined('Smarty::SMARTY_VERSION') ) {
$inclusion = $serendipity['smarty']->security_settings[@INCLUDE_ANY];
$serendipity['smarty']->security_settings[@INCLUDE_ANY] = true;
$content = $serendipity['smarty']->fetch('file:'. $tfile);
From 04218b42adf0b6f414f54ec5d3231e115249bfba Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Wed, 18 Apr 2012 15:33:43 +0200
Subject: [PATCH 2/4] Updated 2k11 to v1.1.6.
---
templates/2k11/comments.tpl | 6 +-
templates/2k11/config.inc.php | 12 ++-
templates/2k11/entries.tpl | 10 +-
templates/2k11/entries_archives.tpl | 2 +-
templates/2k11/entries_summary.tpl | 2 +-
templates/2k11/index.tpl | 16 +--
templates/2k11/info.txt | 2 +-
templates/2k11/js/2k11.min.js | 2 +-
templates/2k11/plugin_categories.tpl | 2 +-
.../plugin_commentsearch_searchresults.tpl | 2 +-
templates/2k11/plugin_contactform.tpl | 10 +-
templates/2k11/plugin_staticpage.tpl | 2 +-
templates/2k11/preview_iframe.tpl | 13 ++-
templates/2k11/style.css | 97 +++++++++----------
templates/2k11/trackbacks.tpl | 4 +-
15 files changed, 96 insertions(+), 86 deletions(-)
diff --git a/templates/2k11/comments.tpl b/templates/2k11/comments.tpl
index 74f9e747..9f9fcaca 100644
--- a/templates/2k11/comments.tpl
+++ b/templates/2k11/comments.tpl
@@ -1,7 +1,7 @@
{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_smarty_html5time}" pubdate>{$comment.timestamp|@formatTime:$template_option.date_format}</time>:</h4>
-
+ <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>
+
<div class="serendipity_commentBody clearfix content">
{if $comment.avatar}{$comment.avatar}{/if}
{if $comment.body == 'COMMENT_DELETED'}
@@ -10,7 +10,7 @@
{$comment.body}
{/if}
</div>
-
+
<footer>
<time>{$comment.timestamp|@formatTime:'%H:%M'}</time>
| <a class="comment_source_trace" href="#c{$comment.id}" title="{$CONST.TWOK11_PLINK_TITLE}">{$CONST.TWOK11_PLINK_TEXT}</a>
diff --git a/templates/2k11/config.inc.php b/templates/2k11/config.inc.php
index a2425d5e..88a92c9b 100644
--- a/templates/2k11/config.inc.php
+++ b/templates/2k11/config.inc.php
@@ -7,7 +7,15 @@ $serendipity['smarty']->assign(array('currpage' => "http://".$_SERVER['HTTP_HOS
'currpage2' => $_SERVER['REQUEST_URI']));
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');
+}
+
+// function serendipity_smarty_html5time($timestamp) { return date("c", $timestamp); }
+// $serendipity['smarty']->register_modifier('serendipity_smarty_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');
@@ -76,4 +84,4 @@ $template_config = array(
$template_global_config = array('navigation' => true);
$template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option'], true);
-serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config);
+serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config);
\ No newline at end of file
diff --git a/templates/2k11/entries.tpl b/templates/2k11/entries.tpl
index ca8ae4d2..494b66c5 100644
--- a/templates/2k11/entries.tpl
+++ b/templates/2k11/entries.tpl
@@ -4,8 +4,8 @@
<article id="post_{$entry.id}" class="clearfix serendipity_entry{if $dategroup.is_sticky} sticky{/if}">
<header class="clearfix">
<h2><a href="{$entry.link}">{$entry.title}</a></h2>
-
- <span class="serendipity_byline">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_smarty_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time>{if $entry.is_entry_owner and not $is_preview} | <a href="{$entry.link_edit}">{$CONST.EDIT_ENTRY}</a>{/if}</span>
+
+ <span class="serendipity_byline">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time>{if $entry.is_entry_owner and not $is_preview} | <a href="{$entry.link_edit}">{$CONST.EDIT_ENTRY}</a>{/if}</span>
</header>
<div class="clearfix content serendipity_entry_body">
@@ -75,13 +75,13 @@
<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>
-
+
{serendipity_printTrackbacks entry=$entry.id}
</section>
<section id="comments" class="serendipity_comments">
<h3>{$CONST.COMMENTS}</h3>
-
+
<p class="manage_comments">{$CONST.DISPLAY_COMMENTS_AS}
{if $entry.viewmode eq $CONST.VIEWMODE_LINEAR}
{$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$entry.link_viewmode_threaded}#comments" rel="nofollow">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>
@@ -129,7 +129,7 @@
{if $footer_info or $footer_prev_page or $footer_next_page}
<nav class="serendipity_pagination">
<h2 class="visuallyhidden">{$CONST.TWOK11_PAG_TITLE}</h2>
-
+
<ul class="clearfix">
{if $footer_info}
<li class="info"><span>{$footer_info}</span></li>
diff --git a/templates/2k11/entries_archives.tpl b/templates/2k11/entries_archives.tpl
index 1e2c4ed8..1be8c630 100644
--- a/templates/2k11/entries_archives.tpl
+++ b/templates/2k11/entries_archives.tpl
@@ -4,7 +4,7 @@
{foreach from=$archives item="archive"}
<section class="archives_year {cycle values="arch_odd,arch_even"}">
<h3>{$archive.year}</h3>
-
+
<ul class="plainList">
{foreach from=$archive.months item="month"}
<li class="archives_month">
diff --git a/templates/2k11/entries_summary.tpl b/templates/2k11/entries_summary.tpl
index 7ec69999..cc10ea72 100644
--- a/templates/2k11/entries_summary.tpl
+++ b/templates/2k11/entries_summary.tpl
@@ -6,7 +6,7 @@
{foreach from=$entries item="sentries"}
{foreach from=$sentries.entries item="entry"}
<li><a href="{$entry.link}">{$entry.title}</a>
- <span class="serendipity_byline">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_smarty_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time></span>
+ <span class="serendipity_byline">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_html5time}" pubdate>{$entry.timestamp|@formatTime:$template_option.date_format}</time></span>
</li>
{/foreach}
{/foreach}
diff --git a/templates/2k11/index.tpl b/templates/2k11/index.tpl
index b570457e..706817aa 100644
--- a/templates/2k11/index.tpl
+++ b/templates/2k11/index.tpl
@@ -1,14 +1,14 @@
{if $is_embedded != true}
<!doctype html>
-<!--[if lt IE 7 ]> <html class="no-js ie6 oldie" lang="{$lang}"> <![endif]-->
-<!--[if IE 7 ]> <html class="no-js ie7 oldie" lang="{$lang}"> <![endif]-->
-<!--[if IE 8 ]> <html class="no-js ie8 oldie" lang="{$lang}"> <![endif]-->
+<!--[if lt IE 7 ]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="{$lang}"> <![endif]-->
+<!--[if IE 7 ]> <html class="no-js lt-ie9 lt-ie8" lang="{$lang}"> <![endif]-->
+<!--[if IE 8 ]> <html class="no-js lt-ie9" lang="{$lang}"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]-->
<head>
<meta charset="{$head_charset}">
<title>{$head_title|@default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if}</title>
<meta name="generator" content="Serendipity v.{$head_version}">
- <meta name="viewport" content="width=device-width,initial-scale=1">
+ <meta name="viewport" content="width=device-width">
{if $template_option.webfonts == 'droid'}
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700">
{elseif $template_option.webfonts == 'ptsans'}
@@ -24,7 +24,7 @@
{if $template_option.userstyles == true}
<link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
{/if}
- <script id="modernizr" src="{serendipity_getFile file="js/modernizr-2.5.3.min.js"}"></script>
+ <script src="{serendipity_getFile file="js/modernizr-2.5.3.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}
@@ -46,7 +46,7 @@
{if $blogDescription}<p>{$blogDescription}</p>{/if}
</a>
</div>
-
+
<form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get">
<div>
<input type="hidden" name="serendipity[action]" value="search">
@@ -63,7 +63,7 @@
{if $template_option.use_corenav}
<nav id="primary-nav">
<h2 class="visuallyhidden">{$CONST.TWOK11_NAV_TITLE}</h2>
-
+
<ul class="clearfix">{foreach from=$navlinks item="navlink" name="sbnav"}{if $navlink.title!=""&&$navlink.href!=""}<li>{if $currpage==$navlink.href or $currpage2==$navlink.href}<span>{else}<a href="{$navlink.href}">{/if}{$navlink.title}{if $currpage==$navlink.href or $currpage2==$navlink.href}</span>{else}</a>{/if}</li>{/if}{/foreach}</ul>
</nav>
{/if}
@@ -84,7 +84,7 @@
</aside>
{/if}
</div>
-
+
<footer id="colophon">
<small lang="en">Powered by <a href="http://s9y.org">Serendipity</a> & the <a href="http://github.com/yellowled/s9y-2k11">2k11</a> theme.</small>
</footer>
diff --git a/templates/2k11/info.txt b/templates/2k11/info.txt
index d57fc7fe..b5e9570b 100644
--- a/templates/2k11/info.txt
+++ b/templates/2k11/info.txt
@@ -1,4 +1,4 @@
Name: 2k11
Author: Matthias Mees, Veit Lehmann
-Date: 2012-04-07
+Date: 2012-04-18
Require Serendipity: 1.6
diff --git a/templates/2k11/js/2k11.min.js b/templates/2k11/js/2k11.min.js
index 04b90386..db2ebf99 100644
--- a/templates/2k11/js/2k11.min.js
+++ b/templates/2k11/js/2k11.min.js
@@ -21,7 +21,7 @@ T();respond.update=T;function A(){K(true);}if(P.addEventListener){P.addEventList
}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="­<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>";
+f.className="fit-vids-style";f.innerHTML="­<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"];
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);
diff --git a/templates/2k11/plugin_categories.tpl b/templates/2k11/plugin_categories.tpl
index 071ff788..c7b580bb 100644
--- a/templates/2k11/plugin_categories.tpl
+++ b/templates/2k11/plugin_categories.tpl
@@ -4,7 +4,7 @@
<ul class="plainList">
{foreach from=$categories item="plugin_category"}
<li id="category_{$plugin_category.categoryid}" class="category_depth{$plugin_category.catdepth}">
- {if $is_form}
+ {if $is_form}
<input name="serendipity[multiCat][]" type="checkbox" value="{$plugin_category.categoryid}">
{/if}
{if !empty($category_image)}
diff --git a/templates/2k11/plugin_commentsearch_searchresults.tpl b/templates/2k11/plugin_commentsearch_searchresults.tpl
index 30341ec4..22776d03 100644
--- a/templates/2k11/plugin_commentsearch_searchresults.tpl
+++ b/templates/2k11/plugin_commentsearch_searchresults.tpl
@@ -3,7 +3,7 @@
{if $comment_results}
<ul class="plainList">
{foreach from=$comment_results item="result"}
- <li><span>{if $result.type == 'TRACKBACK'}<a href="{$result.url|@escape}">{else}<b>{/if}{$result.author|@escape}{if $result.type == 'TRACKBACK'}</a>{else}</b>{/if} {$CONST.IN} <a href="{$result.permalink|@escape}">{$result.title|@escape}</a> {$CONST.ON} <time datetime="{$result.ctimestamp|@serendipity_smarty_html5time}">{$result.ctimestamp|@formatTime:$template_option.date_format}</time>:</span>
+ <li><span>{if $result.type == 'TRACKBACK'}<a href="{$result.url|@escape}">{else}<b>{/if}{$result.author|@escape}{if $result.type == 'TRACKBACK'}</a>{else}</b>{/if} {$CONST.IN} <a href="{$result.permalink|@escape}">{$result.title|@escape}</a> {$CONST.ON} <time datetime="{$result.ctimestamp|@serendipity_html5time}">{$result.ctimestamp|@formatTime:$template_option.date_format}</time>:</span>
{$result.comment|@strip_tags|@truncate:200:" ... "}
</li>
{/foreach}
diff --git a/templates/2k11/plugin_contactform.tpl b/templates/2k11/plugin_contactform.tpl
index 2a311f93..e610177d 100644
--- a/templates/2k11/plugin_contactform.tpl
+++ b/templates/2k11/plugin_contactform.tpl
@@ -1,6 +1,6 @@
<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>
-
+
<div class="serendpity_preface content">
{$plugin_contactform_preface}
</div>
@@ -17,7 +17,7 @@
<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}">
@@ -27,17 +27,17 @@
<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>
diff --git a/templates/2k11/plugin_staticpage.tpl b/templates/2k11/plugin_staticpage.tpl
index ff92a684..23ca2225 100644
--- a/templates/2k11/plugin_staticpage.tpl
+++ b/templates/2k11/plugin_staticpage.tpl
@@ -36,7 +36,7 @@
<span class="visuallyhidden">{$CONST.POSTED_BY} </span>{$staticpage_author|@escape}
{/if}
{if $staticpage_lastchange}
- | <span class="visuallyhidden">{$CONST.ON} </span><time datetime="{$staticpage_lastchange|@serendipity_smarty_html5time}" pubdate>{$staticpage_lastchange|date_format:$template_option.date_format}</time>
+ | <span class="visuallyhidden">{$CONST.ON} </span><time datetime="{$staticpage_lastchange|@serendipity_html5time}" pubdate>{$staticpage_lastchange|date_format:$template_option.date_format}</time>
{/if}
{if $staticpage_adminlink AND $staticpage_adminlink.page_user}
| <a href="{$staticpage_adminlink.link_edit}">{$staticpage_adminlink.link_name|@escape}</a>
diff --git a/templates/2k11/preview_iframe.tpl b/templates/2k11/preview_iframe.tpl
index 2f920c36..895cb6f2 100644
--- a/templates/2k11/preview_iframe.tpl
+++ b/templates/2k11/preview_iframe.tpl
@@ -1,13 +1,13 @@
<!doctype html>
-<!--[if lt IE 7 ]> <html class="no-js ie6 oldie" lang="{$lang}"> <![endif]-->
-<!--[if IE 7 ]> <html class="no-js ie7 oldie" lang="{$lang}"> <![endif]-->
-<!--[if IE 8 ]> <html class="no-js ie8 oldie" lang="{$lang}"> <![endif]-->
+<!--[if lt IE 7 ]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="{$lang}"> <![endif]-->
+<!--[if IE 7 ]> <html class="no-js lt-ie9 lt-ie8" lang="{$lang}"> <![endif]-->
+<!--[if IE 8 ]> <html class="no-js lt-ie9" lang="{$lang}"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]-->
<head>
<meta charset="{$head_charset}">
<title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
<meta name="generator" content="Serendipity v.{$head_version}">
- <meta name="viewport" content="width=device-width,initial-scale=1">
+ <meta name="viewport" content="width=device-width">
{if $template_option.webfonts == 'droid'}
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700">
{elseif $template_option.webfonts == 'ptsans'}
@@ -20,7 +20,10 @@
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700,700italic">
{/if}
<link rel="stylesheet" href="{$head_link_stylesheet}">
- <script src="{serendipity_getFile file="js/modernizr-2.0.6.min.js"}"></script>
+{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>
window.onload = function() {ldelim}
parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight
diff --git a/templates/2k11/style.css b/templates/2k11/style.css
index d0f034ea..b5c29234 100644
--- a/templates/2k11/style.css
+++ b/templates/2k11/style.css
@@ -155,16 +155,16 @@ blockquote:lang(de) p:first-child:before { content: '„'; content: open-quote;
:lang(de) blockquote p:last-child:after,
blockquote:lang(de) p:last-child:after { content: '“'; content: close-quote; }
-.ie8 q:before,
-.ie8 q q:before,
-.ie8 :lang(de) q:before,
-.ie8 :lang(de) q q:before,
-.ie8 blockquote p:before,
-.ie8 blockquote p:first-child:before,
-.ie8 :lang(de) blockquote p:before,
-.ie8 blockquote:lang(de) p:before,
-.ie8 :lang(de) blockquote p:first-child:before,
-.ie8 blockquote:lang(de) p:first-child:before { content: ''; content: no-open-quote; }
+.lt-ie9 q:before,
+.lt-ie9 q q:before,
+.lt-ie9 :lang(de) q:before,
+.lt-ie9 :lang(de) q q:before,
+.lt-ie9 blockquote p:before,
+.lt-ie9 blockquote p:first-child:before,
+.lt-ie9 :lang(de) blockquote p:before,
+.lt-ie9 blockquote:lang(de) p:before,
+.lt-ie9 :lang(de) blockquote p:first-child:before,
+.lt-ie9 blockquote:lang(de) p:first-child:before { content: ''; content: no-open-quote; }
a, a:active, a:visited { color: #3e5f81; }
a:hover { color: #d52; }
@@ -316,8 +316,8 @@ fieldset,
#primary-nav li,
.archives_date { display: inline-block; }
-.ie7 #primary-nav li,
-.ie7 .archives_date {
+.lt-ie8 #primary-nav li,
+.lt-ie8 .archives_date {
display: inline;
zoom: 1;
}
@@ -355,11 +355,10 @@ fieldset,
#serendipityQuickSearchTermField,
#serendipity_comment input[type=text],
#serendipity_comment input[type=email],
-#serendipity_comment input[type=url] { width: 97%; }
+#serendipity_comment input[type=url] { width: 95%; }
-#serendipity_replyTo { width: 99%; }
-
-#serendipity_comment textarea { width: 97%; }
+#serendipity_replyTo,
+#serendipity_comment textarea { width: 95%; }
#primary-nav {
border-top: 1px solid #294564;
@@ -528,8 +527,8 @@ pre .geshi {
.serendipity_pagination .prev,
.serendipity_pagination .next { width: 50%; }
-.ie7 .serendipity_pagination .prev,
-.ie7 .serendipity_pagination .next { width: 49.9%; }
+.lt-ie8 .serendipity_pagination .prev,
+.lt-ie8 .serendipity_pagination .next { width: 49.9%; }
.archives_date { min-width: 10em; }
@@ -816,9 +815,9 @@ pre .geshi {
margin: 0 4px 0 0;
}
-.ie7 .serendipity_findmore li,
-.ie7 .serendipity_findmore_like li,
-.ie7 .lazyload_switcher {
+.lt-ie8 .serendipity_findmore li,
+.lt-ie8 .serendipity_findmore_like li,
+.lt-ie8 .lazyload_switcher {
display: inline;
zoom: 1;
}
@@ -879,7 +878,7 @@ pre .geshi {
width: 47.5%;
}
- .ie7 .sidebar_plugin { width: 47.4%; }
+ .lt-ie8 .sidebar_plugin { width: 47.4%; }
#sidebar_left .odd,
#sidebar_right .odd {
@@ -899,10 +898,10 @@ pre .geshi {
.serendipity_pagination .next { width: 25%; }
- .ie7 .serendipity_pagination .info { width: 49.9%; }
+ .lt-ie8 .serendipity_pagination .info { width: 49.9%; }
- .ie7 .serendipity_pagination .prev,
- .ie7 .serendipity_pagination .next { width: 24.9%; }
+ .lt-ie8 .serendipity_pagination .prev,
+ .lt-ie8 .serendipity_pagination .next { width: 24.9%; }
.archives_year {
float: left;
@@ -924,8 +923,8 @@ pre .geshi {
width: 50%;
}
- .ie7 .serendipity_entrypaging_left,
- .ie7 .serendipity_entrypaging_right { width: 49.9%; }
+ .lt-ie8 .serendipity_entrypaging_left,
+ .lt-ie8 .serendipity_entrypaging_right { width: 49.9%; }
.serendipity_entrypaging { overflow: hidden; }
@@ -975,13 +974,13 @@ pre .geshi {
.col2l #sidebar_left { left: -62%; }
.col2l #content { left: 38%; }
- .ie7 #identity,
- .ie7 #content { width: 61.9%; }
- .ie7 #searchform,
- .ie7 #sidebar_left,
- .ie7 #sidebar_right { width: 37.9%; }
- .ie7 .col2l #sidebar_left { left: -61.9%; }
- .ie7 .col2l #content { left: 37.9%; }
+ .lt-ie8 #identity,
+ .lt-ie8 #content { width: 61.9%; }
+ .lt-ie8 #searchform,
+ .lt-ie8 #sidebar_left,
+ .lt-ie8 #sidebar_right { width: 37.9%; }
+ .lt-ie8 .col2l #sidebar_left { left: -61.9%; }
+ .lt-ie8 .col2l #content { left: 37.9%; }
.col2l #searchform { text-align: right; }
@@ -995,18 +994,18 @@ pre .geshi {
}
.sidebar_plugin,
- .ie7 .sidebar_plugin {
+ .lt-ie8 .sidebar_plugin {
float: none;
width: auto;
}
#sidebar_left .sidebar_plugin,
- .ie7 #sidebar_left .sidebar_plugin,
+ .lt-ie8 #sidebar_left .sidebar_plugin,
#sidebar_right .sidebar_plugin,
- .ie7 #sidebar_right .sidebar_plugin { margin: 0 1em 2em 2em; }
+ .lt-ie8 #sidebar_right .sidebar_plugin { margin: 0 1em 2em 2em; }
#searchform>div,
- .ie7 #searchform>div { padding: 0 1em 0 2em; }
+ .lt-ie8 #searchform>div { padding: 0 1em 0 2em; }
.content blockquote {
border-left: 4px solid #aaa;
@@ -1049,16 +1048,16 @@ pre .geshi {
.col3 #content { left: 25%; }
.col3 #sidebar_left { left: -50%; }
- .ie7 .col3 #content { width: 49.9%; }
- .ie7 .col3 #searchform,
- .ie7 .col3 #sidebar_left,
- .ie7 .col3 #sidebar_right { width: 24.9%; }
- .ie7 .col3 #identity { width: 74.9%; }
- .ie7 .col3 #content { left: 24.9%; }
- .ie7 .col3 #sidebar_left { left: -49.9%; }
+ .lt-ie8 .col3 #content { width: 49.9%; }
+ .lt-ie8 .col3 #searchform,
+ .lt-ie8 .col3 #sidebar_left,
+ .lt-ie8 .col3 #sidebar_right { width: 24.9%; }
+ .lt-ie8 .col3 #identity { width: 74.9%; }
+ .lt-ie8 .col3 #content { left: 24.9%; }
+ .lt-ie8 .col3 #sidebar_left { left: -49.9%; }
#sidebar_left .sidebar_plugin,
- .ie7 #sidebar_left .sidebar_plugin { margin: 0 2em 2em 1em; }
+ .lt-ie8 #sidebar_left .sidebar_plugin { margin: 0 2em 2em 1em; }
.serendipity_search,
.staticpage_results,
@@ -1072,9 +1071,9 @@ pre .geshi {
.content_msg,
.serendipity_staticpage,
#sidebar_left .sidebar_plugin,
- .ie7 #sidebar_left .sidebar_plugin,
+ .lt-ie8 #sidebar_left .sidebar_plugin,
#sidebar_right .sidebar_plugin,
- .ie7 #sidebar_right .sidebar_plugin { margin: 0 2em 2em; }
+ .lt-ie8 #sidebar_right .sidebar_plugin { margin: 0 2em 2em; }
.serendipity_pagination { margin: 0 2.4615em 1.2308em; }
@@ -1088,7 +1087,7 @@ pre .geshi {
* { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; }
a, a:visited { text-decoration: underline; }
abbr[title]:after { content: " (" attr(title) ")"; }
- pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
+ pre, blockquote { border: 1px solid #999; page-break-inside: avoid; padding: 0.25cm 0.25cm 0; }
thead { display: table-header-group; }
tr, img { page-break-inside: avoid; }
img { max-width: 100% !important; }
diff --git a/templates/2k11/trackbacks.tpl b/templates/2k11/trackbacks.tpl
index ffebb3b7..1046129b 100644
--- a/templates/2k11/trackbacks.tpl
+++ b/templates/2k11/trackbacks.tpl
@@ -1,11 +1,11 @@
{foreach from=$trackbacks item=trackback}
<article id="c{$trackback.id}" class="serendipity_comment {cycle values="odd,even"}">
- <h4><cite>{$trackback.author|@default:$CONST.ANONYMOUS}</cite> {$CONST.ON} <time datetime="{$trackback.timestamp|@serendipity_smarty_html5time}" pubdate>{$trackback.timestamp|@formatTime:$template_option.date_format}</time>: <a href="{$trackback.url|@strip_tags}">{$trackback.title}</a></h4>
+ <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>
<summary>{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$trackback.title}</summary>
<div class="content serendipity_commentBody">{$trackback.body|@strip_tags|@escape:all}</div>
- </details>
+ </details>
{if $entry.is_entry_owner}
<footer>
<a href="{$serendipityBaseURL}comment.php?serendipity[delete]={$trackback.id}&serendipity[entry]={$trackback.entry_id}&serendipity[type]=trackbacks">{$CONST.DELETE}</a>
From 0b7c7983f7ed9eb384336954f23b57e31b5d5ad4 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Sat, 21 Apr 2012 12:24:12 +0200
Subject: [PATCH 3/4] templates.inc.tpl fixed typo
---
include/admin/tpl/templates.inc.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/admin/tpl/templates.inc.tpl b/include/admin/tpl/templates.inc.tpl
index 6b746928..8244bbca 100644
--- a/include/admin/tpl/templates.inc.tpl
+++ b/include/admin/tpl/templates.inc.tpl
@@ -18,7 +18,7 @@
{if $adminAction == "configure"}
<div class="serendipityAdminMsgSuccess">
<img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file='admin/img/admin_msg_success.png'}" alt="" />
- {$CONST:DONE}: {$save_time}
+ {$CONST.DONE}: {$save_time}
</div>
{/if}
From 0652e017807530dd37a8f24a21410e253bec8edd Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Sat, 21 Apr 2012 16:15:13 +0200
Subject: [PATCH 4/4] if set, $isobr now hooks to global Serendipity var
to get also used by plugins, like staticpages
---
.../serendipity_event_nl2br/serendipity_event_nl2br.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
index e4feaf3e..36ba631d 100644
--- a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
+++ b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
@@ -1,4 +1,5 @@
-<?php # $Id: serendipity_event_nl2br.php 2011-11-25 09:00:00Z ian $
+<?php # $Id$
+# serendipity_event_nl2br.php 2012-04-21 16:11:00 ian $
@serendipity_plugin_api::load_language(dirname(__FILE__));
@@ -14,7 +15,7 @@ class serendipity_event_nl2br extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_NL2BR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team');
- $propbag->add('version', '2.13');
+ $propbag->add('version', '2.14');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -247,6 +248,8 @@ class serendipity_event_nl2br extends serendipity_event
// check single entry for temporary disabled markups
if( $isobr ) {
+ $serendipity['nl2br']['iso2br'] = true; // include to global as also used by staticpages now
+
if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init(); // if not set to avoid member function assign() on a non-object error, start Smarty templating
}