From 550f270a0027e67a0eb19d99fbe54d6045696a0b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Apr 2007 15:27:40 +0000 Subject: #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624 prosilver adjustments for important announcements in ucp - #9995 MCP fixes for user notes/warnings - #9981 Preserving imageset values on save/edit find a member link for Mass PM's - #9925 syndicate window.onload events where necessary - #9878 Duplicate topics in forums with announcements - #9840 Email template for forced re-activation - #9808 Topic pagination adjustment - #9763 Changed compose message layout in UCP - #9706, #9702 Fixed inline attachment font size (hopefully) git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/editor.js | 14 +++-- phpBB/styles/prosilver/template/mcp_header.html | 2 +- .../styles/prosilver/template/mcp_notes_user.html | 26 ++++---- phpBB/styles/prosilver/template/mcp_topic.html | 17 ++++-- phpBB/styles/prosilver/template/mcp_warn_post.html | 24 ++++---- phpBB/styles/prosilver/template/mcp_warn_user.html | 26 ++++---- .../styles/prosilver/template/memberlist_view.html | 1 + .../styles/prosilver/template/overall_header.html | 21 +++++++ .../prosilver/template/posting_attach_body.html | 2 +- .../styles/prosilver/template/posting_editor.html | 70 +++++++++++++--------- .../styles/prosilver/template/posting_preview.html | 2 +- .../styles/prosilver/template/search_results.html | 4 +- phpBB/styles/prosilver/template/simple_header.html | 27 +++++++++ phpBB/styles/prosilver/template/styleswitcher.js | 9 ++- phpBB/styles/prosilver/template/ucp_header.html | 35 +++++++---- .../prosilver/template/ucp_main_bookmarks.html | 4 +- .../styles/prosilver/template/ucp_main_front.html | 7 ++- .../prosilver/template/ucp_main_subscribed.html | 4 +- .../prosilver/template/ucp_prefs_personal.html | 2 +- .../styles/prosilver/template/viewonline_body.html | 9 +++ phpBB/styles/prosilver/theme/colours.css | 3 +- phpBB/styles/prosilver/theme/content.css | 19 ++++++ phpBB/styles/prosilver/theme/cp.css | 1 + phpBB/styles/subsilver2/template/editor.js | 10 ++-- phpBB/styles/subsilver2/template/mcp_forum.html | 2 +- .../styles/subsilver2/template/search_results.html | 2 +- .../subsilver2/template/ucp_main_bookmarks.html | 2 +- .../styles/subsilver2/template/ucp_main_front.html | 4 +- .../subsilver2/template/ucp_main_subscribed.html | 6 +- 29 files changed, 240 insertions(+), 115 deletions(-) (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 2f490f4746..380394fc1e 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -16,7 +16,7 @@ var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == - var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); var baseHeight; -window.onload = initInsertions; +onload_functions.push('initInsertions()'); /** * Shows the help messages in the helpline window @@ -33,18 +33,20 @@ function helpline(help) function initInsertions() { var doc; - if(document.forms[form_name]) + + if( document.forms[form_name]) { - doc = document; - } + doc = document; + } else { doc = opener.document; } + var textarea = doc.forms[form_name].elements[text_name]; if (is_ie && typeof(baseHeight) != 'number') - { - textarea.focus(); + { + textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; document.body.focus(); } diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html index af53ce10e2..7c3f711cbd 100644 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ b/phpBB/styles/prosilver/template/mcp_header.html @@ -13,7 +13,7 @@
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index e9306607a0..7e34ee2702 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -9,18 +9,20 @@

{USERNAME}{USERNAME}

-
-
{AVATAR_IMG}
-
- -
-
-
{L_RANK}:
{RANK_TITLE}
-
{L_RANK}:
{RANK_IMG}
-
{L_JOINED}:
{JOINED}
-
{L_TOTAL_POSTS}:
{POSTS}
-
{L_WARNINGS}:
{WARNINGS}
-
+
+
+
{AVATAR_IMG}
+
+ +
+
+
{L_RANK}:
{RANK_TITLE}
+
{L_RANK}:
{RANK_IMG}
+
{L_JOINED}:
{JOINED}
+
{L_TOTAL_POSTS}:
{POSTS}
+
{L_WARNINGS}:
{WARNINGS}
+
+
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 511aaf587b..f828ffa72e 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -4,28 +4,33 @@
@@ -141,8 +146,8 @@ window.onload = subPanels; - - + +  
{L_MARK_ALL} :: {L_UNMARK_ALL}
diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index afc5ebb178..e887a246e8 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -9,18 +9,20 @@

{USERNAME}{USERNAME}

-
-
{AVATAR_IMG}
-
+
+
+
{AVATAR_IMG}
+
-
-
-
{L_RANK}:
{RANK_TITLE}
-
{L_RANK}:
{RANK_IMG}
-
{L_JOINED}:
{JOINED}
-
{L_TOTAL_POSTS}:
{POSTS}
-
{L_WARNINGS}:
{WARNINGS}
-
+
+
+
{L_RANK}:
{RANK_TITLE}
+
{L_RANK}:
{RANK_IMG}
+
{L_JOINED}:
{JOINED}
+
{L_TOTAL_POSTS}:
{POSTS}
+
{L_WARNINGS}:
{WARNINGS}
+
+
diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index 3157ab8c5e..7604ceb868 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -9,18 +9,20 @@

{USERNAME}{USERNAME}

-
-
{AVATAR_IMG}
-
- -
-
-
{L_RANK}:
{RANK_TITLE}
-
{L_RANK}:
{RANK_IMG}
-
{L_JOINED}:
{JOINED}
-
{L_TOTAL_POSTS}:
{POSTS}
-
{L_WARNINGS}:
{WARNINGS}
-
+
+
+
{AVATAR_IMG}
+
+ +
+
+
{L_RANK}:
{RANK_TITLE}
+
{L_RANK}:
{RANK_IMG}
+
{L_JOINED}:
{JOINED}
+
{L_TOTAL_POSTS}:
{POSTS}
+
{L_WARNINGS}:
{WARNINGS}
+
+
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index e8db269aaa..b6433a1f8a 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -27,6 +27,7 @@
{L_USER_IS_INACTIVE}:
{USER_INACTIVE_REASON}
{L_LOCATION}:
{LOCATION}
+
{L_AGE}:
{AGE}
{L_OCCUPATION}:
{OCCUPATION}
{L_INTERESTS}:
{INTERESTS}
{L_USERGROUPS}:
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 0d6d5f3cd0..b706b73172 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -32,6 +32,8 @@ var per_page = '{PER_PAGE}'; var base_url = '{BASE_URL}'; var style_cookie = 'phpBBstyle'; + var onload_functions = new Array(); + var onunload_functions = new Array(); if ({S_NEW_PM}) @@ -51,6 +53,25 @@ return false; } + /** + * New function for handling multiple calls to window.onload and window.unload by pentapenguin + */ + window.onload = function() + { + for (i = 0; i <= onload_functions.length; i++) + { + eval(onload_functions[i]); + } + } + + window.onunload = function() + { + for (i = 0; i <= onunload_functions.length; i++) + { + eval(onunload_functions[i]); + } + } + // ]]> diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index e62af6271f..d39405487d 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -13,7 +13,7 @@
-
+
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 90c4c4911d..4c675e4cf8 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -4,38 +4,52 @@
-
-

{L_FIND_USERNAME}
+ -
- - {to_recipient.NAME}{to_recipient.NAME_FULL}  -   - -
+
+
+
+ +
+ {to_recipient.NAME}{to_recipient.NAME_FULL}  +   + +
+
-
- - - - - - -
-
- - -
-
-
- - {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}  -   - -
+
+
+
+ +
+ {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}  +   + +
+
-
+
+
+
{L_FIND_USERNAME}
+
+
+
+ +
+

{L_FIND_USERNAME}
+ +
+ +
+ {to_recipient.NAME}{to_recipient.NAME_FULL}  +   + +
+ + +
+
diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html index a2340256bc..f2a5d635dc 100644 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ b/phpBB/styles/prosilver/template/posting_preview.html @@ -31,7 +31,7 @@
{PREVIEW_MESSAGE}
- +
{L_ATTACHMENTS}
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index c61e3db3a5..c9cb862037 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -59,14 +59,14 @@ {searchresults.UNAPPROVED_IMG} {REPORTED_IMG}
{searchresults.PAGINATION} - {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {searchresults.FIRST_POST_TIME} {searchresults.NEWEST_POST_IMG} + {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {searchresults.FIRST_POST_TIME} {NEWEST_POST_IMG} {L_IN} {searchresults.FORUM_TITLE} ({L_GLOBAL})
{searchresults.TOPIC_REPLIES}
{searchresults.TOPIC_VIEWS}
{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} - {searchresults.LAST_POST_IMG}
{L_POSTED_ON_DATE} {searchresults.LAST_POST_TIME}
 + {LAST_POST_IMG}
{L_POSTED_ON_DATE} {searchresults.LAST_POST_TIME}
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index b38dd623c3..40bcc8bbf4 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -14,6 +14,33 @@ {META} {SITENAME} • {PAGE_TITLE} + diff --git a/phpBB/styles/prosilver/template/styleswitcher.js b/phpBB/styles/prosilver/template/styleswitcher.js index 8768ac365b..c68215d13f 100644 --- a/phpBB/styles/prosilver/template/styleswitcher.js +++ b/phpBB/styles/prosilver/template/styleswitcher.js @@ -138,21 +138,24 @@ function readCookie(name) return null; } -window.onload = function(e) +function load_cookie() { var cookie = readCookie('style_cookie'); var title = cookie ? cookie : getPreferredStyleSheet(); setActiveStyleSheet(title); } -window.onunload = function(e) +function unload_cookie() { var title = getActiveStyleSheet(); createCookie('style_cookie', title, 365); } +onload_functions.push('load_cookie()'); +onunload_functions.push('unload_cookie()'); + /* var cookie = readCookie("style"); var title = cookie ? cookie : getPreferredStyleSheet(); setActiveStyleSheet(title); -*/ \ No newline at end of file +*/ diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html index 3e41b83231..96f6d7591a 100644 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ b/phpBB/styles/prosilver/template/ucp_header.html @@ -22,18 +22,31 @@