feat: merge improvements wip

less/category.less

@@ -182,7 +182,6 @@
 	right: 2rem;
 	z-index: 1;
 	.topics-section {
-		text-align: center;
 		max-height: 500px;
 		overflow-y: auto;
 	}

templates/partials/merge_topics_modal.tpl

@@ -4,16 +4,43 @@
 	</div>
 	<div class="panel-body">
 		<p>
-			[[topic:merge_topics_instruction]]<br />
+			[[topic:merge_topics_instruction]]
-			<div class="topics-section">
+		</p>
-				{{{each topics}}}
+		<p>
-				<!-- IF @index -->
+			<div class="input-group">
-				<i class="fa fa-chevron-up"></i><br/>
+				<input class="form-control" type="text">
-				<!-- ENDIF @index -->
+				<span class="input-group-addon">
-				<span>{topics.title}</span><br/>
+					<i class="fa fa-search"></i>
-				{{{end}}}
+				</span>
 			</div>
 		</p>
+		<p><strong>[[topic:merge-topic-list-title]]</strong></p>
+		<ul class="topics-section">
+			{{{each topics}}}
+			<li><a href="{config.relative_path}/topic/{topics.tid}">{topics.title}</a></li>
+			{{{end}}}
+		</ul>
+		<p>
+			<strong>[[topic:merge-options]]</strong>
+		</p>
+		<form>
+			<p>
+				<input type="radio" name="merge-topic-option" id="abbas" checked="true"> [[topic:merge-select-main-topic]]
+			</p>
+			<p>
+				<select class="form-control main-topic-select">
+					{{{each topics}}}
+					<option value="{topics.tid}">{topics.title}</option>
+					{{{end}}}
+				</select>
+			</p>
+			<p>
+				<input type="radio" name="merge-topic-option" id="allalal"> [[topic:merge-new-title-for-topic]]
+			</p>
+			<p>
+				<input type="text" class="form-control">
+			</p>
+		</form>
 	</div>
 	<div class="panel-footer">
 		&nbsp;