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

[ticket/12613] Replaced topic-actions with action-bar

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

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

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

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

@ -42,9 +42,9 @@
</table>
<!-- ELSE -->
<!-- IF .notification_list -->
<div class="topic-actions">
<div class="action-bar">
<div class="pagination">
<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{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>]
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
@ -89,7 +89,7 @@
</ul>
</div>
<div class="topic-actions">
<div class="action-bar">
<div class="pagination">
{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
<!-- IF .pagination -->

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

@ -6,7 +6,7 @@
<div class="inner">
<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
<div class="topic-actions">
<div class="action-bar">
<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
<div class="buttons">
<!-- IF U_POST_REPLY_PM -->

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

@ -35,7 +35,7 @@
<!-- ENDIF -->
<!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS -->
<div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
<div class="action-bar" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
<div class="buttons">
@ -58,7 +58,7 @@
<!-- ENDIF -->
<div class="pagination">
<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" class="mark" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
{TOTAL_TOPICS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
@ -220,7 +220,7 @@
<!-- ENDIF -->
<!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
<div class="topic-actions">
<div class="action-bar">
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
<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 -->">

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

@ -25,7 +25,7 @@
</div>
<!-- ENDIF -->
<div class="topic-actions">
<div class="action-bar">
<div class="buttons">
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
@ -51,7 +51,7 @@
<!-- IF .pagination or TOTAL_POSTS -->
<div class="pagination">
<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
<!-- ELSE -->
@ -337,7 +337,7 @@
<!-- ENDIF -->
<!-- EVENT viewtopic_body_topic_actions_before -->
<div class="topic-actions">
<div class="action-bar">
<div class="buttons">
<!-- 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 -->">

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

@ -641,10 +641,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
margin-left: 0;
}
.rtl #cp-main .pagination {
float: left;
}
.rtl #cp-main .buttons {
margin-right: 0;
margin-left: 0;

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

@ -804,22 +804,6 @@ fieldset.fields1 dl.pmlist dd.recipients {
/* Action-bars (container for post/reply buttons, pagination, etc.)
---------------------------------------- */
.topic-actions {
margin-bottom: 3px;
font-size: 1.1em;
height: 28px;
min-height: 28px;
}
div[class].topic-actions {
height: auto;
}
.topic-actions:after {
clear: both;
content: '';
display: block;
}
.action-bar {
font-size: 11px;
margin: 4px 0;
@ -836,7 +820,7 @@ div[class].topic-actions {
.pagination {
float: right;
font-size: 11px;
margin-top: 5px;
margin-top: 3px;
text-align: right;
width: auto;
}

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

@ -767,7 +767,7 @@ dl.pmlist dd {
margin-bottom: 2px;
}
.topic-actions div.dl_links {
.action-bar div.dl_links {
padding: 10px 0 0 10px;
}

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

@ -59,10 +59,6 @@ ul.cplist {
border-bottom: none;
}
#cp-main .pagination {
margin: 0;
}
#cp-main .postbody p {
font-size: 1.1em;
}

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

@ -197,10 +197,6 @@ ul.topiclist li.row dt a.subforum {
/* Pagination
----------------------------------------*/
.pagination {
margin: 5px 0;
}
.pagination > ul {
margin: 5px 0 0;
}
@ -509,21 +505,21 @@ fieldset.display-actions {
margin: 0;
}
.topic-actions > .pagination, fieldset.jumpbox, .action-bar > .pagination {
.action-bar > .pagination, fieldset.jumpbox {
text-align: center;
}
.topic-actions > .pagination, .action-bar > .pagination {
.action-bar > .pagination {
float: none;
clear: both;
padding-bottom: 1px;
}
.topic-actions > .pagination li.page-jump {
.action-bar > .pagination li.page-jump {
margin: 0 2px;
}
.topic-actions > div.search-box, p.jumpbox-return {
.action-bar > div.search-box, p.jumpbox-return {
display: none;
}