major clean up for bootstrap

9 files changed, 45 insertions, 57 deletions

diff --git a/templates/board_table.tpl b/templates/board_table.tpl
index 620154f..2bea801 100644
--- a/templates/board_table.tpl
+++ b/templates/board_table.tpl
@@ -1,7 +1,7 @@
 {strip}
-<table class="data">
+<table class="table data">
 	<tr>
-		<th class="boarddesc" colspan="2">Board</th>
+		<th class="boarddesc">{$smarty.const.BOARDS_PKG_DIR|ucfirst}</th>
 		<th class="topiccount">Topics</th>
 		<th class="postcount">Posts</th>
 		<th class="lastpost">Last Post</th>
@@ -15,36 +15,28 @@
 		{/if}
 
 		<tr class="{cycle values="even,odd"}{if $board.unreg > 0} unapproved{/if}">
-			<td>
 			{* topic tracking icons *}
-				<span style="float:left;">
-					{if $board.track.on && $board.track.mod}
-						{booticon iname="icon-folder-close"  ipackage="icons"  ipath="large" iexplain="New Posts" iforce="icon"}
-					{else}
-						{booticon iname="icon-folder-close"  ipackage="icons"  ipath="large" iexplain="New Posts" iforce="icon"}
-					{/if}
-				</span>
-			</td>
 			<td>
-				<h2 class="title"><a href="{$board.url}" title="{$board_title}">{$board_title}</a></h2>
+				{if $board.track.on && $board.track.mod}
+					{booticon iname="icon-asterisk"  ipackage="icons"  ipath="large" iexplain="New Posts" iforce="icon"}
+				{else}
+					{booticon iname="icon-asterisk"  ipackage="icons"  ipath="large" iexplain="New Posts" iforce="icon"}
+				{/if} <strong><a href="{$board.url}" title="{$board_title}">{$board_title}</a></strong>
 				<div class="desc">
 					{$board.parsed_data}
 				</div>
 			</td>
-			<td style="text-align:center">
+			<td class="aligncenter">
 				<strong class="count">{$board.topic_count}</strong>
 			</td>
-			<td style="text-align:center">
+			<td class="aligncenter">
 				<strong class="count">{$board.post_count}</strong>
 			</td>
 			<td>
 				{if !empty($board.last)}
 					<a href="{$board.last.url}" title="{$board.last.title|default:"Post..."}">{$board.last.title|default:"Post..."|truncate:30}</a>
-					<br/>
-					on&nbsp;{if $board.last.last_modified > 0}{$board.last.last_modified|reltime}{/if}
-					<br/>
-					by&nbsp;
-					{if $board.last.user_id < 0}{$board.last.l_anon_name|escape}{else}{displayname user_id=$board.last.user_id}{/if}
+					<br/> by {if $board.last.user_id < 0}{$board.last.l_anon_name|escape}{else}{displayname user_id=$board.last.user_id}{/if}
+					<br/> <small>{if $board.last.last_modified > 0}{$board.last.last_modified|reltime}{/if}</small>
 				{/if}
 				{if $gBitUser->hasPermission('p_boards_update') || $gBitUser->hasPermission('p_boards_post_update')}
 					{if $board.unreg > 0}<a class="highlight" href="{$board.url}" title="{$board.title|escape}">{$board.unreg}</a>{/if}
diff --git a/templates/boards_service_icons.tpl b/templates/boards_service_icons.tpl
index 8eef76a..0c6d9a3 100644
--- a/templates/boards_service_icons.tpl
+++ b/templates/boards_service_icons.tpl
@@ -1,3 +1,3 @@
 {if $boardInfo.board_id}
-	<a title="{tr}Discussion{/tr}" href="{$smarty.const.BOARDS_PKG_URL}?b={$boardInfo.board_id}&amp;filter_id={$gContent->mContentId}">{biticon ipackage="boards" iname="discuss_small" iexplain="Discuss"} [<strong>{$boardInfo.post_count}</strong>]</a>
+	<a title="{tr}Discussion{/tr}" href="{$smarty.const.BOARDS_PKG_URL}?b={$boardInfo.board_id}&amp;filter_id={$gContent->mContentId}">{booticon ipackage="boards" iname="icon-comments" iexplain="Discuss"} [<strong>{$boardInfo.post_count}</strong>]</a>
 {/if}
diff --git a/templates/flipswitch.tpl b/templates/flipswitch.tpl
index 07d7a45..922eab2 100644
--- a/templates/flipswitch.tpl
+++ b/templates/flipswitch.tpl
@@ -14,13 +14,13 @@ $flip_downname=>$flip.$flip_name.downname
 {if $gContent->hasUserPermission( $flip.$flip_name.perm )}
 <a href="{$smarty.const.BOARDS_PKG_URL}edit_topic.php?{$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"}&amp;{$flip_name}={$flip.$flip_name.state|escape:"url"}" />
 	{if $flip.$flip_name.state==1}
-		{biticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"}
+		{booticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"}
 	{else}
-		{biticon ipackage=icons iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname iforce="icon"}
+		{booticon ipackage=icons iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname iforce="icon"}
 	{/if}
 </a>
 {elseif $flip.$flip_name.state==1}
-	{biticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"}
+	{booticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"}
 {/if}
 </span>
 {/strip}
diff --git a/templates/legend_inc.tpl b/templates/legend_inc.tpl
index ff813aa..debe9b2 100644
--- a/templates/legend_inc.tpl
+++ b/templates/legend_inc.tpl
@@ -1,9 +1,11 @@
 {strip}
-<ul class="iconlegend">
-	{if $topicicons}
-		<li>{booticon iname="icon-lock" ipackage="icons"      ipath=large iexplain="Thread Closed" iforce="icon"} {tr}Thread Closed{/tr}</li>
-		<li>{biticon ipackage="icons" iname="emblem-important"     ipath=large iexplain="Sticky" iforce="icon"} {tr}Sticky{/tr}</li>
-		<li>{booticon iname="icon-folder-close"  ipackage="icons"             ipath=large iexplain="New Posts" iforce="icon"} {tr}New Posts{/tr}</li>
-	{/if}
+{if $topicicons}
+<div class="alert alert-info">
+<ul class="inline unstyled">
+		<li>{booticon iname="icon-lock" ipackage="icons" ipath=large iexplain="Thread Closed" iforce="icon"} {tr}Thread Closed{/tr}</li>
+		<li>{booticon iname="icon-exclamation-sign" ipackage="icons" ipath=large iexplain="Sticky" iforce="icon"} {tr}Sticky{/tr}</li>
+		<li>{booticon iname="icon-asterisk" ipackage="icons" ipath=large iexplain="New Posts" iforce="icon"} {tr}New Posts{/tr}</li>
 </ul>
+</div>
+{/if}
 {/strip}
diff --git a/templates/list_boards.tpl b/templates/list_boards.tpl
index 1729117..0cde976 100644
--- a/templates/list_boards.tpl
+++ b/templates/list_boards.tpl
@@ -15,7 +15,7 @@
 			{tr}No message boards found{/tr}
 		{/foreach}
 
-		{include file="bitpackage:boards/legend_inc.tpl"  boardicons=1}
+		{include file="bitpackage:boards/legend_inc.tpl" boardicons=1}
 	</div><!-- end .body -->
 </div><!-- end .admin -->
 {/strip}
diff --git a/templates/list_posts.tpl b/templates/list_posts.tpl
index eed9240..977e3d5 100644
--- a/templates/list_posts.tpl
+++ b/templates/list_posts.tpl
@@ -10,38 +10,33 @@
 
 	<div class="floaticon floatctrl">
 		{* not happy with this yet - xing *}
-		{form action="$comments_return_url" class="mb-threading"}
+		{form action="$comments_return_url" class="form-inline mb-threading"}
 			<input type="hidden" name="t" value="{$smarty.request.t}" />
 			{* always go back to page 1 since changing any of these values
 			   repaginates and makes the current page number meaningless *}
 			<input type="hidden" name="comment_page" value="1" />
-			<label for="comments-sort">{tr}Sort:{/tr} </label>
-			<select name="comments_sort_mode" id="comments-sort">
-				<option value="commentDate_desc" {if $comments_sort_mode eq "commentDate_desc"}selected="selected"{/if}>Newest first</option>
-				<option value="commentDate_asc" {if $comments_sort_mode eq "commentDate_asc"}selected="selected"{/if}>Oldest first</option>
+			<i class="icon-sort"></i> <select name="comments_sort_mode" id="comments-sort">
+				<option value="commentDate_desc" {if $comments_sort_mode eq "commentDate_desc"}selected="selected"{/if}>{tr}Newest{/tr}</option>
+				<option value="commentDate_asc" {if $comments_sort_mode eq "commentDate_asc"}selected="selected"{/if}>{tr}Oldest{/tr}</option>
 			</select>
 			&nbsp;&nbsp;
 			<label>
-				{tr}Threaded{/tr}: <input type="checkbox" name="comments_style" id="comments-style" value="threaded" {if $comments_style eq "threaded"}checked="checked"{/if} onchange="this.form.submit()"/>
+				<input type="checkbox" name="comments_style" id="comments-style" value="threaded" {if $comments_style eq "threaded"}checked="checked"{/if} onchange="this.form.submit()"/> {tr}Threaded{/tr}
 			</label>
 			&nbsp; &nbsp;
 			<label>
-				{tr}Messages{/tr}: <select name="comments_maxComments" id="comments-maxcomm" onchange="this.form.submit()">
+				<select name="comments_maxComments" id="comments-maxcomm" onchange="this.form.submit()">
 					<option value="5" {if $maxComments eq 5}selected="selected"{/if}>5</option>
 					<option value="10" {if $maxComments eq 10}selected="selected"{/if}>10</option>
 					<option value="20" {if $maxComments eq 20}selected="selected"{/if}>20</option>
 					<option value="50" {if $maxComments eq 50}selected="selected"{/if}>50</option>
 					<option value="100" {if $maxComments eq 100}selected="selected"{/if}>100</option>
 					<option value="999999" {if $maxComments eq 999999}selected="selected"{/if}>All</option>
-				</select> <input type="submit" class="btn" name="comments_setOptions" value="set" id="set_btn"/>
+				</select> {tr}Messages{/tr} 
 			</label>
-			<input type="submit" class="btn" name="comments_setOptions" value="set" />
-			<script type="text/javascript">/*<![CDATA[*/
-				document.getElementById('set_btn').parentNode.removeChild(document.getElementById('set_btn'));
-			/*]]>*/</script>
 		{/form}
 		{if $gBitSystem->isPackageActive( 'rss' )}
-			<a title="{tr}Get RSS Feed{/tr}" href="{$smarty.const.BOARDS_PKG_URL}rss.php?t={$smarty.request.t}">{biticon iname="rss-16x16" ipackage=rss iexplain="Get RSS Feed"}</a>
+			<a title="{tr}Get RSS Feed{/tr}" href="{$smarty.const.BOARDS_PKG_URL}rss.php?t={$smarty.request.t}">{booticon iname="icon-rss" ipackage=rss iexplain="Get RSS Feed"}</a>
 		{/if}
 		{assign var=flip value=$thread->getFlipFlop()}
 		{foreach from=$flip item=flip_s key=flip_name}
@@ -59,7 +54,7 @@
 	<div class="body">
 		{if !$topic_locked && $board->hasPostCommentsPermission()}
 			<div class="control-group submit">
-				<a title="{tr}Post Reply{/tr}" class="btn" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-envelope-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
+				<a title="{tr}Post Reply{/tr}" class="btn" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
 			</div>
 		{/if}
 
@@ -87,7 +82,7 @@
 
 		{if !$topic_locked && $board->hasPostCommentsPermission()}
 			<div class="control-group submit">
-				<a title="{tr}Post Reply{/tr}" class="btn" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-envelope-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
+				<a title="{tr}Post Reply{/tr}" class="btn" href="{$comments_return_url}&amp;post_comment_reply_id={$thread->mInfo.flc_content_id}&amp;post_comment_request=1#editcomments">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a>
 			</div>
 		{/if}
 
diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl
index 3f82b79..55239b0 100644
--- a/templates/list_topics.tpl
+++ b/templates/list_topics.tpl
@@ -11,10 +11,10 @@
 		{if $print_page ne 'y'}
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$board->mInfo}
 			{if $board->getPreference('boards_mailing_list') || $board->hasAdminPermission()}
-				<a class="item" href="{$smarty.const.BOARDS_PKG_URL}mailing_list.php?b={$board->mInfo.board_id}" title="{tr}Message Board Mailing List{/tr}">{biticon ipackage="icons" iname="internet-mail" iexplain="Edit Board Mailing List"}</a>
+				<a class="item" href="{$smarty.const.BOARDS_PKG_URL}mailing_list.php?b={$board->mInfo.board_id}" title="{tr}Message Board Mailing List{/tr}">{booticon ipackage="icons" iname="icon-envelope" iexplain="Edit Board Mailing List"}</a>
 			{/if}
 			{if $gBitSystem->isPackageActive( 'rss' )}
-				<a title="{tr}Get RSS Feed{/tr}" href="{$smarty.const.BOARDS_PKG_URL}rss.php?b={$smarty.request.b}">{biticon iname="rss-16x16" ipackage=rss iexplain="Get RSS Feed"}</a>
+				<a title="{tr}Get RSS Feed{/tr}" href="{$smarty.const.BOARDS_PKG_URL}rss.php?b={$smarty.request.b}">{booticon iname="icon-rss" ipackage=rss iexplain="Get RSS Feed"}</a>
 			{/if}
 			{if $board->hasUpdatePermission()}
 				<a title="{tr}Edit message board{/tr}" href="{$smarty.const.BOARDS_PKG_URL}edit.php?b={$board->mInfo.board_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Message Board"}</a>
@@ -68,7 +68,7 @@
 					<tr class="{cycle values="even,odd"} {if $gBitSystem->isFeatureActive('boards_post_anon_moderation') && $thread.unreg > 0}unapproved{elseif $thread.th_moved>0}moved{/if} {if $thread.th_sticky==1} highlight{/if}" >
 						<td style="white-space:nowrap;">{* topic status icons *}
 							{if $thread.th_moved>0}
-								{biticon ipackage="icons" iname="go-jump" iexplain="Moved Topic"}
+								{booticon ipackage="icons" iname="icon-share" iexplain="Moved Topic"}
 							{else}
 								{assign var=flip value=$thread.flip}
 								{foreach from=$flip item=flip_s key=flip_name}
@@ -109,9 +109,8 @@
 								{if $thread.th_moved==0 && $board->hasAdminPermission()}
 									{*smartlink ititle="Edit" ifile="edit.php" ibiticon="liberty/edit" board_id=$thread.board_id*}
 									<a href="{$smarty.const.BOARDS_PKG_URL}topic_move.php?t={$thread.th_thread_id|escape:"url"}"
-										title="{tr}Move Thread{/tr}">{biticon ipackage=icons iname="go-jump" iexplain="Move Thread" iforce="icon"}
-									</a>
-									<a title="{tr}Delete Topic{/tr}" href="{$smarty.const.BOARDS_PKG_URL}edit_topic.php?remove=1&amp;t={$thread.th_thread_id|escape:"url"}">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete Thread" iforce="icon"}</a>
+										title="{tr}Move Thread{/tr}">{booticon ipackage=icons iname="icon-share" iexplain="Move Thread" iforce="icon"}
+									</a> <a title="{tr}Delete Topic{/tr}" href="{$smarty.const.BOARDS_PKG_URL}edit_topic.php?remove=1&amp;t={$thread.th_thread_id|escape:"url"}">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete Thread" iforce="icon"}</a>
 								{/if}
 							</td>
 
diff --git a/templates/menu_boards.tpl b/templates/menu_boards.tpl
index 384980a..a62be2a 100644
--- a/templates/menu_boards.tpl
+++ b/templates/menu_boards.tpl
@@ -2,11 +2,11 @@
 	<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>
 <ul class="{$packageMenuClass}">
 		{if $gBitUser->hasPermission( 'p_boards_read')}
-			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}index.php">{booticon iname="icon-home" ipackage="icons" iexplain="Boards Home" ilocation=menu}</a></li>
+			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}index.php">{booticon iname="icon-home" ipackage="icons" iexplain="Browse `$smarty.const.BOARDS_PKG_DIR`" ilocation=menu}</a></li>
 		{/if}
 		{if $gBitUser->hasPermission( 'p_boards_create')}
-			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}edit.php">{booticon iname="icon-folder-close"   ipackage="icons" iexplain="Create new Board" ilocation=menu}</a></li>
-			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}assign.php">{booticon iname="icon-circle-arrow-right"   ipackage="icons" iexplain="Assign to Boards" ilocation=menu}</a></li>
+			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}edit.php">{booticon iname="icon-folder-close"   ipackage="icons" iexplain="Create new `$smarty.const.BOARDS_PKG_DIR`" ilocation=menu}</a></li>
+			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}assign.php">{booticon iname="icon-circle-arrow-right"   ipackage="icons" iexplain="Assign to `$smarty.const.BOARDS_PKG_DIR`" ilocation=menu}</a></li>
 		{/if}
 	</ul>
 {/strip}
diff --git a/templates/post_display.tpl b/templates/post_display.tpl
index 31a4d05..baf22cf 100644
--- a/templates/post_display.tpl
+++ b/templates/post_display.tpl
@@ -28,10 +28,10 @@
 			<div class="floaticon">
 				{if $print_page ne 'y' && $comment.deleted==0 }
 					{if !$topic_locked && $board->hasPostCommentsPermission()}
-						<a href="{$comments_return_url}&amp;post_comment_reply_id={$comment.content_id}&amp;post_comment_request=1#editcomments" rel="nofollow">{booticon iname="icon-envelope-alt"  ipackage="icons"  iexplain="Reply to this Post" iforce="icon"}</a>
+						<a href="{$comments_return_url}&amp;post_comment_reply_id={$comment.content_id}&amp;post_comment_request=1#editcomments" rel="nofollow">{booticon iname="icon-comment-alt"  ipackage="icons"  iexplain="Reply to this Post" iforce="icon"}</a>
 					{/if}
 					{if !$topic_locked && $board->hasPostCommentsPermission()}
-						<a href="{$comments_return_url}&amp;post_comment_reply_id={$comment.content_id}&amp;post_comment_request=1&amp;quote=y#editcomments" rel="nofollow">{biticon ipackage="icons" iname="mail-reply-all" iexplain="Reply with Quote to this Post" iforce="icon"}</a>
+						<a href="{$comments_return_url}&amp;post_comment_reply_id={$comment.content_id}&amp;post_comment_request=1&amp;quote=y#editcomments" rel="nofollow">{booticon ipackage="icons" iname="icon-comment" iexplain="Reply with Quote to this Post" iforce="icon"}</a>
 					{/if}
 					{if $comment.is_editable || $gContent->hasUserPermission('p_liberty_edit_comments')}
 						<a href="{$comments_return_url}&amp;post_comment_id={$comment.comment_id}&amp;post_comment_request=1#editcomments" rel="nofollow">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit" iforce="icon"}</a>
@@ -114,7 +114,7 @@
 						');
 					return false;
 					" href="{$thread_mInfo.display_url}&amp;warning[{$comment_id}]={if empty($warnings.$comment_id)}show{else}hide{/if}"
-				>{biticon ipackage="icons" iname="dialog-error" iexplain="Warned Post"}</a>
+				>{booticon ipackage="icons" iname="icon-warning-sign" iexplain="Warned Post"}</a>
 
 				<div id="warned_message_{$comment.comment_id|escape:"url"}">
 					{if !empty($warnings.$comment_id)}{$comment.warned_message}{/if}