#1334 Fixes to make Sixteen a better theme

GetLuna · Nov 14, 2015 · 0fcc837 · 0fcc837
1 parent f0a37d1
commit 0fcc837
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/header.php b/header.php
@@ -54,12 +54,15 @@
 
 	if ($luna_user['g_read_board'] == '1' && $luna_user['g_search'] == '1')
 		$page_threadsearches[] = '<a class="list-group-item" href="search.php?action=show_new" title="'.__('New', 'luna').'"><span class="fa fa-fw fa-newspaper-o"></span> '.__('New', 'luna').'</a>';
+		$page_threadsearches_inline[] = '<a href="search.php?action=show_new" title="'.__('New', 'luna').'"><span class="fa fa-fw fa-newspaper-o"></span> '.__('New', 'luna').'</a>';
 }
 
 // Quick searches
 if ($luna_user['g_read_board'] == '1' && $luna_user['g_search'] == '1') {
 	$page_threadsearches[] = '<a class="list-group-item" href="search.php?action=show_recent" title="'.__('Active', 'luna').'"><span class="fa fa-fw fa-clock-o"></span> '.__('Active', 'luna').'</a>';
 	$page_threadsearches[] = '<a class="list-group-item" href="search.php?action=show_unanswered" title="'.__('Unanswered', 'luna').'"><span class="fa fa-fw fa-question"></span> '.__('Unanswered', 'luna').'</a>';
+	$page_threadsearches_inline[] = '<a href="search.php?action=show_recent" title="'.__('Active', 'luna').'"><span class="fa fa-fw fa-clock-o"></span> '.__('Active', 'luna').'</a>';
+	$page_threadsearches_inline[] = '<a href="search.php?action=show_unanswered" title="'.__('Unanswered', 'luna').'"><span class="fa fa-fw fa-question"></span> '.__('Unanswered', 'luna').'</a>';
 }
 
 // Generate all that jazz
@@ -76,7 +79,7 @@
 // Generate quicklinks
 if (!empty($page_threadsearches)) {
 	$tpl_temp .= "\n\t\t\t".'<ul class="conr">';
-	$tpl_temp .= "\n\t\t\t\t".'<li>'.implode(' &middot; ', $page_threadsearches).'</li>';
+	$tpl_temp .= "\n\t\t\t\t".'<li>'.implode(' &middot; ', $page_threadsearches_inline).'</li>';
 	$tpl_temp .= "\n\t\t\t".'</ul>';
 }
 

diff --git a/themes/Sixteen/objects/forum.php b/themes/Sixteen/objects/forum.php
@@ -1,13 +1,13 @@
 <div class="row forum-row <?php echo $item_status ?>">
-	<div class="col-md-5 col-sm-4 col-xs-5">
+	<div class="col-md-4 col-sm-4 col-xs-5">
 		<strong><a href="viewforum.php?id=<?php echo $cur_forum['fid'] ?>"><?php echo luna_htmlspecialchars($cur_forum['forum_name']) ?></a></strong><br />
 		<?php echo $forum_desc ?>
 	</div>
-	<div class="col-md-1 col-sm-2 hidden-xs text-center">
+	<div class="col-md-2 col-sm-2 hidden-xs text-center">
 		<?php echo '<b>'.$cur_forum['num_threads'].'</b> '.$thread_label; ?><br />
 		<?php echo '<b>'.$cur_forum['num_comments'].'</b> '.$comments_label; ?>
 	</div>
-	<div class="col-md-6 col-sm-6 col-xs-7">
+	<div class="col-md-5 col-sm-6 col-xs-7">
 		<?php echo $last_comment ?> <?php echo $forum_field_new ?>
 	</div>
 </div>
diff --git a/themes/Sixteen/style.css b/themes/Sixteen/style.css
@@ -260,8 +260,6 @@ hr {
 }
 
 #brdwelcome li span {
-	padding-left: 18px;
-	margin-right: 3px;
 	display: inline-block;
 	line-height: normal;
 	white-space: nowrap;

diff --git a/themes/Sixteen/thread.php b/themes/Sixteen/thread.php
@@ -52,15 +52,21 @@
 			<div class="btn-group">
 				<a class="btn btn-primary" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&move_threads=<?php echo $id ?>"><span class="fa fa-fw fa-arrows-alt"></span> <?php _e('Move', 'luna') ?></a>
 				<?php if ($cur_thread['closed'] == '1') { ?>
-					<a class="btn btn-success" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&open=<?php echo $id ?>"><span class="fa fa-fw fa-unlock"></span> <?php _e('Open', 'luna') ?></a>
+					<a class="btn btn-success" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&open=<?php echo $id ?><?php echo $token_url ?>"><span class="fa fa-fw fa-unlock"></span> <?php _e('Open', 'luna') ?></a>
 				<?php } else { ?>
-					<a class="btn btn-danger" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&close=<?php echo $id ?>"><span class="fa fa-fw fa-lock"></span> <?php _e('Close', 'luna') ?></a>
+					<a class="btn btn-danger" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&close=<?php echo $id ?><?php echo $token_url ?>"><span class="fa fa-fw fa-lock"></span> <?php _e('Close', 'luna') ?></a>
 				<?php } ?>
 
 				<?php if ($cur_thread['pinned'] == '1') { ?>
-					<a class="btn btn-danger" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&unpin=<?php echo $id ?>"><span class="fa fa-fw fa-thumb-tack"></span> <?php _e('Unpin', 'luna') ?></a>
+					<a class="btn btn-danger" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&unpin=<?php echo $id ?><?php echo $token_url ?>"><span class="fa fa-fw fa-thumb-tack"></span> <?php _e('Unpin', 'luna') ?></a>
 				<?php } else { ?>
-					<a class="btn btn-primary" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&pin=<?php echo $id ?>"><span class="fa fa-fw fa-thumb-tack"></span> <?php _e('Pin', 'luna') ?></a>
+					<a class="btn btn-primary" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&pin=<?php echo $id ?><?php echo $token_url ?>"><span class="fa fa-fw fa-thumb-tack"></span> <?php _e('Pin', 'luna') ?></a>
+				<?php } ?>
+
+				<?php if ($cur_thread['important'] == '1') { ?>
+					<a class="btn btn-danger" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&unimportant=<?php echo $id ?><?php echo $token_url ?>"><span class="fa fa-fw fa-map-marker"></span> <?php _e('Unimportant', 'luna') ?></a>
+				<?php } else { ?>
+					<a class="btn btn-primary" href="backstage/moderate.php?fid=<?php echo $cur_thread['forum_id'] ?>&important=<?php echo $id ?><?php echo $token_url ?>"><span class="fa fa-fw fa-map-marker"></span> <?php _e('Important', 'luna') ?></a>
 				<?php } ?>
 			</div>
 		<?php endif; ?>