Fixes #61 #71

pichalite · Aug 28, 2018 · 34c9f79 · 34c9f79
1 parent b73ecd8
commit 34c9f79
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/less/topic.less b/less/topic.less
@@ -291,6 +291,11 @@
 				}
 			}
 		}
+
+		.post-edit {
+			display: flex;
+			flex-direction: row-reverse;
+		}
 	}
 }
 

diff --git a/templates/partials/paginator.tpl b/templates/partials/paginator.tpl
@@ -1,4 +1,5 @@
 <ul class="pagination lv-pagination hidden-xs">
+    <!-- IF pagination.pages -->
     <!-- IF !pagination.prev.active -->
     <li class="disabled">
         <a href="#" aria-label="Previous">
@@ -12,6 +13,7 @@
         </a>
     </li>
     <!-- ENDIF !pagination.prev.active -->
+    <!-- ENDIF pagination.pages -->
 
     <!-- BEGIN pagination.pages -->
         <!-- IF pagination.pages.separator -->
@@ -25,6 +27,7 @@
         <!-- ENDIF pagination.pages.separator -->
     <!-- END pagination.pages -->
 
+    <!-- IF pagination.pages -->
     <!-- IF !pagination.next.active -->
     <li class="disabled">
         <a href="#" aria-label="Next">
@@ -38,10 +41,12 @@
         </a>
     </li>
     <!-- ENDIF !pagination.next.active -->
+    <!-- ENDIF pagination.pages -->
 </ul>
 
 
 <ul class="pagination lv-pagination visible-xs">
+    <!-- IF pagination.pages -->
     <!-- IF !pagination.prev.active -->
     <li class="first disabled">
 		<a href="#"><i class="fa fa-fast-backward"></i> </a>
@@ -63,12 +68,14 @@
         </a>
     </li>
 	<!-- ENDIF pagination.prev.active -->
+	<!-- ENDIF pagination.pages -->
 
 
     <li component="pagination/select-page" class="page select-page">
 		<a href="#">{pagination.currentPage} / {pagination.pageCount}</a>
 	</li>
 
+    <!-- IF pagination.pages -->
     <!-- IF !pagination.next.active -->
     <li class="disabled">
         <a href="#" aria-label="Next">
@@ -90,4 +97,5 @@
 		<a href="?page={pagination.pageCount}" data-page="{pagination.pageCount}"><i class="fa fa-fast-forward"></i> </a>
 	</li>
 	<!-- ENDIF pagination.next.active -->
+	<!-- ENDIF pagination.pages -->
 </ul>
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
@@ -65,7 +65,9 @@
                 <div component="post/signature" data-uid="{posts.user.uid}" class="post-signature hidden-xs">{posts.user.signature}</div>
                 <!-- ENDIF posts.user.signature -->
 
-                <small component="post/editor" class="pull-right post-edit <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"><strong><a href="{config.relative_path}/user/{posts.editor.userslug}">[[global:last_edited_by, {posts.editor.username}]]</a></strong> <span class="timeago" title="{posts.editedISO}"></span></small>
+                <div class="post-edit">
+                    <small component="post/editor" class="<!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"><strong><a href="{config.relative_path}/user/{posts.editor.userslug}">[[global:last_edited_by, {posts.editor.username}]]</a></strong> <span class="timeago" title="{posts.editedISO}"></span></small>
+                </div>
                 {posts.reactions}
             </div>
         </div>

diff --git a/templates/search.tpl b/templates/search.tpl
@@ -61,9 +61,10 @@
 						<div class="form-group post-search-item">
 							<label>[[search:in-categories]]</label>
 							<div class="fg-line">
-								<select multiple class="form-control" id="posted-in-categories">
-									<option value="all">All Categories</option>
-									<option value="watched">Watched Categories</option>
+								<select multiple class="form-control" id="posted-in-categories" size="{categoriesCount}">
+									<!-- BEGIN categories -->
+									<option value="{categories.value}">{categories.text}</option>
+									<!-- END categories -->
 								</select>
 							</div>
 							<div class="checkbox">