From d3b9c87b420f0deeeffdb02cec6cd46f9f5a25b2 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 15 May 2014 13:43:08 -0700
Subject: [ticket/12155] Use the new .button class as the basis for the post
 buttons.

PHPBB3-12155
---
 phpBB/styles/prosilver/template/forum_fn.js        |  7 +++-
 phpBB/styles/prosilver/template/mcp_post.html      | 15 +++++----
 phpBB/styles/prosilver/template/mcp_topic.html     | 13 +++++++-
 .../prosilver/template/posting_topic_review.html   | 19 ++++++++---
 .../styles/prosilver/template/ucp_pm_history.html  |  8 +++--
 .../prosilver/template/ucp_pm_viewmessage.html     | 18 +++++++---
 .../styles/prosilver/template/viewtopic_body.html  | 38 ++++++++++++++++++----
 7 files changed, 92 insertions(+), 26 deletions(-)

(limited to 'phpBB/styles/prosilver/template')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 1594d73517..87754269cd 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -681,7 +681,7 @@ function parse_document(container)
 	/**
 	* Responsive link lists
 	*/
-	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody ul.profile-icons:not([data-skip-responsive])').each(function() {
+	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody .post-buttons:not([data-skip-responsive])').each(function() {
 		var $this = $(this),
 			$body = $('body'),
 			filterSkip = '.breadcrumbs, [data-skip-responsive]',
@@ -769,6 +769,11 @@ function parse_document(container)
 				menu.prepend(clone.not('.rightside'));
 				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
 				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
+
+				if ($this.hasClass('post-buttons')) {
+					menu.find('.button').removeClass('button icon-button');
+					$('.responsive-menu-link', item).addClass('button icon-button').prepend('<span></span>');
+				}
 				copied = true;
 			}
 			else {
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 2b4ebec5c8..49aa00de1c 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -50,13 +50,16 @@
 	<div class="postbody">
 		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
 
-		<!-- IF U_EDIT -->
-		<ul class="profile-icons">
-			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li>
+		<ul class="post-buttons">
+			<li id="expand">
+				<a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'}; return false;">
+					{L_EXPAND_VIEW}
+				</a>
+			</li>
+			<!-- IF U_EDIT -->
+				<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}" class="button icon-button"><span>{L_EDIT_POST}</span></a></li>
+			<!-- ENDIF -->
 		</ul>
-		<!-- ENDIF -->
-
-		<span class="right-box" id="expand"><a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'}; return false;">{L_EXPAND_VIEW}</a></span>
 
 		<!-- IF S_PM -->
 		<p class="author">
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index bfe18579a6..f7c3656ef4 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -96,7 +96,18 @@
 			<div class="inner">
 
 			<div class="postbody" id="pr{postrow.POST_ID}">
-				<ul class="profile-icons"><li class="info-icon"><a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}"><span>{L_POST_DETAILS}</span></a></li><li><label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON} <input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></label></li></ul>
+				<ul class="post-buttons">
+					<li class="info-icon">
+						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button">
+							<span>{L_POST_DETAILS}</span>
+						</a>
+					</li>
+					<li>
+						<label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON}
+							<input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> />
+						</label>
+					</li>
+				</ul>
 
 				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
 				<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index d2faed5f8f..1af6e08c18 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -24,14 +24,25 @@
 		<div class="postbody" id="pr{topic_review_row.POST_ID}">
 			<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
 
+			<!-- IF (topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE) or topic_review_row.U_MCP_DETAILS -->
+			<ul class="post-buttons">
+			<!-- IF topic_review_row.U_MCP_DETAILS -->
+				<li class="info-icon">
+					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button">
+						<span>{L_POST_DETAILS}</span>
+					</a>
+				<li>
+			<!-- ENDIF -->
 			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
+				<li class="quote-icon">
+					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button icon-button">
+						<span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
+					</a>
+				</li>
+			<!-- ENDIF -->
 			</ul>
 			<!-- ENDIF -->
 
-			<!-- IF topic_review_row.U_MCP_DETAILS --><div class="right-box"><a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a></div><!-- ENDIF -->
-
 			<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> &raquo; {topic_review_row.POST_DATE}  </p>
 			<div class="content">{topic_review_row.MESSAGE}</div>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index d08f622d1f..c499242280 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -18,8 +18,12 @@
 			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
 
 			<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}"><span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span></a></li>
+			<ul class="post-buttons">
+				<li class="quote-icon">
+					<a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button icon-button">
+						<span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span>
+					</a>
+				</li>
 			</ul>
 			<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index f58b334a60..e75952d343 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -66,11 +66,19 @@
 		<h3 class="first">{SUBJECT}</h3>
 
 		<!-- IF U_DELETE or U_EDIT or U_QUOTE or U_REPORT -->
-		<ul class="profile-icons">
-			<!-- IF U_EDIT --><li class="edit-icon"><a href="{U_EDIT}" title="{L_POST_EDIT_PM}"><span>{L_POST_EDIT_PM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_DELETE --><li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_MESSAGE}"><span>{L_DELETE_MESSAGE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_REPORT --><li class="report-icon"><a href="{U_REPORT}" title="{L_REPORT_PM}"><span>{L_REPORT_PM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_QUOTE --><li class="quote-icon"><a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}"><span>{L_POST_QUOTE_PM}</span></a></li><!-- ENDIF -->
+		<ul class="post-buttons">
+			<!-- IF U_EDIT -->
+				<li class="edit-icon"><a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button icon-button"><span>{L_POST_EDIT_PM}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF U_DELETE -->
+				<li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button icon-button"><span>{L_DELETE_MESSAGE}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF U_REPORT -->
+				<li class="report-icon"><a href="{U_REPORT}" title="{L_REPORT_PM}" class="button icon-button"><span>{L_REPORT_PM}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF U_QUOTE -->
+				<li class="quote-icon"><a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button"><span>{L_POST_QUOTE_PM}</span></a></li>
+			<!-- ENDIF -->
 		</ul>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index a7840f3e57..989e7b3c75 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -201,14 +201,38 @@
 
 		<!-- IF not S_IS_BOT -->
 			<!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE -->
-				<ul class="profile-icons">
+				<ul class="post-buttons">
 					<!-- EVENT viewtopic_body_post_buttons_before -->
-					<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_BUTTON_EDIT}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_IP}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_QUOTE}</span></a></li><!-- ENDIF -->
+					<!-- IF postrow.U_EDIT -->
+						<li class="edit-icon">
+							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button"><span>{L_BUTTON_EDIT}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_DELETE -->
+						<li class="delete-icon">
+							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button"><span>{L_DELETE_POST}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_REPORT -->
+						<li class="report-icon">
+							<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button"><span>{L_REPORT_POST}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_WARN -->
+						<li class="warn-icon">
+							<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button"><span>{L_WARN_USER}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_INFO -->
+						<li class="info-icon">
+							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button"><span>{L_INFORMATION}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_QUOTE -->
+						<li class="quote-icon">
+							<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button"><span>{L_QUOTE}</span></a>
+						</li>
+					<!-- ENDIF -->
 					<!-- EVENT viewtopic_body_post_buttons_after -->
 				</ul>
 			<!-- ENDIF -->
-- 
cgit v1.2.1