Templates fixed, TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index c1211721c6d2500835b13e028853c096cc178f9e..8ba7d29e70e6de6da72f535c9e679eedd6e1769b 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -41,10 +41,11 @@
 ./inc/extensions/ext-network.php:42: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
 ./inc/extensions/ext-network.php:99:           // @TODO network_type_handler is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
+./inc/extensions/ext-nickname.php:52:          // @TODO NOT NULL DEFAULT '' is bad practice, use NULL
 ./inc/extensions/ext-rallye.php:94:            // @TODO Fix config_rallye_prices to list_rallye_prices
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
-./inc/extensions-functions.php:2096:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:2132:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
 ./inc/extensions-functions.php:424:    // @TODO This redirect is still needed to register sql_patches! Please try to avoid it
 ./inc/extensions-functions.php:440:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:580:            // @TODO Extension is loaded, what next?
@@ -86,8 +87,8 @@
 ./inc/libs/rallye_functions.php:983:           // Load count @TODO Can't we rewrite this to our API?
 ./inc/libs/sponsor_functions.php:163:                                  // @TODO Rewrite this to API function
 ./inc/libs/sponsor_functions.php:436:                  // @TODO Rewrite this to API function
-./inc/libs/surfbar_functions.php:1676:         // @TODO This can be somehow rewritten
-./inc/libs/surfbar_functions.php:780:// @TODO Can't we use our new expression language instead of this ugly code?
+./inc/libs/surfbar_functions.php:1692:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:789:// @TODO Can't we use our new expression language instead of this ugly code?
 ./inc/libs/task_functions.php:253:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/theme_functions.php:94:     // @TODO Can't this be rewritten to an API function?
@@ -537,15 +538,14 @@
 ### ### template-warnings.log follows: ### ###
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): ID subid already defined in templates/de/html/member/member_add_subid.tpl, line: 13 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_reflink.tpl, line: 29 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): End tag : expected '>' in templates/de/html/member/member_list_subid_stats.tpl, line: 28 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_list_user_subid_row.tpl, line: 3 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_delete_user_subids_row.tpl, line: 4 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_edit_user_subids_row.tpl, line: 4 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 8 in 

diff --git a/templates/de/html/ext/ext_seo.tpl b/templates/de/html/ext/ext_seo.tpl
index 8f9df8c2d709fc6498520d6e3c1fb7da220908a1..5085b1bbef7241ba88198e2bd2b1948319e53d47 100644 (file)
--- a/templates/de/html/ext/ext_seo.tpl
+++ b/templates/de/html/ext/ext_seo.tpl
@@ -35,6 +35,6 @@ Ihnen nur das passende Werkzeug - diese Erweiterung - in die Hand geben.
 Sollte mal die eine oder andere Funktionalität nicht zur Besserung des
 SEOs f&uuml;hren und Sie wissen, wie es besser gehen kann, dann <a rel="external"
  target="_blank" title="Direkt-Link zum Support-Forum"
- href="http://forum.mxchange.org">kommen Sie bitte in&#39;s Support-Forum! Ich
-bin f&uuml;r jede Art von Feedback immer offen!
+ href="http://forum.mxchange.org">kommen Sie bitte in&#39;s Support-Forum</a>.
+Ich bin f&uuml;r jede Art von Feedback immer offen.
 </div>

diff --git a/templates/de/html/member/member_add_subid.tpl b/templates/de/html/member/member_add_subid.tpl
index 7f5d31d7b97e17154bb1cf0d2c398f01f2af2027..633e37bbccb8bb55fa8f4b52b3243a66f1647ba6 100644 (file)
--- a/templates/de/html/member/member_add_subid.tpl
+++ b/templates/de/html/member/member_add_subid.tpl
@@ -10,7 +10,7 @@
 
                <div class="table_row">
                        <label for="subid">{--MEMBER_ENTER_SUBID--}</label>
-                       <input type="text" class="form_field" id="subid" name="subid" size="30" />
+                       <input type="text" class="form_field" name="subid" size="30" />
                </div>
        </fieldset>
 

diff --git a/templates/de/html/member/member_list_subid_stats.tpl b/templates/de/html/member/member_list_subid_stats.tpl
index c8925e4a28c7bd75e9216dc34057cb1928c92cde..27e55f3b2a526713fa0c79c251b6afd944da810a 100644 (file)
--- a/templates/de/html/member/member_list_subid_stats.tpl
+++ b/templates/de/html/member/member_list_subid_stats.tpl
@@ -23,4 +23,4 @@
 
 <div class="notice">
        {--MEMBER_USER_SUBID_STATS_NOTICE--}
-</div
+</div>

diff --git a/templates/de/html/member/member_reflink.tpl b/templates/de/html/member/member_reflink.tpl
index 153caa15cc4852b4da86d3287613a41efcd4ea70..e3ab7d5fa89e7038dd30af13ea2615e8de93e690 100644 (file)
--- a/templates/de/html/member/member_reflink.tpl
+++ b/templates/de/html/member/member_reflink.tpl
@@ -26,7 +26,6 @@ $content[nickname_content]
        <strong>{%user,refid,convertNullToZero%}</strong> (<strong>{%user,nickname,fixEmptyContentToDashes=refid%}</strong>)
 </li>
 </div>
-</div>
 
 <div class="para">
        $content[extra_content]