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

[ticket/12769] Refacto action bar

Browse source
This commit is contained in:
Michael Miday 2015-09-16 06:54:58 +02:00
parent 171424f89c
commit 2523ec8277
18 changed files with 39 additions and 30 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 top"> <div class="action-bar bar-top">
<div class="pagination"> <div class="pagination">
{TOTAL_TOPICS} {TOTAL_TOPICS}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -117,7 +117,7 @@
<hr /> <hr />
<div class="action-bar bottom"> <div class="action-bar 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 top"> <div class="action-bar 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 bottom"> <div class="action-bar 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 top"> <div class="action-bar 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 bottom"> <div class="action-bar 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 top"> <div class="action-bar bar-top">
<div class="pagination"> <div class="pagination">
{TOTAL} {TOTAL}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -82,7 +82,7 @@
<hr /> <hr />
<div class="action-bar bottom"> <div class="action-bar 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 top"> <div class="action-bar 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 bottom"> <div class="action-bar 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

@ -155,7 +155,7 @@
<hr /> <hr />
<div class="action-bar bottom"> <div class="action-bar 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 top"> <div class="action-bar 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 bottom"> <div class="action-bar 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 top"> <div class="action-bar 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="{L_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="{L_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="{L_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="{L_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
<strong> <strong>
@ -141,7 +141,7 @@
</form> </form>
<div class="action-bar bottom"> <div class="action-bar 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

@ -24,7 +24,7 @@
<!-- EVENT search_results_header_after --> <!-- EVENT search_results_header_after -->
<!-- IF .pagination or SEARCH_MATCHES or TOTAL_MATCHES or PAGE_NUMBER --> <!-- IF .pagination or SEARCH_MATCHES or TOTAL_MATCHES or PAGE_NUMBER -->
<div class="action-bar top"> <div class="action-bar bar-top">
<!-- IF TOTAL_MATCHES > 0 --> <!-- IF TOTAL_MATCHES > 0 -->
<div class="search-box" role="search"> <div class="search-box" role="search">
@ -225,7 +225,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF .pagination or .searchresults or PAGE_NUMBER --> <!-- IF .pagination or .searchresults or PAGE_NUMBER -->
<div class="action-bar bottom"> <div class="action-bar 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 top"> <div class="action-bar bar-top">
<div class="pagination"> <div class="pagination">
{NUM_ATTACHMENTS} {NUM_ATTACHMENTS}
<!-- IF .pagination --> <!-- IF .pagination -->
@ -59,7 +59,7 @@
<hr /> <hr />
<div class="action-bar bottom"> <div class="action-bar 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 bottom"> <div class="action-bar 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

@ -92,7 +92,7 @@
<!-- END topicrow --> <!-- END topicrow -->
</ul> </ul>
<div class="action-bar bottom"> <div class="action-bar 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

@ -133,7 +133,7 @@
<!-- END topicrow --> <!-- END topicrow -->
</ul> </ul>
<div class="action-bar bottom"> <div class="action-bar 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

@ -40,7 +40,7 @@
</table> </table>
<!-- ELSE --> <!-- ELSE -->
<!-- IF .notification_list --> <!-- IF .notification_list -->
<div class="action-bar top"> <div class="action-bar 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>]
@ -86,7 +86,7 @@
</ul> </ul>
</div> </div>
<div class="action-bar bottom"> <div class="action-bar 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 top"> <div class="action-bar 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 -->
<!-- IF U_POST_REPLY_PM --> <!-- IF U_POST_REPLY_PM -->
<a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button"> <a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button">

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

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

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

@ -26,7 +26,6 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<div class="action-bar top">
<div class="action-bar bar-top"> <div class="action-bar bar-top">
<!-- EVENT viewtopic_buttons_top_before --> <!-- EVENT viewtopic_buttons_top_before -->
@ -388,7 +387,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT viewtopic_body_topic_actions_before --> <!-- EVENT viewtopic_body_topic_actions_before -->
<div class="action-bar bottom"> <div class="action-bar bar-bottom">
<!-- EVENT viewtopic_buttons_bottom_before --> <!-- EVENT viewtopic_buttons_bottom_before -->
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> <!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->

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

@ -770,7 +770,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
/* Action-bars (container for post/reply buttons, pagination, etc.) /* Action-bars (container for post/reply buttons, pagination, etc.)
---------------------------------------- */ ---------------------------------------- */
.action-bar { .action-bar {
font-size: 1.1em; font-size: 11px;
margin: 4px 0; margin: 4px 0;
} }
@ -778,6 +778,11 @@ fieldset.fields1 dl.pmlist dd.recipients {
margin-top: 2em; margin-top: 2em;
} }
.action-bar .button {
margin-right: 5px;
float: left;
}
/* Pagination /* Pagination
---------------------------------------- */ ---------------------------------------- */
.pagination { .pagination {
@ -787,10 +792,15 @@ fieldset.fields1 dl.pmlist dd.recipients {
width: auto; width: auto;
} }
.action-bar.bottom .pagination { .action-bar.bar-bottom .pagination {
margin-top: 0; margin-top: 0;
} }
.action-bar .pagination .button {
margin-right: 0;
float: none;
}
.pagination > ul { .pagination > ul {
display: inline-block; display: inline-block;
list-style: none !important; list-style: none !important;