aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Miday <midaym@gmail.com>2015-09-16 06:54:58 +0200
committerMichael Miday <midaym@gmail.com>2015-09-17 18:37:29 +0200
commit2523ec82776dc2afcfac79c159bbeb9a2fc87b0e (patch)
tree86797f4bfbb651705221d0c8bf194f5772e26d2a
parent171424f89ca7040fff12f563717cd45965b49fc2 (diff)
downloadforums-2523ec82776dc2afcfac79c159bbeb9a2fc87b0e.tar
forums-2523ec82776dc2afcfac79c159bbeb9a2fc87b0e.tar.gz
forums-2523ec82776dc2afcfac79c159bbeb9a2fc87b0e.tar.bz2
forums-2523ec82776dc2afcfac79c159bbeb9a2fc87b0e.tar.xz
forums-2523ec82776dc2afcfac79c159bbeb9a2fc87b0e.zip
[ticket/12769] Refacto action bar
-rw-r--r--phpBB/styles/prosilver/template/mcp_forum.html4
-rw-r--r--phpBB/styles/prosilver/template/mcp_logs.html4
-rw-r--r--phpBB/styles/prosilver/template/mcp_notes_user.html4
-rw-r--r--phpBB/styles/prosilver/template/mcp_queue.html4
-rw-r--r--phpBB/styles/prosilver/template/mcp_reports.html4
-rw-r--r--phpBB/styles/prosilver/template/mcp_topic.html2
-rw-r--r--phpBB/styles/prosilver/template/mcp_warn_list.html4
-rw-r--r--phpBB/styles/prosilver/template/memberlist_body.html4
-rw-r--r--phpBB/styles/prosilver/template/search_results.html4
-rw-r--r--phpBB/styles/prosilver/template/ucp_attachments.html4
-rw-r--r--phpBB/styles/prosilver/template/ucp_groups_manage.html2
-rw-r--r--phpBB/styles/prosilver/template/ucp_main_bookmarks.html2
-rw-r--r--phpBB/styles/prosilver/template/ucp_main_subscribed.html2
-rw-r--r--phpBB/styles/prosilver/template/ucp_notifications.html4
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_message_header.html2
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_viewfolder.html2
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html3
-rw-r--r--phpBB/styles/prosilver/theme/common.css14
18 files changed, 39 insertions, 30 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 0537822ec9..c1e3cc3497 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -10,7 +10,7 @@
<div class="panel">
<div class="inner">
- <div class="action-bar top">
+ <div class="action-bar bar-top">
<div class="pagination">
{TOTAL_TOPICS}
<!-- IF .pagination -->
@@ -117,7 +117,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_TOPICS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index 4f74085968..9b4c4c786f 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -7,7 +7,7 @@
<div class="panel">
<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}" />
<div class="pagination">
{TOTAL}
@@ -60,7 +60,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index 3e8d47eb9d..a9c1e49360 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -50,7 +50,7 @@
<div class="panel">
<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}" />
<div class="pagination">
{TOTAL_REPORTS}
@@ -100,7 +100,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_REPORTS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index 864b231142..c210c428ee 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -16,7 +16,7 @@
<p>{L_EXPLAIN}</p>
<!-- IF .postrow -->
- <div class="action-bar top">
+ <div class="action-bar bar-top">
<div class="pagination">
{TOTAL}
<!-- IF .pagination -->
@@ -82,7 +82,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index 84159803ea..10023f395b 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -18,7 +18,7 @@
<p>{L_EXPLAIN}</p>
<!-- IF .postrow -->
- <div class="action-bar top">
+ <div class="action-bar bar-top">
<div class="pagination">
{TOTAL_REPORTS}
<!-- IF .pagination -->
@@ -88,7 +88,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_REPORTS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 786d7bf128..0398b773c7 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -155,7 +155,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_POSTS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
index d0e80a1479..568705e7d0 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -10,7 +10,7 @@
<p>{L_WARNED_USERS_EXPLAIN}</p>
<!-- IF .user -->
- <div class="action-bar top">
+ <div class="action-bar bar-top">
<div class="pagination">
{TOTAL_USERS}
<!-- IF .pagination -->
@@ -51,7 +51,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_USERS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 20f46af90d..0ba945b933 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -23,7 +23,7 @@
<!-- ELSE -->
<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">
<!-- 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>
@@ -141,7 +141,7 @@
</form>
-<div class="action-bar bottom">
+<div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_USERS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 6dcbfb8403..47ce0de4dd 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -24,7 +24,7 @@
<!-- EVENT search_results_header_after -->
<!-- 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 -->
<div class="search-box" role="search">
@@ -225,7 +225,7 @@
<!-- ENDIF -->
<!-- IF .pagination or .searchresults or PAGE_NUMBER -->
-<div class="action-bar bottom">
+<div class="action-bar bar-bottom">
<div class="pagination">
{SEARCH_MATCHES}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index 1d4963273c..0ea0661c37 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -10,7 +10,7 @@
<p>{L_ATTACHMENTS_EXPLAIN}</p>
<!-- IF .attachrow -->
- <div class="action-bar top">
+ <div class="action-bar bar-top">
<div class="pagination">
{NUM_ATTACHMENTS}
<!-- IF .pagination -->
@@ -59,7 +59,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_ATTACHMENTS} {L_TITLE}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index b5e8eaf1e8..223493ff38 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -160,7 +160,7 @@
</table>
<!-- IF .pagination -->
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
<!-- INCLUDE pagination.html -->
</div>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index f2c11b3d7e..7aa4313910 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -92,7 +92,7 @@
<!-- END topicrow -->
</ul>
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_TOPICS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 2f2bcb8a78..332330c5b1 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -133,7 +133,7 @@
<!-- END topicrow -->
</ul>
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_TOPICS}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 1255d7a0d0..a7eb7fc8fb 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -40,7 +40,7 @@
</table>
<!-- ELSE -->
<!-- IF .notification_list -->
- <div class="action-bar top">
+ <div class="action-bar bar-top">
<div class="pagination">
<!-- 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>]
@@ -86,7 +86,7 @@
</ul>
</div>
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index c0d3bc5365..f629c3d5f1 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -6,7 +6,7 @@
<div class="inner">
<!-- 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 -->
<a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button">
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index f2653c8cd6..6f62066d4c 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -107,7 +107,7 @@
<hr />
- <div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_MESSAGES}
<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index bedf0d6d08..7b14c9c6f4 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -26,7 +26,6 @@
</div>
<!-- ENDIF -->
-<div class="action-bar top">
<div class="action-bar bar-top">
<!-- EVENT viewtopic_buttons_top_before -->
@@ -388,7 +387,7 @@
<!-- ENDIF -->
<!-- EVENT viewtopic_body_topic_actions_before -->
-<div class="action-bar bottom">
+ <div class="action-bar bar-bottom">
<!-- EVENT viewtopic_buttons_bottom_before -->
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index b69c2a02fe..5eecd79b8e 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -770,7 +770,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
/* Action-bars (container for post/reply buttons, pagination, etc.)
---------------------------------------- */
.action-bar {
- font-size: 1.1em;
+ font-size: 11px;
margin: 4px 0;
}
@@ -778,6 +778,11 @@ fieldset.fields1 dl.pmlist dd.recipients {
margin-top: 2em;
}
+.action-bar .button {
+ margin-right: 5px;
+ float: left;
+}
+
/* Pagination
---------------------------------------- */
.pagination {
@@ -787,10 +792,15 @@ fieldset.fields1 dl.pmlist dd.recipients {
width: auto;
}
-.action-bar.bottom .pagination {
+.action-bar.bar-bottom .pagination {
margin-top: 0;
}
+.action-bar .pagination .button {
+ margin-right: 0;
+ float: none;
+}
+
.pagination > ul {
display: inline-block;
list-style: none !important;