mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Garvin Hicking
2012-04-22 16:15:18 +02:00
parent d8243ece6e 0652e01780
commit da886799aa
18 changed files with 103 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/admin/tpl/templates.inc.tpl
View File

@@ -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}

2
include/plugin_api.inc.php
View File

@@ -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);

7
plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
View File

@@ -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
}

2
templates/2k11/comments.tpl
View File

@@ -1,6 +1,6 @@
{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}

10
templates/2k11/config.inc.php
View File

@@ -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');

2
templates/2k11/entries.tpl
View File

@@ -5,7 +5,7 @@
<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">

2
templates/2k11/entries_summary.tpl
View File

@@ -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}

10
templates/2k11/index.tpl
View File

@@ -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}

2
templates/2k11/info.txt
View File

@@ -1,4 +1,4 @@
Name: 2k11
Author: Matthias Mees, Veit Lehmann
Date: 2012-04-07
Date: 2012-04-18
Require Serendipity: 1.6

2
templates/2k11/plugin_commentsearch_searchresults.tpl
View File

@@ -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}

2
templates/2k11/plugin_staticpage.tpl
View File

@@ -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>

13
templates/2k11/preview_iframe.tpl
View File

@@ -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

97
templates/2k11/style.css
View File

@@ -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; }

2
templates/2k11/trackbacks.tpl
View File

@@ -1,6 +1,6 @@
{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>