makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12613] Pagination should never be in responsive linklist

Browse source 
PHPBB3-12613
This commit is contained in:
PayBas 2014-06-03 16:30:05 +02:00
parent 57a051c023
commit 09a433be61
20 changed files with 236 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
phpBB/styles/prosilver/template/mcp_forum.html
View file

@ -11,16 +11,16 @@
<div class="inner"> <div class="inner">
<!-- IF .pagination or TOTAL_TOPICS --> <!-- IF .pagination or TOTAL_TOPICS -->
<ul class="linklist"> <div class="action-bar">
<li class="rightside pagination"> <div class="pagination">
<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF --> <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF .topicrow --> <!-- IF .topicrow -->
@ -104,16 +104,16 @@
<hr /> <hr />
<!-- IF .pagination or TOTAL_TOPICS --> <!-- IF .pagination or TOTAL_TOPICS -->
<ul class="linklist"> <div class="action-bar">
<li class="rightside pagination"> <div class="pagination">
<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF --> <!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>

33
phpBB/styles/prosilver/template/mcp_logs.html
View file

@ -7,19 +7,19 @@
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
<ul class="linklist"> <div class="action-bar">
<li class="leftside"> {L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> <!-- IF .pagination or TOTAL -->
</li> <div class="pagination">
<li class="rightside pagination"> <!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
<!-- IF TOTAL -->{TOTAL} &bull; <!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> <!-- ENDIF -->
</div>
<table class="table1"> <table class="table1">
<thead> <thead>
@ -62,16 +62,19 @@
<hr /> <hr />
<ul class="linklist"> <!-- IF .pagination or TOTAL -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL -->{TOTAL} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
{S_FORM_TOKEN} {S_FORM_TOKEN}
</div> </div>
</div> </div>

32
phpBB/styles/prosilver/template/mcp_notes_user.html
View file

@ -50,19 +50,19 @@
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
<ul class="linklist"> <div class="action-bar">
<li class="leftside"> {L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> <!-- IF .pagination or TOTAL_REPORTS -->
</li> <div class="pagination">
<li class="rightside pagination"> <!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} &bull; <!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> <!-- ENDIF -->
</div>
<table class="table1"> <table class="table1">
<thead> <thead>
@ -102,16 +102,18 @@
<hr /> <hr />
<ul class="linklist"> <!-- IF .pagination or TOTAL_REPORTS -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
</div> </div>
</div> </div>

30
phpBB/styles/prosilver/template/mcp_queue.html
View file

@ -16,16 +16,19 @@
<p>{L_EXPLAIN}</p> <p>{L_EXPLAIN}</p>
<!-- IF .postrow --> <!-- IF .postrow -->
<ul class="linklist"> <!-- IF .pagination or TOTAL -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL --> {TOTAL} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<ul class="topiclist missing-column"> <ul class="topiclist missing-column">
<li class="header"> <li class="header">
<dl> <dl>
@ -81,16 +84,19 @@
<hr /> <hr />
<ul class="linklist"> <!-- IF .pagination or TOTAL -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL -->{TOTAL} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<!-- ELSE --> <!-- ELSE -->
<p class="notopics"><strong> <p class="notopics"><strong>
<!-- IF S_RESTORE --> <!-- IF S_RESTORE -->

31
phpBB/styles/prosilver/template/mcp_reports.html
View file

@ -18,16 +18,19 @@
<p>{L_EXPLAIN}</p> <p>{L_EXPLAIN}</p>
<!-- IF .postrow --> <!-- IF .postrow -->
<ul class="linklist"> <!-- IF .pagination or TOTAL_REPORTS -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL -->{TOTAL_REPORTS} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<ul class="topiclist missing-column"> <ul class="topiclist missing-column">
<li class="header"> <li class="header">
<dl> <dl>
@ -84,17 +87,21 @@
<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> <!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
<input type="submit" name="sort" value="{L_GO}" class="button2" /> <input type="submit" name="sort" value="{L_GO}" class="button2" />
</fieldset> </fieldset>
<hr /> <hr />
<ul class="linklist">
<li class="rightside pagination"> <!-- IF .pagination or TOTAL_REPORTS -->
<!-- IF TOTAL -->{TOTAL_REPORTS} &bull; <!-- ENDIF --> <div class="action-bar">
<div class="pagination">
<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<!-- ELSE --> <!-- ELSE -->
<p><strong>{L_NO_REPORTS}</strong></p> <p><strong>{L_NO_REPORTS}</strong></p>

16
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -151,16 +151,16 @@
<hr /> <hr />
<!-- IF .pagination or TOTAL_POSTS --> <!-- IF .pagination or TOTAL_POSTS -->
<ul class="linklist"> <div class="action-bar">
<li class="rightside pagination"> <div class="pagination">
<!-- IF TOTAL_POSTS --> {TOTAL_POSTS} &bull; <!-- ENDIF --> <!-- IF TOTAL_POSTS -->{TOTAL_POSTS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>

32
phpBB/styles/prosilver/template/mcp_warn_list.html
View file

@ -10,17 +10,19 @@
<p>{L_WARNED_USERS_EXPLAIN}</p> <p>{L_WARNED_USERS_EXPLAIN}</p>
<!-- IF .user --> <!-- IF .user -->
<ul class="linklist"> <!-- IF .pagination or TOTAL_USERS -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL_USERS -->{TOTAL_USERS} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<table class="table1"> <table class="table1">
<thead> <thead>
<tr> <tr>
@ -48,18 +50,22 @@
<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
<input type="submit" name="sort" value="{L_GO}" class="button2" /> <input type="submit" name="sort" value="{L_GO}" class="button2" />
</fieldset> </fieldset>
<hr /> <hr />
<ul class="linklist"> <!-- IF .pagination or TOTAL_USERS -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL_USERS -->{TOTAL_USERS} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<!-- ELSE --> <!-- ELSE -->
<p><strong>{L_NO_WARNINGS}</strong></p> <p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF --> <!-- ENDIF -->

18
phpBB/styles/prosilver/template/memberlist_body.html
View file

@ -150,16 +150,18 @@
<hr /> <hr />
<ul class="linklist"> <!-- IF .pagination or TOTAL_USERS -->
<li class="rightside pagination">{TOTAL_USERS} <div class="action-bar">
<!-- IF .pagination --> <div class="pagination">
&bull; {TOTAL_USERS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<!-- IF S_IN_SEARCH_POPUP --> <!-- IF S_IN_SEARCH_POPUP -->
<!-- INCLUDE simple_footer.html --> <!-- INCLUDE simple_footer.html -->

21
phpBB/styles/prosilver/template/search_results.html
View file

@ -177,17 +177,16 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF .pagination or .searchresults or PAGE_NUMBER --> <!-- IF .pagination or .searchresults or PAGE_NUMBER -->
<ul class="linklist"> <div class="action-bar">
<li class="rightside pagination"> <div class="rightside pagination">
{SEARCH_MATCHES} {SEARCH_MATCHES}
<!-- IF .pagination --> <!-- IF .pagination -->
&bull; <!-- INCLUDE pagination.html -->
<!-- INCLUDE pagination.html --> <!-- ELSE -->
<!-- ELSE --> &bull; {PAGE_NUMBER}
{PAGE_NUMBER} <!-- ENDIF -->
<!-- ENDIF --> </div>
</li> </div>
</ul>
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDE jumpbox.html --> <!-- INCLUDE jumpbox.html -->

30
phpBB/styles/prosilver/template/ucp_attachments.html
View file

@ -10,16 +10,19 @@
<p>{L_ATTACHMENTS_EXPLAIN}</p> <p>{L_ATTACHMENTS_EXPLAIN}</p>
<!-- IF .attachrow --> <!-- IF .attachrow -->
<ul class="linklist">
<li class="rightside pagination"> <!-- IF .pagination or TOTAL_ATTACHMENTS -->
<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE} &bull; <!-- ENDIF --> <div class="action-bar">
<div class="rightside pagination">
<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<ul class="topiclist"> <ul class="topiclist">
<li class="header"> <li class="header">
@ -59,16 +62,19 @@
<hr /> <hr />
<ul class="linklist"> <!-- IF .pagination or TOTAL_ATTACHMENTS -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE} &bull; <!-- ENDIF --> <div class="rightside pagination">
<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<!-- ELSE --> <!-- ELSE -->
<p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p> <p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p>
<!-- ENDIF --> <!-- ENDIF -->

16
phpBB/styles/prosilver/template/ucp_groups_manage.html
View file

@ -159,15 +159,13 @@
</tbody> </tbody>
</table> </table>
<ul class="linklist"> <!-- IF .pagination -->
<li class="leftside pagination"> <div class="action-bar">
<!-- IF .pagination --> <div class="rightside pagination">
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> </div>
{PAGE_NUMBER} </div>
<!-- ENDIF --> <!-- ENDIF -->
</li>
</ul>
</div> </div>
</div> </div>

16
phpBB/styles/prosilver/template/ucp_main_bookmarks.html
View file

@ -75,16 +75,20 @@
</li> </li>
<!-- END topicrow --> <!-- END topicrow -->
</ul> </ul>
<ul class="linklist">
<li class="rightside pagination"> <!-- IF .pagination or TOTAL_TOPICS -->
<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF --> <div class="action-bar">
<div class="pagination">
<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<!-- ELSE --> <!-- ELSE -->
<p><strong>{L_NO_BOOKMARKS}</strong></p> <p><strong>{L_NO_BOOKMARKS}</strong></p>
<!-- ENDIF --> <!-- ENDIF -->

20
phpBB/styles/prosilver/template/ucp_main_subscribed.html
View file

@ -109,16 +109,20 @@
</li> </li>
<!-- END topicrow --> <!-- END topicrow -->
</ul> </ul>
<ul class="linklist">
<li class="rightside pagination"> <!-- IF .pagination or TOTAL_TOPICS -->
<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF --> <div class="action-bar">
<!-- IF .pagination --> <div class="pagination">
<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
<!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- ENDIF -->
<!-- ELSEIF S_TOPIC_NOTIFY --> <!-- ELSEIF S_TOPIC_NOTIFY -->
<ul class="topiclist"> <ul class="topiclist">
<li class="header"> <li class="header">

4
phpBB/styles/prosilver/template/ucp_notifications.html
View file

@ -94,11 +94,11 @@
<!-- IF .pagination or TOTAL_COUNT --> <!-- IF .pagination or TOTAL_COUNT -->
<div class="topic-actions"> <div class="topic-actions">
<div class="pagination"> <div class="pagination">
<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] &bull; <!-- ENDIF --> <!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>
</div> </div>

15
phpBB/styles/prosilver/template/ucp_pm_message_header.html
View file

@ -4,8 +4,9 @@
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF --> <!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
<div class="topic-actions">
<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM --> <!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
<div class="buttons"> <div class="buttons">
<!-- IF U_POST_REPLY_PM --> <!-- IF U_POST_REPLY_PM -->
@ -43,17 +44,17 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> <!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<ul class="linklist"> <div class="rightside pagination">
<li class="rightside pagination">
<!-- IF S_VIEW_MESSAGE --><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a><!-- ENDIF --> <!-- IF S_VIEW_MESSAGE --><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a><!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 --> <!-- IF FOLDER_CUR_MESSAGES neq 0 -->
<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} &bull; <!-- ENDIF --> <!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} &bull; {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul>
<!-- ENDIF --> <!-- ENDIF -->
</div>

36
phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
View file

@ -96,26 +96,26 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 --> <!-- IF FOLDER_CUR_MESSAGES neq 0 -->
<fieldset class="display-actions"> <fieldset class="display-actions">
<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div> <div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" /> <select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div> <div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset> </fieldset>
<hr /> <hr />
<ul class="linklist">
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> <!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<li class="rightside pagination"> <div class="action-bar">
<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} &bull; <!-- ENDIF --> <div class="pagination">
<!-- IF .pagination --> <!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
<!-- INCLUDE pagination.html --> <!-- IF .pagination -->
<!-- ELSE --> <!-- INCLUDE pagination.html -->
{PAGE_NUMBER} <!-- ELSE -->
<!-- ENDIF --> &bull; {PAGE_NUMBER}
</li> <!-- ENDIF -->
</div>
</div>
<!-- ENDIF --> <!-- ENDIF -->
</ul>
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>

16
phpBB/styles/prosilver/template/viewonline_body.html
View file

@ -3,15 +3,15 @@
<h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2> <h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2>
<p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p> <p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p>
<ul class="linklist"> <div class="action-bar">
<li class="rightside pagination"> <div class="pagination">
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<div class="forumbg forumbg-table"> <div class="forumbg forumbg-table">
<div class="inner"> <div class="inner">
@ -49,15 +49,15 @@
<!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF --> <!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF -->
<ul class="linklist"> <div class="action-bar">
<li class="rightside pagination"> <div class="pagination">
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
<!-- ELSE --> <!-- ELSE -->
{PAGE_NUMBER} {PAGE_NUMBER}
<!-- ENDIF --> <!-- ENDIF -->
</li> </div>
</ul> </div>
<!-- INCLUDE jumpbox.html --> <!-- INCLUDE jumpbox.html -->
<!-- INCLUDE overall_footer.html --> <!-- INCLUDE overall_footer.html -->

12
phpBB/styles/prosilver/theme/content.css
View file

@ -238,8 +238,18 @@ div[class].topic-actions {
} }
.topic-actions:after { .topic-actions:after {
content: '';
clear: both; clear: both;
content: '';
display: block;
}
.action-bar {
margin: 4px 0;
}
.action-bar:after {
clear: both;
content: '';
display: block; display: block;
} }

4
phpBB/styles/prosilver/theme/cp.css
View file

@ -60,9 +60,7 @@ ul.cplist {
} }
#cp-main .pagination { #cp-main .pagination {
float: right; margin: 0;
width: auto;
padding-top: 1px;
} }
#cp-main .postbody p { #cp-main .postbody p {

4
phpBB/styles/prosilver/theme/responsive.css
View file

@ -509,11 +509,11 @@ fieldset.display-actions {
margin: 0; margin: 0;
} }
.topic-actions > .pagination, fieldset.jumpbox { .topic-actions > .pagination, fieldset.jumpbox, .action-bar > .pagination {
text-align: center; text-align: center;
} }
.topic-actions > .pagination { .topic-actions > .pagination, .action-bar > .pagination {
float: none; float: none;
clear: both; clear: both;
padding-bottom: 1px; padding-bottom: 1px;