From 62e06d7a309a7cedf7b98965302a1c8382c453a6 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Fri, 21 Jun 2013 02:43:37 -0700
Subject: [PATCH] Font-Awesome CDN added (for now) and additional icons used in
 forum.

---
 e107_plugins/forum/forum_viewforum.php                 | 10 ++++++++--
 .../forum/shortcodes/batch/view_shortcodes.php         |  2 +-
 e107_themes/bootstrap/theme.php                        |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index efdc54c70..681ebb6be 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -688,12 +688,18 @@ function fadminoptions($thread_info)
 	$id = intval($thread_info['thread_id']);
 	
 	$lan = array('stick'=>'Stick','unstick'=>'Unstick','lock'=>"Lock", 'unlock'=>"Unlock");
+	$icon = array(
+		'unstick'	=>	"<i class='icon-chevron-down'></i>",
+		'stick'	=>	"<i class='icon-chevron-up'></i>",
+		'lock'	=>	"<i class='icon-lock'></i>",
+		'unlock'	=>	"<i class='icon-unlock'></i>",
+	);
 	
 
 
 	$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='delete' data-forum-thread='".$id."'>Delete <i class='icon-trash'></i></a></li>";
-	$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$stickUnstick."' data-forum-thread='".$id."'>".$lan[$stickUnstick]."</a></li>";
-	$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$lockUnlock."' data-forum-thread='".$id."'>".$lan[$lockUnlock]." <i class='icon-lock'></i></a></li>";
+	$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$stickUnstick."' data-forum-thread='".$id."'>".$lan[$stickUnstick]." ".$icon[$stickUnstick]."</a></li>";
+	$text .= "<li><a href='".e_REQUEST_URI."' data-forum-action='".$lockUnlock."' data-forum-thread='".$id."'>".$lan[$lockUnlock]." ".$icon[$lockUnlock]."</a></li>";
 	
 	$text .= "<li><a href='{$moveUrl}'>Move <i class='icon-move'></i></a></li>";
 
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 6637c1cb2..294ef55b6 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -514,7 +514,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
 			}
 			else
 			{
-				$text .= "<li><a href='" . e107::getUrl()->create('forum/thread/split', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2043."</a></li>";
+				$text .= "<li><a href='" . e107::getUrl()->create('forum/thread/split', array('id' => $this->postInfo['post_id']))."'>".LAN_FORUM_2043." <i class='icon-cut'></i></a></li>";
 		
 			}
 		}
diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php
index 99be24131..25061a583 100644
--- a/e107_themes/bootstrap/theme.php
+++ b/e107_themes/bootstrap/theme.php
@@ -37,6 +37,7 @@ else
 
 e107::css('bootstrap','bootstrap-responsive.min.css');
 e107::css('bootstrap','jquery-ui.custom.css');
+e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css");
 
 e107::css('theme', 'js/google-code-prettify/prettify.css');
 e107::js('theme', "js/google-code-prettify/prettify.js");