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] Add distinction between top/bottom action-bar

Browse source 
PHPBB3-12613
This commit is contained in:
PayBas 2014-06-13 14:53:45 +02:00
parent 93c39477e0
commit f6ee0152ed
20 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
<div class="action-bar"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
{TOTAL_TOPICS} {TOTAL_TOPICS}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -101,7 +101,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_TOPICS} {TOTAL_TOPICS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -7,7 +7,7 @@
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
<div class="action-bar"> <div class="action-bar top">
{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}" />
<div class="pagination"> <div class="pagination">
{TOTAL} {TOTAL}
@ -60,7 +60,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL} {TOTAL}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -50,7 +50,7 @@
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
<div class="action-bar"> <div class="action-bar top">
{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}" />
<div class="pagination"> <div class="pagination">
{TOTAL_REPORTS} {TOTAL_REPORTS}
@ -100,7 +100,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_REPORTS} {TOTAL_REPORTS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -16,7 +16,7 @@
<p>{L_EXPLAIN}</p> <p>{L_EXPLAIN}</p>
<!-- IF .postrow --> <!-- IF .postrow -->
<div class="action-bar"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
{TOTAL} {TOTAL}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -82,7 +82,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL} {TOTAL}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -18,7 +18,7 @@
<p>{L_EXPLAIN}</p> <p>{L_EXPLAIN}</p>
<!-- IF .postrow --> <!-- IF .postrow -->
<div class="action-bar"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
{TOTAL_REPORTS} {TOTAL_REPORTS}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -88,7 +88,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_REPORTS} {TOTAL_REPORTS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -150,7 +150,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_POSTS} {TOTAL_POSTS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -10,7 +10,7 @@
<p>{L_WARNED_USERS_EXPLAIN}</p> <p>{L_WARNED_USERS_EXPLAIN}</p>
<!-- IF .user --> <!-- IF .user -->
<div class="action-bar"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
{TOTAL_USERS} {TOTAL_USERS}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -51,7 +51,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_USERS} {TOTAL_USERS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -23,7 +23,7 @@
<!-- ELSE --> <!-- ELSE -->
<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> <h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
<div class="action-bar"> <div class="action-bar top">
<div class="member-search panel"> <div class="member-search panel">
<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{LA_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{LA_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF --> <!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{LA_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{LA_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
<strong> <strong>
@ -141,7 +141,7 @@
</form> </form>
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_USERS} {TOTAL_USERS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -14,7 +14,7 @@
<!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER --> <!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER -->
<form method="post" action="{S_SEARCH_ACTION}"> <form method="post" action="{S_SEARCH_ACTION}">
<div class="action-bar"> <div class="action-bar top">
<!-- IF SEARCH_MATCHES --> <!-- IF SEARCH_MATCHES -->
<div class="search-box"> <div class="search-box">
@ -176,7 +176,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF .pagination or .searchresults or PAGE_NUMBER --> <!-- IF .pagination or .searchresults or PAGE_NUMBER -->
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{SEARCH_MATCHES} {SEARCH_MATCHES}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -10,7 +10,7 @@
<p>{L_ATTACHMENTS_EXPLAIN}</p> <p>{L_ATTACHMENTS_EXPLAIN}</p>
<!-- IF .attachrow --> <!-- IF .attachrow -->
<div class="action-bar"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
{TOTAL_ATTACHMENTS} {L_TITLE} {TOTAL_ATTACHMENTS} {L_TITLE}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -59,7 +59,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_ATTACHMENTS} {L_TITLE} {TOTAL_ATTACHMENTS} {L_TITLE}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -160,7 +160,7 @@
</table> </table>
<!-- IF .pagination --> <!-- IF .pagination -->
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
</div> </div>

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

@ -76,7 +76,7 @@
<!-- END topicrow --> <!-- END topicrow -->
</ul> </ul>
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_TOPICS} {TOTAL_TOPICS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -110,7 +110,7 @@
<!-- END topicrow --> <!-- END topicrow -->
</ul> </ul>
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_TOPICS} {TOTAL_TOPICS}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -42,7 +42,7 @@
</table> </table>
<!-- ELSE --> <!-- ELSE -->
<!-- IF .notification_list --> <!-- IF .notification_list -->
<div class="action-bar"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF --> <!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
@ -89,7 +89,7 @@
</ul> </ul>
</div> </div>
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -6,7 +6,7 @@
<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="action-bar"> <div class="action-bar top">
<!-- 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 -->

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

@ -104,7 +104,7 @@
<hr /> <hr />
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
{TOTAL_MESSAGES} {TOTAL_MESSAGES}
<!-- IF .pagination --> <!-- IF .pagination -->

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

@ -35,7 +35,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS --> <!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS -->
<div class="action-bar" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->> <div class="action-bar top" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> <!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
<div class="buttons"> <div class="buttons">
@ -220,7 +220,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF .topicrow and not S_DISPLAY_ACTIVE --> <!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
<div class="action-bar"> <div class="action-bar bottom">
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> <!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
<div class="buttons"> <div class="buttons">
<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> <a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">

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

@ -3,7 +3,7 @@
<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>
<div class="action-bar"> <div class="action-bar top">
<div class="pagination"> <div class="pagination">
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->
@ -49,7 +49,7 @@
<!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF --> <!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF -->
<div class="action-bar"> <div class="action-bar bottom">
<div class="pagination"> <div class="pagination">
<!-- IF .pagination --> <!-- IF .pagination -->
<!-- INCLUDE pagination.html --> <!-- INCLUDE pagination.html -->

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

@ -25,7 +25,7 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<div class="action-bar"> <div class="action-bar top">
<div class="buttons"> <div class="buttons">
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> <!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
@ -337,7 +337,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT viewtopic_body_topic_actions_before --> <!-- EVENT viewtopic_body_topic_actions_before -->
<div class="action-bar"> <div class="action-bar bottom">
<div class="buttons"> <div class="buttons">
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> <!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"> <a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">

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

@ -825,8 +825,8 @@ fieldset.fields1 dl.pmlist dd.recipients {
width: auto; width: auto;
} }
.pagination img { .action-bar.bottom .pagination {
vertical-align: middle; margin-top: 0;
} }
.pagination > ul { .pagination > ul {