Permalink
Browse files

Updated 2k11 to 1.0.8.

  • Loading branch information...
1 parent 9f29e30 commit 76bb6796b474b04ce37dd4196efef883eb302f3a @yellowled yellowled committed Jan 28, 2012
@@ -2,22 +2,22 @@
<div id="serendipity_replyform_0"></div>
<a id="serendipity_CommentForm"></a>
<form id="serendipity_comment" action="{$commentform_action}#feedback" method="post">
- <div><input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}"/></div>
+ <div><input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}"></div>
<div class="form_field">
<label id="reply-to-hint" for="serendipity_replyTo">{$CONST.IN_REPLY_TO}</label>
{$commentform_replyTo}
</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}/>
+ <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}/>
+ <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}/>
+ <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">{$CONST.COMMENT}{if $required_fields.comment}*{/if}</label>
@@ -27,11 +27,11 @@
{if $is_commentform_showToolbar}
<div class="form_toolbar">
<div class="form_box">
- <input id="checkbox_remember" name="serendipity[remember]" type="checkbox" {$commentform_remember}/><label for="checkbox_remember">{$CONST.REMEMBER_INFO}</label>
+ <input id="checkbox_remember" name="serendipity[remember]" type="checkbox" {$commentform_remember}><label for="checkbox_remember">{$CONST.REMEMBER_INFO}</label>
</div>
{if $is_allowSubscriptions}
<div class="form_box">
- <input id="checkbox_subscribe" name="serendipity[subscribe]" type="checkbox" {$commentform_subscribe} /><label for="checkbox_subscribe">{$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label>
+ <input id="checkbox_subscribe" name="serendipity[subscribe]" type="checkbox" {$commentform_subscribe} ><label for="checkbox_subscribe">{$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label>
</div>
{/if}
</div>
@@ -40,8 +40,8 @@
<p class="serendipity_msg_important">{$CONST.COMMENTS_WILL_BE_MODERATED}</p>
{/if}
<div class="form_button">
- <input id="serendipity_submit" name="serendipity[submit]" type="submit" value="{$CONST.SUBMIT_COMMENT}"/>
- <input id="serendipity_preview" name="serendipity[preview]" type="submit" value="{$CONST.PREVIEW}"/>
+ <input id="serendipity_submit" name="serendipity[submit]" type="submit" value="{$CONST.SUBMIT_COMMENT}">
+ <input id="serendipity_preview" name="serendipity[preview]" type="submit" value="{$CONST.PREVIEW}">
</div>
</form>
</div>
@@ -9,15 +9,17 @@
function serendipity_smarty_html5time($timestamp) { return date("c", $timestamp); }
$serendipity['smarty']->register_modifier('serendipity_smarty_html5time', 'serendipity_smarty_html5time');
-$required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%spamblock%required_fields'", true, 'assoc');
-$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;
+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_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);
}
-$serendipity['smarty']->assign('required_fields', $smarty_required_fields);
$template_config = array(
array(
@@ -9,7 +9,7 @@
</header>
<div class="clearfix content serendipity_entry_body">
- {if $entry.categories}{foreach from=$entry.categories item="entry_category"}{if $entry_category.category_icon}<a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}"/></a>{/if}{/foreach}{/if}
+ {if $entry.categories}{foreach from=$entry.categories item="entry_category"}{if $entry_category.category_icon}<a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}"></a>{/if}{/foreach}{/if}
{$entry.body}
{if $entry.has_extended and not $is_single_entry and not $entry.is_extended}
<a class="read_more" href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a>
View
@@ -5,30 +5,30 @@
<!--[if IE 8 ]> <html class="no-js ie8 oldie" lang="{$lang}"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]-->
<head>
- <meta charset="{$head_charset}"/>
+ <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="generator" content="Serendipity v.{$head_version}">
+ <meta name="viewport" content="width=device-width,initial-scale=1">
{if $template_option.webfonts == 'droid'}
- <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700"/>
+ <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700">
{elseif $template_option.webfonts == 'ptsans'}
- <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700,700italic"/>
+ <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700,700italic">
{elseif $template_option.webfonts == 'osans'}
- <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic"/>
+ <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic">
{elseif $template_option.webfonts == 'cabin'}
- <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Cabin:400,400italic,700,700italic"/>
+ <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Cabin:400,400italic,700,700italic">
{elseif $template_option.webfonts == 'ubuntu'}
- <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700,700italic"/>
+ <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700,700italic">
{/if}
- <link rel="stylesheet" href="{$head_link_stylesheet}"/>
+ <link rel="stylesheet" href="{$head_link_stylesheet}">
{if $template_option.userstyles == true}
- <link rel="stylesheet" href="{serendipity_getFile file="user.css"}"/>
+ <link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
{/if}
<script src="{serendipity_getFile file="js/modernizr-2.0.6.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"/>
+ <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}
- <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&amp;entry_id={$entry_id}"/>
+ <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&amp;entry_id={$entry_id}">
{/if}
{serendipity_hookPlugin hook="frontend_header"}
</head>
@@ -47,15 +47,15 @@
<form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get" role="search">
<div>
- <input type="hidden" name="serendipity[action]" value="search"/>
+ <input type="hidden" name="serendipity[action]" value="search">
<label for="serendipityQuickSearchTermField" class="visuallyhidden">{$CONST.QUICKSEARCH}</label>
- <input id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" type="search" placeholder="{$CONST.TWOK11_PLACE_SEARCH}" value=""/>
- <input id="searchsend" name="serendipity[searchButton]" type="submit" value="{$CONST.GO}"/>
+ <input id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" type="search" placeholder="{$CONST.TWOK11_PLACE_SEARCH}" value="">
+ <input id="searchsend" name="serendipity[searchButton]" type="submit" value="{$CONST.GO}">
</div>
</form>
{serendipity_hookPlugin hook="quicksearch_plugin" hookAll="true"}
{if $template_option.header_img}
- <img src="{$template_option.header_img}" alt=""/>
+ <img src="{$template_option.header_img}" alt="">
{/if}
</header>
{if $template_option.use_corenav}
View
@@ -1,4 +1,4 @@
Name: 2k11
Author: Matthias Mees, Veit Lehmann
-Date: 2012-01-27
+Date: 2012-01-28
Require Serendipity: 1.6
Oops, something went wrong.

0 comments on commit 76bb679

Please sign in to comment.