diff --git a/templates/2k11/UTF-8/lang_de.inc.php b/templates/2k11/UTF-8/lang_de.inc.php index a7b1269f..6294d746 100644 --- a/templates/2k11/UTF-8/lang_de.inc.php +++ b/templates/2k11/UTF-8/lang_de.inc.php @@ -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.'); diff --git a/templates/2k11/UTF-8/lang_en.inc.php b/templates/2k11/UTF-8/lang_en.inc.php index 54ee3161..5094e567 100644 --- a/templates/2k11/UTF-8/lang_en.inc.php +++ b/templates/2k11/UTF-8/lang_en.inc.php @@ -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.'); diff --git a/templates/2k11/config.inc.php b/templates/2k11/config.inc.php index 0f50e7d8..f3a4c864 100644 --- a/templates/2k11/config.inc.php +++ b/templates/2k11/config.inc.php @@ -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', diff --git a/templates/2k11/entries.tpl b/templates/2k11/entries.tpl index 18359dff..6eff151b 100644 --- a/templates/2k11/entries.tpl +++ b/templates/2k11/entries.tpl @@ -5,7 +5,7 @@

{$entry.title}

- {$CONST.POSTED_BY} {$entry.author} {$CONST.ON} + {$CONST.POSTED_BY} {$entry.author} {$CONST.ON} {if $entry.is_entry_owner and not $is_preview} | {$CONST.EDIT_ENTRY}{/if}
@@ -29,8 +29,14 @@ {if $entry.has_comments} {$entry.comments} {$entry.label_comments} {/if} - {if $entry.is_entry_owner and not $is_preview} - | {$CONST.EDIT_ENTRY} + {if $entry.url_tweetthis} + | Twitter + {/if} + {if $entry.url_dentthis} + | Identica + {/if} + {if $entry.url_shorturl} + | {$CONST.TWOK11_SHORT_URL} {/if} {$entry.add_footer} {$entry.plugin_display_dat} diff --git a/templates/2k11/index.tpl b/templates/2k11/index.tpl index c918e1dc..b7389877 100644 --- a/templates/2k11/index.tpl +++ b/templates/2k11/index.tpl @@ -45,11 +45,11 @@

{$blogDescription}

- diff --git a/templates/2k11/info.txt b/templates/2k11/info.txt index 21a9355d..8ad961dc 100644 --- a/templates/2k11/info.txt +++ b/templates/2k11/info.txt @@ -1,4 +1,4 @@ Name: 2k11 Author: Matthias Mees, Veit Lehmann -Date: 2011-12-16 +Date: 2012-01-01 Require Serendipity: 1.6 diff --git a/templates/2k11/js/2k11.js b/templates/2k11/js/2k11.js index d9ae8bdf..4fea4525 100644 --- a/templates/2k11/js/2k11.js +++ b/templates/2k11/js/2k11.js @@ -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 diff --git a/templates/2k11/lang_de.inc.php b/templates/2k11/lang_de.inc.php index 36f19a75..96dc62fb 100644 --- a/templates/2k11/lang_de.inc.php +++ b/templates/2k11/lang_de.inc.php @@ -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.'); diff --git a/templates/2k11/lang_en.inc.php b/templates/2k11/lang_en.inc.php index 54ee3161..5094e567 100644 --- a/templates/2k11/lang_en.inc.php +++ b/templates/2k11/lang_en.inc.php @@ -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.'); diff --git a/templates/2k11/style.css b/templates/2k11/style.css index 280ebcb1..6192496c 100644 --- a/templates/2k11/style.css +++ b/templates/2k11/style.css @@ -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,