diff options
| author | PayBas <contact@paybas.com> | 2014-06-13 12:21:04 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-13 12:25:02 +0200 |
| commit | 7c527adee87096d26087d82984b6f283db63832e (patch) | |
| tree | b818876d228d9a1f2b40431b0a2bb0fd4cb90589 /phpBB/styles/prosilver/template | |
| parent | 86a320ff5c9c4f7c7eeac8d4956c4c131d0b1f7b (diff) | |
| download | forums-7c527adee87096d26087d82984b6f283db63832e.tar forums-7c527adee87096d26087d82984b6f283db63832e.tar.gz forums-7c527adee87096d26087d82984b6f283db63832e.tar.bz2 forums-7c527adee87096d26087d82984b6f283db63832e.tar.xz forums-7c527adee87096d26087d82984b6f283db63832e.zip | |
[ticket/12613] Remove unnecessary checks and clean up CSS
PHPBB3-12613
Diffstat (limited to 'phpBB/styles/prosilver/template')
12 files changed, 28 insertions, 59 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 8c584e3dd7..20139a203b 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -10,10 +10,9 @@ <div class="panel"> <div class="inner"> - <!-- IF .pagination or TOTAL_TOPICS --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF --> + {TOTAL_TOPICS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -21,7 +20,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> <!-- IF .topicrow --> <ul class="topiclist<!-- IF S_MERGE_SELECT --> missing-column<!-- ENDIF -->"> @@ -103,10 +101,9 @@ <hr /> - <!-- IF .pagination or TOTAL_TOPICS --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF --> + {TOTAL_TOPICS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -114,7 +111,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> </div> </div> diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index c046d59ef3..5a3404f00a 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -9,16 +9,14 @@ <div class="action-bar"> {L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> - <!-- IF .pagination or TOTAL --> <div class="pagination"> - <!-- IF TOTAL -->{TOTAL}<!-- ENDIF --> + {TOTAL} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> - <!-- ENDIF --> </div> <table class="table1"> @@ -62,10 +60,9 @@ <hr /> - <!-- IF .pagination or TOTAL --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL -->{TOTAL}<!-- ENDIF --> + {TOTAL} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -73,7 +70,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> {S_FORM_TOKEN} </div> diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index f3492f89e6..190e33d8c7 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -52,16 +52,14 @@ <div class="action-bar"> {L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> - <!-- IF .pagination or TOTAL_REPORTS --> <div class="pagination"> - <!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF --> + {TOTAL_REPORTS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> - <!-- ENDIF --> </div> <table class="table1"> @@ -102,10 +100,9 @@ <hr /> - <!-- IF .pagination or TOTAL_REPORTS --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF --> + {TOTAL_REPORTS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -113,7 +110,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> </div> </div> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 3654f15adc..593cb2d490 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -150,10 +150,9 @@ <hr /> - <!-- IF .pagination or TOTAL_POSTS --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_POSTS -->{TOTAL_POSTS}<!-- ENDIF --> + {TOTAL_POSTS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -161,7 +160,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> </div> </div> diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 6e0f8826a7..1e4ac4b204 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -148,7 +148,6 @@ </form> -<!-- IF .pagination or TOTAL_USERS --> <div class="action-bar"> <div class="pagination"> {TOTAL_USERS} @@ -159,7 +158,6 @@ <!-- ENDIF --> </div> </div> -<!-- ENDIF --> <!-- IF S_IN_SEARCH_POPUP --> <!-- INCLUDE simple_footer.html --> diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index c5371b9b6a..3bd51275ec 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -17,11 +17,11 @@ </div> </div> -<div class="pagination"> - <!-- IF .pagination --> +<!-- IF .pagination --> + <div class="pagination"> <!-- INCLUDE pagination.html --> - <!-- ENDIF --> -</div> + </div> +<!-- ENDIF --> <a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a> <!-- INCLUDE simple_footer.html --> diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index 50e95fbe02..5b5763fb6e 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -10,11 +10,9 @@ <p>{L_ATTACHMENTS_EXPLAIN}</p> <!-- IF .attachrow --> - - <!-- IF .pagination or TOTAL_ATTACHMENTS --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF --> + {TOTAL_ATTACHMENTS} {L_TITLE} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -22,7 +20,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> <ul class="topiclist"> <li class="header"> @@ -61,11 +58,10 @@ </fieldset> <hr /> - - <!-- IF .pagination or TOTAL_ATTACHMENTS --> + <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF --> + {TOTAL_ATTACHMENTS} {L_TITLE} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -73,7 +69,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> <!-- ELSE --> <p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p> diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index c68b05d09f..35236771c5 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -76,10 +76,9 @@ <!-- END topicrow --> </ul> - <!-- IF .pagination or TOTAL_TOPICS --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF --> + {TOTAL_TOPICS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -87,7 +86,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> <!-- ELSE --> <p><strong>{L_NO_BOOKMARKS}</strong></p> diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index 936d653947..c9d7cd989c 100644 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -110,10 +110,9 @@ <!-- END topicrow --> </ul> - <!-- IF .pagination or TOTAL_TOPICS --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF --> + {TOTAL_TOPICS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -121,7 +120,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> <!-- ELSEIF S_TOPIC_NOTIFY --> <ul class="topiclist"> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index c4a377c8ad..70944f37e9 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -42,11 +42,10 @@ </table> <!-- ELSE --> <!-- IF .notification_list --> - <!-- IF .pagination or TOTAL_COUNT --> <div class="topic-actions"> <div class="pagination"> <!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> - <!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]<!-- ENDIF --> + {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -54,7 +53,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> <div class="notification_list"> <ul class="topiclist two-columns"> @@ -91,18 +89,16 @@ </ul> </div> - <!-- IF .pagination or TOTAL_COUNT --> - <div class="topic-actions"> - <div class="pagination"> - <!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]<!-- ENDIF --> - <!-- IF .pagination --> - <!-- INCLUDE pagination.html --> - <!-- ELSE --> - • {PAGE_NUMBER} - <!-- ENDIF --> - </div> + <div class="topic-actions"> + <div class="pagination"> + {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] + <!-- IF .pagination --> + <!-- INCLUDE pagination.html --> + <!-- ELSE --> + • {PAGE_NUMBER} + <!-- ENDIF --> </div> - <!-- ENDIF --> + </div> <!-- ELSE --> <p><strong>{L_NO_NOTIFICATIONS}</strong></p> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index e7fa7eb5d4..c6c5533f3c 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -48,7 +48,7 @@ <!-- IF S_VIEW_MESSAGE --> <a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a> <!-- ELSEIF FOLDER_CUR_MESSAGES neq 0 --> - <!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF --> + {TOTAL_MESSAGES} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index 6009ab70f7..01e426841e 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -104,10 +104,9 @@ <hr /> - <!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> <div class="action-bar"> <div class="pagination"> - <!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF --> + {TOTAL_MESSAGES} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -115,7 +114,6 @@ <!-- ENDIF --> </div> </div> - <!-- ENDIF --> <!-- ENDIF --> </div> |