Updated 2k11 to v1.0.3.

This commit is contained in:
Matthias Mees 2012-01-01 17:08:37 +01:00
parent 7641203b2e
commit 2ca2410843
10 changed files with 66 additions and 33 deletions

View File

@ -16,3 +16,7 @@
@define('TWOK11_PLACE_URL', 'z.B. http://example.org');
@define('TWOK11_PLACE_MESSAGE', 'Was gibt es zu sagen?');
@define('TWOK11_SEND_MAIL', 'Senden');
@define('TWOK11_TWEET_THIS', 'Artikel via Twitter teilen');
@define('TWOK11_DENT_THIS', 'Artikel via Identica teilen');
@define('TWOK11_SHORT_URL', 'Kurz-URL');
@define('TWOK11_SHORT_URL_HINT', 'Dieser Link ist nicht aktiv. Er enthält die Kurz-URL zu diesem Eintrag. Sie können diese URL benutzen, um diesen Eintrag zu verlinken. Um den Link zu kopieren, klicken Sie ihn mit der rechten Maustaste an und wählen "Verknüpfung kopieren" im Internet Explorer oder "Linkadresse kopieren" in Mozilla/Firefox.');

View File

@ -16,3 +16,7 @@
@define('TWOK11_PLACE_URL', 'i.e. 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');
@define('TWOK11_DENT_THIS', 'Share article on Identica');
@define('TWOK11_SHORT_URL', 'Short URL');
@define('TWOK11_SHORT_URL_HINT', 'This link is not meant to be clicked. It contains the short URL for this entry. You can use this URL to link to this entry. To copy the link, right click and select "Copy Shortcut" in Internet Explorer or "Copy Link Location" in Mozilla.');

View File

@ -16,13 +16,15 @@ $template_config = array(
'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',
'%d-%m-%y' => '%d-%m-%y',
'%m-%d-%y' => '%m-%d-%y',
'%a %d-%m-%y' => '%a %d-%m-%y',
'%a %m-%d-%y' => '%a %m-%d-%y',
'%b %d' => '%b %d',
"%b %d '%y" => "%b %d '%y")
'%d.%m.%y' => '%d.%m.%y',
'%d.%m.%Y' => '%d.%m.%Y',
'%A, %m/%d/%Y' => '%A, %m/%d/%Y',
'%a, %m/%d/%y' => '%a, %m/%d/%y',
'%m/%d/%y' => '%m/%d/%y',
'%m/%d/%Y' => '%m/%d/%Y',
'%Y-%m-%d' => '%Y-%m-%d')
),
array(
'var' => 'header_img',

View File

@ -5,7 +5,7 @@
<header>
<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></span>
<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>
</header>
<div class="clearfix content serendipity_entry_body">
@ -29,8 +29,14 @@
{if $entry.has_comments}
<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 $entry.is_entry_owner and not $is_preview}
| <a href="{$entry.link_edit}">{$CONST.EDIT_ENTRY}</a>
{if $entry.url_tweetthis}
| <a href="{$entry.url_tweetthis}" title="{$CONST.TWOK11_TWEET_THIS}">Twitter</a>
{/if}
{if $entry.url_dentthis}
| <a href="{$entry.url_dentthis}" title="{$CONST.TWOK11_DENT_THIS}">Identica</a>
{/if}
{if $entry.url_shorturl}
| <a href="{$entry.url_shorturl}" title="{$CONST.TWOK11_SHORT_URL_HINT}" class="short-url">{$CONST.TWOK11_SHORT_URL}</a>
{/if}
{$entry.add_footer}
{$entry.plugin_display_dat}

View File

@ -45,11 +45,11 @@
<p>{$blogDescription}</p>
</div>
<form id="search" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get" role="search">
<form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get" role="search">
<div>
<input type="hidden" name="serendipity[action]" value="search"/>
<label for="searchterm" class="visuallyhidden">{$CONST.QUICKSEARCH}</label>
<input id="searchterm" name="serendipity[searchTerm]" type="search" placeholder="{$CONST.TWOK11_PLACE_SEARCH}" value=""/>
<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}"/>
</div>
</form>

View File

@ -1,4 +1,4 @@
Name: 2k11
Author: Matthias Mees, Veit Lehmann
Date: 2011-12-16
Date: 2012-01-01
Require Serendipity: 1.6

View File

@ -13,10 +13,10 @@ jQuery(document).ready(function($) {
header: '#banner',
footer: '#colophon'
});
// Disable trackback url link
$('#trackback_url>a').click(function() {
var trackbackMsg = $(this).attr('title');
alert(trackbackMsg);
// Disable trackback + short url links
$('#trackback_url>a,.short-url').click(function() {
var linkMsg = $(this).attr('title');
alert(linkMsg);
return false;
});
// Comment reply

View File

@ -16,3 +16,7 @@
@define('TWOK11_PLACE_URL', 'z.B. http://example.org');
@define('TWOK11_PLACE_MESSAGE', 'Was gibt es zu sagen?');
@define('TWOK11_SEND_MAIL', 'Senden');
@define('TWOK11_TWEET_THIS', 'Artikel via Twitter teilen');
@define('TWOK11_DENT_THIS', 'Artikel via Identica teilen');
@define('TWOK11_SHORT_URL', 'Kurz-URL');
@define('TWOK11_SHORT_URL_HINT', 'Dieser Link ist nicht aktiv. Er enthält die Kurz-URL zu diesem Eintrag. Sie können diese URL benutzen, um diesen Eintrag zu verlinken. Um den Link zu kopieren, klicken Sie ihn mit der rechten Maustaste an und wählen "Verknüpfung kopieren" im Internet Explorer oder "Linkadresse kopieren" in Mozilla/Firefox.');

View File

@ -16,3 +16,7 @@
@define('TWOK11_PLACE_URL', 'i.e. 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');
@define('TWOK11_DENT_THIS', 'Share article on Identica');
@define('TWOK11_SHORT_URL', 'Short URL');
@define('TWOK11_SHORT_URL_HINT', 'This link is not meant to be clicked. It contains the short URL for this entry. You can use this URL to link to this entry. To copy the link, right click and select "Copy Shortcut" in Internet Explorer or "Copy Link Location" in Mozilla.');

View File

@ -230,7 +230,7 @@ audio, video,
#trackback_url,
.manage_comments,
.plugin_comment_wrap,
p.whiteline, #search div,
p.whiteline, #searchform div,
.serendipity_entry .plainList,
#page, #primary-nav,
.serendipity_calendar,
@ -329,9 +329,9 @@ fieldset,
margin-bottom: 2.1429em;
}
#search div { padding: 0 1em; }
#searchform div { padding: 0 1em; }
#searchterm,
#serendipityQuickSearchTermField,
#serendipity_comment input[type=text],
#serendipity_comment input[type=email],
#serendipity_comment input[type=url] { width: 97%; }
@ -702,6 +702,15 @@ pre .geshi {
.serendipity_freetag_taglist_related { font-size: 1.25em; }
#twitter_update_list { list-style: none; }
#twitter_update_list li { margin: 0 0 1em; }
.twitter_update_time {
display: block;
text-align: right;
}
/* Helper classes */
.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
@ -715,7 +724,7 @@ pre .geshi {
/* Media queries */
@media only screen and (min-width: 481px) {
#searchterm { max-width: 15em; }
#serendipityQuickSearchTermField { max-width: 15em; }
#serendipity_comment input[type=text],
#serendipity_comment input[type=email],
@ -798,15 +807,15 @@ pre .geshi {
#identity h1 { margin: 1em 0 0; }
#search div { margin-top: 4.4em; }
#searchform div { margin-top: 4.4em; }
#identity p, #search div { margin-bottom: 1.5em; }
#identity p, #searchform div { margin-bottom: 1.5em; }
#primary-nav { margin-bottom: 2em; }
#banner>img { display: block; }
#identity, #search,
#identity, #searchform,
#content,
#sidebar_left,
#sidebar_right {
@ -816,7 +825,7 @@ pre .geshi {
#identity,
#content { width: 62%; }
#search,
#searchform,
#sidebar_left,
#sidebar_right { width: 38%; }
.col2l #sidebar_left { left: -62%; }
@ -824,13 +833,13 @@ pre .geshi {
.ie7 #identity,
.ie7 #content { width: 61.9%; }
.ie7 #search,
.ie7 #searchform,
.ie7 #sidebar_left,
.ie7 #sidebar_right { width: 37.9%; }
.ie7 .col2l #sidebar_left { left: -61.9%; }
.ie7 .col2l #content { left: 37.9%; }
.col2l #search { text-align: right; }
.col2l #searchform { text-align: right; }
#sidebar_left,
#sidebar_right { padding: 0; }
@ -852,8 +861,8 @@ pre .geshi {
#sidebar_right .sidebar_plugin,
.ie7 #sidebar_right .sidebar_plugin { margin: 0 1em 2em 2em; }
#search div,
.ie7 #search div { padding: 0 1em 0 2em; }
#searchform div,
.ie7 #searchform div { padding: 0 1em 0 2em; }
.commentlevel-1 { margin-left: 1em; }
.commentlevel-2 { margin-left: 2em; }
@ -870,12 +879,12 @@ pre .geshi {
#identity h1 { padding: 0 1em; }
#identity p,
#search div { padding: 0 2em; }
#searchform div { padding: 0 2em; }
#primary-nav ul { margin: 0 1em; }
.col3 #content { width: 50%; }
.col3 #search,
.col3 #searchform,
.col3 #sidebar_left,
.col3 #sidebar_right { width: 25%; }
.col3 #identity { width: 75%; }
@ -883,7 +892,7 @@ pre .geshi {
.col3 #sidebar_left { left: -50%; }
.ie7 .col3 #content { width: 49.9%; }
.ie7 .col3 #search,
.ie7 .col3 #searchform,
.ie7 .col3 #sidebar_left,
.ie7 .col3 #sidebar_right { width: 24.9%; }
.ie7 .col3 #identity { width: 74.9%; }
@ -925,7 +934,7 @@ pre .geshi {
p, h2, h3 { orphans: 3; widows: 3; }
h2, h3 { page-break-after: avoid; }
#search, #primary-nav,
#searchform, #primary-nav,
#sidebar_left, #sidebar_right,
#colophon, audio, video,
.serendipity_entry>footer,