From b57b0e69d9b302af10c923b8d1b69004e2bdb12c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 24 Nov 2012 22:52:22 +0000 Subject: [PATCH] Some HTML fixes, ext-sql_patches downgraded (!): - Extension ext-sql_patches is now downgraded to 0.9.4 as update 0.9.5 has been moved into 0.9.4 - Fixed some HTML errors - Added missing legend tag (MEMBER_SURFBAR_EDIT_URL_LEGEND) - TODOs.txt updated --- DOCS/TODOs.txt | 4 -- inc/extensions/ext-sql_patches.php | 12 ++--- inc/language/surfbar_de.php | 3 +- inc/language/user_de.php | 2 +- .../de/html/admin/admin_admins_mails_list.tpl | 2 +- .../admin/admin_delete_user_subids_row.tpl | 2 +- .../html/admin/admin_edit_user_subids_row.tpl | 2 +- .../html/admin/admin_list_user_subid_row.tpl | 2 +- .../admin/admin_list_user_subid_stats.tpl | 47 ++++++++++--------- .../member/member_book_surfbar_dynamic.tpl | 2 +- .../member/member_book_surfbar_static.tpl | 2 +- .../member_surfbar_edit_action_form.tpl | 9 ++-- 12 files changed, 42 insertions(+), 47 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 4b57be8a7c..ec42d004cf 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -332,14 +332,10 @@ PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/ 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 : 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 PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_main_footer.tpl, line: 9 in -PHP Warning: DOMDocument::loadHTMLFile(): End tag : expected '>' in templates/de/html/admin/admin_list_user_subid_stats.tpl, line: 32 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index c548359f71..5c16659989 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.9.5'); +setThisExtensionVersion('0.9.4'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5')); +setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -978,16 +978,10 @@ PRIMARY KEY (`server_name_id`) case '0.9.4': // SQL queries for v0.9.4 addAdminMenuSql('setup', 'list_referral_levels', 'Referral-Ebenen', 'Erlaubt das Auflisten, hinzufügen, ändern und löschen von Referral-Ebenen. Seien Sie beim Löschen vorsichtig, da deren Id-Nummern zum Verknüpfen verwendet werden. Sollten Sie also eine Ebene löschen, in der Mitglieder {OPEN_CONFIG}POINTS{CLOSE_CONFIG} haben sollten, sind diese verloren.', 15); - - // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Auflisten (usw.) von Referral-Ebenen ausgelagert in eigenen Menüpunkt."); - break; - - case '0.9.5': // SQL queries for v0.9.5 addExtensionChangeTableColumnSql('refdepths', 'percents', 'percents', 'FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000'); // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Referral-Prozente dürfen nun auch 5 Stellen hinter dem Komma haben."); + setExtensionUpdateNotes("Auflisten (usw.) von Referral-Ebenen ausgelagert in eigenen Menüpunkt. Referral-Prozente dürfen nun auch 5 Stellen hinter dem Komma haben."); break; } // END - switch break; diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index c1298e2506..13bc86fd34 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -200,7 +200,8 @@ addMessages(array( 'MEMBER_SURFBAR_DELETE_URL_NOTICE' => "Hinweis: Irrtümlich gelöschte URLs können nur durch unsere Administratoren wiederhergestellt werden.", // Member - legends - 'MEMBER_BOOK_SURFBAR_URL_DATA_LEGEND' => "Geben Sie die Daten zu Ihrer URL ein:", + 'MEMBER_BOOK_SURFBAR_URL_DATA_LEGEND' => "Geben Sie die Daten zu Ihrer URL ein", + 'MEMBER_SURFBAR_EDIT_URL_LEGEND' => "Ändern der URL-Daten", // Subject lines for admins 'ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT' => "[Besuchertausch:] URL hinzugefügt durch Admin", diff --git a/inc/language/user_de.php b/inc/language/user_de.php index 1b70bd183c..c16ad05645 100644 --- a/inc/language/user_de.php +++ b/inc/language/user_de.php @@ -192,7 +192,7 @@ addMessages(array( // Admin - config subids 'ADMIN_CONFIG_USER_SUBID_TITLE' => "Einstellungen zu Sub-Id-Tracking", - 'ADMIN_CONFIG_USER_SUBID_AUTOPURGE_LEGEND' => "Bereinigung des Sub-Id-Logbuchs:", + 'ADMIN_CONFIG_USER_SUBID_AUTOPURGE_LEGEND' => "Bereinigung des Sub-Id-Logbuchs", 'ADMIN_CONFIG_USER_SUBID_STUFF_AUTOPURGE' => "Soll das Logbuch für Sub-Id-Tracking bereinigt werden?", 'ADMIN_CONFIG_USER_SUBID_STUFF_AUTOPURGE_SINCE' => "Wie lange sollen alte Logbucheinträge bestehen bleiben?", diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl index f533137a67..1bd75e7724 100644 --- a/templates/de/html/admin/admin_admins_mails_list.tpl +++ b/templates/de/html/admin/admin_admins_mails_list.tpl @@ -7,7 +7,7 @@ - + {--ID_SELECT--} diff --git a/templates/de/html/admin/admin_delete_user_subids_row.tpl b/templates/de/html/admin/admin_delete_user_subids_row.tpl index 0aa903c564..d9fa7ee6a6 100644 --- a/templates/de/html/admin/admin_delete_user_subids_row.tpl +++ b/templates/de/html/admin/admin_delete_user_subids_row.tpl @@ -1,7 +1,7 @@ $content[id] - + {--SUBID_VALUE--} diff --git a/templates/de/html/admin/admin_edit_user_subids_row.tpl b/templates/de/html/admin/admin_edit_user_subids_row.tpl index fa72be2207..0c59f7088c 100644 --- a/templates/de/html/admin/admin_edit_user_subids_row.tpl +++ b/templates/de/html/admin/admin_edit_user_subids_row.tpl @@ -1,7 +1,7 @@ $content[id] - + {--ADMIN_CHANGE_USER_SUBID--} diff --git a/templates/de/html/admin/admin_list_user_subid_row.tpl b/templates/de/html/admin/admin_list_user_subid_row.tpl index 234d91b0e2..0526d5ceb7 100644 --- a/templates/de/html/admin/admin_list_user_subid_row.tpl +++ b/templates/de/html/admin/admin_list_user_subid_row.tpl @@ -1,6 +1,6 @@ - + {%pipe,generateUserProfileLink=$content[userid]%} diff --git a/templates/de/html/admin/admin_list_user_subid_stats.tpl b/templates/de/html/admin/admin_list_user_subid_stats.tpl index 975f86e853..e306697e5d 100644 --- a/templates/de/html/admin/admin_list_user_subid_stats.tpl +++ b/templates/de/html/admin/admin_list_user_subid_stats.tpl @@ -1,31 +1,34 @@
{%form,formMethodPost=modules.php?module=admin&what=list_user_subid&do=stats&userid=$content[userid]&id=$content[id]%} - - - - - - - - - - - - $content[rows] - - - + + + + + + + + + + + + + +$content[rows] + + + +
- {--ADMIN_LIST_USER_SUBID_STATS_TITLE--} -
{--ID_SELECT--}{--SUBID_VALUE--}{--REFERRER_URL--}{--REMOTE_IP--}{--USER_AGENT--}{--ENTRY_ADDED--}
- - - -
+ {--ADMIN_LIST_USER_SUBID_STATS_TITLE--} +
{--ID_SELECT--}{--SUBID_VALUE--}{--REFERRER_URL--}{--REMOTE_IP--}{--USER_AGENT--}{--ENTRY_ADDED--}
+ + + +
{%form_close%}
{--ADMIN_USER_SUBID_STATS_NOTICE--} -
diff --git a/templates/de/html/member/member_book_surfbar_dynamic.tpl b/templates/de/html/member/member_book_surfbar_dynamic.tpl index 859b1e786a..081b7c2e7c 100644 --- a/templates/de/html/member/member_book_surfbar_dynamic.tpl +++ b/templates/de/html/member/member_book_surfbar_dynamic.tpl @@ -25,7 +25,7 @@
-
diff --git a/templates/de/html/member/member_book_surfbar_static.tpl b/templates/de/html/member/member_book_surfbar_static.tpl index 951939d00a..b2c67e14da 100644 --- a/templates/de/html/member/member_book_surfbar_static.tpl +++ b/templates/de/html/member/member_book_surfbar_static.tpl @@ -25,7 +25,7 @@
-
diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl index 784ddd63d6..3dc881d277 100644 --- a/templates/de/html/member/member_surfbar_edit_action_form.tpl +++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl @@ -6,24 +6,25 @@
+ {--MEMBER_SURFBAR_EDIT_URL_LEGEND--}
-
-
-
-
-- 2.39.5