Move/rename 2k15 to next

The name has been changed to protect the innocent. (Meaning the
users. From confusion.)

templates/2k15/UTF-8/lang_de.inc.php

@@ -1,15 +0,0 @@
-<?php
-// Theme-Optionen
-@define('TWOK15_INSTR', '<b>Hinweis:</b> 2k15 mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
-@define('TWOK15_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
-@define('TWOK15_USE_CORENAV', 'Globale Navigation einbinden?');
-@define('TWOK15_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
-@define('TWOK15_NOWEBFONT', 'Keinen Webfont einbinden');
-@define('TWOK15_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
-@define('TWOK15_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
-// Sprachkonstanten
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
-@define('TWOK15_PLACE_SEARCH', 'Suchbegriff(e)');
-@define('TWOK15_SEND_MAIL', 'Senden');
-@define('TWOK15_REPLYORIGIN', 'Antwort auf');

templates/2k15/UTF-8/lang_en.inc.php

@@ -1,15 +0,0 @@
-<?php
-// Theme options
-@define('TWOK15_INSTR', '<b>Hinweis:</b> While 2k15 may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
-@define('TWOK15_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
-@define('TWOK15_USE_CORENAV', 'Use global navigation?');
-@define('TWOK15_WEBFONTS', 'Use a webfont, hosted by Google?');
-@define('TWOK15_NOWEBFONT', 'Include no webfont');
-@define('TWOK15_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
-@define('TWOK15_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
-// Lang constants
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanent link for this comment');
-@define('TWOK15_PLACE_SEARCH', 'Search term(s)');
-@define('TWOK15_SEND_MAIL', 'Send');
-@define('TWOK15_REPLYORIGIN', 'Origin');

templates/2k15/lang_de.inc.php

@@ -1,15 +0,0 @@
-<?php
-// Theme-Optionen
-@define('TWOK15_INSTR', '<b>Hinweis:</b> 2k15 mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
-@define('TWOK15_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
-@define('TWOK15_USE_CORENAV', 'Globale Navigation einbinden?');
-@define('TWOK15_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
-@define('TWOK15_NOWEBFONT', 'Keinen Webfont einbinden');
-@define('TWOK15_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
-@define('TWOK15_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
-// Sprachkonstanten
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
-@define('TWOK15_PLACE_SEARCH', 'Suchbegriff(e)');
-@define('TWOK15_SEND_MAIL', 'Senden');
-@define('TWOK15_REPLYORIGIN', 'Antwort auf');

templates/2k15/lang_en.inc.php

@@ -1,15 +0,0 @@
-<?php
-// Theme options
-@define('TWOK15_INSTR', '<b>Hinweis:</b> While 2k15 may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
-@define('TWOK15_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
-@define('TWOK15_USE_CORENAV', 'Use global navigation?');
-@define('TWOK15_WEBFONTS', 'Use a webfont, hosted by Google?');
-@define('TWOK15_NOWEBFONT', 'Include no webfont');
-@define('TWOK15_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
-@define('TWOK15_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
-// Lang constants
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanent link for this comment');
-@define('TWOK15_PLACE_SEARCH', 'Search term(s)');
-@define('TWOK15_SEND_MAIL', 'Send');
-@define('TWOK15_REPLYORIGIN', 'Origin');

templates/next/UTF-8/lang_de.inc.php

@@ -0,0 +1,16 @@
+<?php
+// Theme-Optionen
+@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
+@define('NEXT_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
+@define('NEXT_USE_CORENAV', 'Globale Navigation einbinden?');
+@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
+@define('NEXT_NOWEBFONT', 'Keinen Webfont einbinden');
+@define('NEXT_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
+@define('NEXT_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
+// Sprachkonstanten
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
+@define('NEXT_PLACE_SEARCH', 'Suchbegriff(e)');
+@define('NEXT_SEND_MAIL', 'Senden');
+@define('NEXT_REPLYORIGIN', 'Antwort auf');
+@define('NEXT_NAVTEXT', 'Menü');

templates/next/UTF-8/lang_en.inc.php

@@ -0,0 +1,16 @@
+<?php
+// Theme options
+@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
+@define('NEXT_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
+@define('NEXT_USE_CORENAV', 'Use global navigation?');
+@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');
+@define('NEXT_NOWEBFONT', 'Include no webfont');
+@define('NEXT_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
+@define('NEXT_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
+// Lang constants
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanent link for this comment');
+@define('NEXT_PLACE_SEARCH', 'Search term(s)');
+@define('NEXT_SEND_MAIL', 'Send');
+@define('NEXT_REPLYORIGIN', 'Origin');
+@define('NEXT_NAVTEXT', 'Menu');

templates/next/comments.tpl

@@ -24,13 +24,13 @@
         {/if}
             <ul class="meta">
                 <li><time>{$comment.timestamp|formatTime:'%H:%M'}</time></li>
-                <li><a class="comment_source_trace" href="#c{$comment.id}" title="{$CONST.TWOK15_PLINK_TITLE}">{$CONST.TWOK15_PLINK_TEXT}</a></li>
+                <li><a class="comment_source_trace" href="#c{$comment.id}" title="{$CONST.NEXT_PLINK_TITLE}">{$CONST.NEXT_PLINK_TEXT}</a></li>
             {if $entry.is_entry_owner}
                 <li><a class="comment_source_ownerlink" href="{$comment.link_delete}" title="{$CONST.COMMENT_DELETE_CONFIRM|sprintf:$comment.id:$comment.author}">{$CONST.DELETE}</a></li>
             {/if}
         {if $template_option.refcomments == true}
             {if $comment.parent_id != '0'}
-                <li><a class="reply_origin" href="#c{$comment.parent_id}" title="{$CONST.TWOK15_REPLYORIGIN}: {$CONST.COMMENT} #c{$comment.parent_id}">{$CONST.TWOK15_REPLYORIGIN}</a></li>
+                <li><a class="reply_origin" href="#c{$comment.parent_id}" title="{$CONST.NEXT_REPLYORIGIN}: {$CONST.COMMENT} #c{$comment.parent_id}">{$CONST.NEXT_REPLYORIGIN}</a></li>
             {/if}
         {/if}
             {if $entry.allow_comments AND $comment.body != 'COMMENT_DELETED'}

templates/next/config.inc.php

@@ -41,10 +41,10 @@ if (is_array($required_fieldlist)) {
 
 $template_config = array(
     array(
-      'var'           => 'info2k15',
+      'var'           => 'infonext',
-      'name'          => 'info2k15',
+      'name'          => 'infonext',
       'type'          => 'custom',
-      'custom'        => TWOK15_INSTR,
+      'custom'        => NEXT_INSTR,
     ),
     array(
         'var' => 'date_format',
@@ -65,16 +65,16 @@ $template_config = array(
     ),
     array(
         'var' => 'header_img',
-        'name' => TWOK15_HEADER_IMG,
+        'name' => NEXT_HEADER_IMG,
         'type' => 'media',
         'default' => serendipity_getTemplateFile('header.jpg', 'serendipityHTTPPath', true)
     ),
     array(
         'var' => 'webfonts',
-        'name' => TWOK15_WEBFONTS,
+        'name' => NEXT_WEBFONTS,
         'type' => 'select',
         'default' => 'none',
-        'select_values' => array('none' => TWOK15_NOWEBFONT,
+        'select_values' => array('none' => NEXT_NOWEBFONT,
                                 'osans' => 'Open Sans',
                                 'ssans' => 'Source Sans Pro',
                                 'rsans' => 'Roboto',
@@ -84,19 +84,19 @@ $template_config = array(
     ),
     array(
         'var' => 'userstyles',
-        'name' => TWOK15_USERSTYLES,
+        'name' => NEXT_USERSTYLES,
         'type' => 'boolean',
         'default' => false
     ),
     array(
         'var' => 'refcomments',
-        'name' => TWOK15_REFCOMMENTS,
+        'name' => NEXT_REFCOMMENTS,
         'type' => 'boolean',
         'default' => false
     ),
     array(
         'var' => 'use_corenav',
-        'name' => TWOK15_USE_CORENAV,
+        'name' => NEXT_USE_CORENAV,
         'type' => 'boolean',
         'default' => true
     )

templates/next/index.tpl

@@ -49,7 +49,7 @@
 
         <form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get" role="search">
             <input type="hidden" name="serendipity[action]" value="search">
-            <input id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" type="search" placeholder="{$CONST.TWOK15_PLACE_SEARCH}" value="">
+            <input id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" type="search" placeholder="{$CONST.NEXT_PLACE_SEARCH}" value="">
             <label for="serendipityQuickSearchTermField"><span class="icon-search" aria-hidden="true"></span><span class="fallback-text">{$CONST.QUICKSEARCH}</span></label>
             <input id="searchsend" name="serendipity[searchButton]" type="submit" value="{$CONST.GO}">
         </form>
@@ -61,7 +61,7 @@
     </div>
     {/if}
     <div id="navbar">
-        <a id="open-nav" class="nav-toggle" href="#site-nav"><span class="icon-menu" aria-hidden="true"></span><span class="fallback-text">Navigation</span></a>
+        <a id="open-nav" class="nav-toggle" href="#site-nav"><span class="icon-menu" aria-hidden="true"></span><span class="fallback-text">{$CONST.NEXT_NAVTEXT}</span></a>
 
         <nav id="site-nav" class="nav-collapse">
             <ul>{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>
@@ -83,7 +83,7 @@
 {/if}
 
     <footer id="colophon" class="clearfix">
-        <p lang="en">Powered by <a href="http://s9y.org">Serendipity</a> <abbr title="and">&amp;</abbr> the <i>2k15</i> theme.</p>
+        <p lang="en">Powered by <a href="http://s9y.org">Serendipity</a> <abbr title="and">&amp;</abbr> the <i>Next</i> theme.</p>
     </footer>
 
     <script src="{serendipity_getFile file="scripts/master.js"}"></script>

templates/next/info.txt

@@ -1,4 +1,4 @@
-Name: 2k15
+Name: Next
 Author: Matthias Mees, mm@yellowled.de
 Date: 2015-02-10
 Require Serendipity: 2.0

templates/next/lang_de.inc.php

@@ -0,0 +1,16 @@
+<?php
+// Theme-Optionen
+@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
+@define('NEXT_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
+@define('NEXT_USE_CORENAV', 'Globale Navigation einbinden?');
+@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
+@define('NEXT_NOWEBFONT', 'Keinen Webfont einbinden');
+@define('NEXT_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
+@define('NEXT_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
+// Sprachkonstanten
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
+@define('NEXT_PLACE_SEARCH', 'Suchbegriff(e)');
+@define('NEXT_SEND_MAIL', 'Senden');
+@define('NEXT_REPLYORIGIN', 'Antwort auf');
+@define('NEXT_NAVTEXT', 'Menü');

templates/next/lang_en.inc.php

@@ -0,0 +1,16 @@
+<?php
+// Theme options
+@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
+@define('NEXT_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
+@define('NEXT_USE_CORENAV', 'Use global navigation?');
+@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');
+@define('NEXT_NOWEBFONT', 'Include no webfont');
+@define('NEXT_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
+@define('NEXT_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
+// Lang constants
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanent link for this comment');
+@define('NEXT_PLACE_SEARCH', 'Search term(s)');
+@define('NEXT_SEND_MAIL', 'Send');
+@define('NEXT_REPLYORIGIN', 'Origin');
+@define('NEXT_NAVTEXT', 'Menu');

templates/next/plugin_contactform.tpl

@@ -40,7 +40,7 @@
             {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry}
 
             <div class="form_buttons">
-                <input id="serendipity_submit" type="submit" name="serendipity[submit]" value="{$CONST.TWOK15_SEND_MAIL}">
+                <input id="serendipity_submit" type="submit" name="serendipity[submit]" value="{$CONST.NEXT_SEND_MAIL}">
             </div>
         </form>
     </div>