From 356218dc6715536e6be90bdfa66ad03fc9857c27 Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@Gmail.com>
Date: Thu, 8 Jun 2023 10:51:29 +0700
Subject: [PATCH] Revert "Minor improvements (#790)"

This reverts commit 214c361d1c3423a84b49fdcfa044270246f83210.
---
 styles/templates/default/group.tpl          |  4 ---
 styles/templates/default/memberlist.tpl     |  2 --
 styles/templates/default/privmsgs.tpl       |  2 --
 styles/templates/default/search_results.tpl |  2 --
 styles/templates/default/tracker.tpl        |  2 --
 styles/templates/default/viewforum.tpl      |  2 +-
 styles/templates/default/viewtopic.tpl      | 39 ++++++++++-----------
 7 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/styles/templates/default/group.tpl b/styles/templates/default/group.tpl
index 6b4f6622f..d75b78acc 100644
--- a/styles/templates/default/group.tpl
+++ b/styles/templates/default/group.tpl
@@ -217,7 +217,6 @@
         <!-- END switch_mod_option -->
     </table>
 
-    <!-- IF PAGINATION and PAGE_NUMBER -->
     <div class="bottom_info">
         <div class="nav">
             <p style="float: left">{PAGE_NUMBER}</p>
@@ -225,7 +224,6 @@
             <div class="clear"></div>
         </div>
     </div><!--/bottom_info-->
-    <!-- ENDIF -->
 
     <!-- IF PENDING_USERS -->
     <table class="forumline">
@@ -306,7 +304,6 @@
     </tfoot>
 </table>
 
-<!-- IF PAGINATION and PAGE_NUMBER -->
 <div class="bottom_info">
     <div class="nav">
         <p style="float: left">{PAGE_NUMBER}</p>
@@ -314,7 +311,6 @@
         <div class="clear"></div>
     </div>
 </div>
-<!-- ENDIF -->
 <!-- ENDIF / RELEASES -->
 
 <!--========================================================================-->
diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl
index 8477efa8f..0d3efef3c 100644
--- a/styles/templates/default/memberlist.tpl
+++ b/styles/templates/default/memberlist.tpl
@@ -60,13 +60,11 @@
 
 <div class="bottom_info">
 
-    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
-    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/privmsgs.tpl b/styles/templates/default/privmsgs.tpl
index d8a855c46..be85f06db 100644
--- a/styles/templates/default/privmsgs.tpl
+++ b/styles/templates/default/privmsgs.tpl
@@ -106,13 +106,11 @@
 
 	<div class="spacer_6"></div>
 
-    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
-    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
index 88d87ca7d..5f09466f4 100644
--- a/styles/templates/default/search_results.tpl
+++ b/styles/templates/default/search_results.tpl
@@ -218,13 +218,11 @@ function show_edit_options ()
 
 <div class="bottom_info">
 
-    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
-    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
index 7fe578bb6..3f0aa3feb 100644
--- a/styles/templates/default/tracker.tpl
+++ b/styles/templates/default/tracker.tpl
@@ -447,13 +447,11 @@ $(function(){
 
 <div class="bottom_info">
 
-    <!-- IF PAGINATION and PAGE_NUMBER -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
-    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/viewforum.tpl b/styles/templates/default/viewforum.tpl
index 30fa1aaf5..3c5083bd8 100644
--- a/styles/templates/default/viewforum.tpl
+++ b/styles/templates/default/viewforum.tpl
@@ -615,7 +615,7 @@ td.topic_id { cursor: pointer; }
 <!--bottom_info-->
 <div class="bottom_info">
 
-<!-- IF PAGINATION and PAGE_NUMBER -->
+<!-- IF PAGINATION -->
 <div class="nav">
 	<p style="float: left">{PAGE_NUMBER}</p>
 	<p style="float: right">{PAGINATION}</p>
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 64255254c..bd2229b0b 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -535,31 +535,16 @@ function build_poll_add_form (src_el)
 <!-- IF HIDE_POST_IMG --><script type="text/javascript">$('img.postImg').remove();</script><!-- ENDIF -->
 <!-- IF HIDE_SMILE --><script type="text/javascript">$('img.smile').remove();</script><!-- ENDIF -->
 
-<!-- IF PAGINATION and PAGE_NUMBER -->
 <table id="pagination" class="topic" cellpadding="0" cellspacing="0">
-    <tr>
-        <td class="nav pad_6 {PG_ROW_CLASS}">
-            <p style="float: left">{PAGE_NUMBER}</p>
-            <p style="float: right">{PAGINATION}</p>
-        </td>
-    </tr>
+<tr>
+	<td class="nav pad_6 {PG_ROW_CLASS}">
+		<p style="float: left">{PAGE_NUMBER}</p>
+		<p style="float: right">{PAGINATION}</p>
+	</td>
+</tr>
 </table><!--/pagination-->
-<!-- ENDIF -->
-
-<table class="topic" cellpadding="0" cellspacing="0">
-    <tr>
-        <td class="catBottom med">
-            <form method="post" action="{S_POST_DAYS_ACTION}">
-                {L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS}&nbsp;
-                {S_SELECT_POST_ORDER}&nbsp;
-                <input type="submit" value="{L_GO}" class="lite" name="submit" />
-            </form>
-        </td>
-    </tr>
-</table>
 
 <!-- IF QUICK_REPLY -->
-<br>
 <form action="{QR_POST_ACTION}" method="post" name="post" onsubmit="if(checkForm(this)){ dis_submit_btn(); }else{ return false; }">
 <input type="hidden" name="mode" value="reply" />
 <input type="hidden" name="t" value="{QR_TOPIC_ID}" />
@@ -595,6 +580,18 @@ function build_poll_add_form (src_el)
 </form>
 <!-- ENDIF / QUICK_REPLY -->
 
+<table class="topic" cellpadding="0" cellspacing="0">
+<tr>
+	<td class="catBottom med">
+	<form method="post" action="{S_POST_DAYS_ACTION}">
+		{L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS}&nbsp;
+		{S_SELECT_POST_ORDER}&nbsp;
+		<input type="submit" value="{L_GO}" class="lite" name="submit" />
+	</form>
+	</td>
+</tr>
+</table>
+
 <table cellpadding="0" class="w100" style="padding-top: 2px;">
 <tr>
 	<td valign="top">