migrate from font-awesome 3.2.1 icon- to 6.1.2 fa-

3 files changed, 20 insertions, 7 deletions

diff --git a/smartyplugins/function.bithelp.php b/smartyplugins/function.bithelp.php
index 3586b81..b64c241 100644
--- a/smartyplugins/function.bithelp.php
+++ b/smartyplugins/function.bithelp.php
@@ -17,10 +17,10 @@ function smarty_function_bithelp($params, &$gBitSmarty) {
 	$outstr = "";
 	if( $gBitSystem->isFeatureActive('site_online_help') ){
 		if($gBitUser->hasPermission( 'p_admin' )){
-			$outstr .= "<a href=\"".KERNEL_PKG_URL."admin/index.php\">".smarty_function_booticon(array('ipackage'=>'icons', 'iname'=>'icon-cogs', 'iexplain'=>'Administration Menu'),$gBitSmarty)."</a> ";
+			$outstr .= "<a href=\"".KERNEL_PKG_URL."admin/index.php\">".smarty_function_booticon(array('iname'=>'fa-gears', 'iexplain'=>'Administration Menu'),$gBitSmarty)."</a> ";
 		}
 		if( $helpInfo = $gBitSmarty->getTemplateVars('TikiHelpInfo') ) {
-			$outstr .= "<a href=\"".$helpInfo["URL"]."\" >".smarty_function_booticon(array('ipackage'=>'icons', 'iname'=>'icon-question-sign', 'iexplain'=>(empty($helpInfo["Desc"])?"help":$helpInfo["Desc"])),$gBitSmarty)."</a>";
+			$outstr .= "<a href=\"".$helpInfo["URL"]."\" >".smarty_function_booticon(array('iname'=>'fa-circle-question', 'iexplain'=>(empty($helpInfo["Desc"])?"help":$helpInfo["Desc"])),$gBitSmarty)."</a>";
 		}
 	}
 	return $outstr;
diff --git a/smartyplugins/function.booticon.php b/smartyplugins/function.booticon.php
index ca7ecc0..b5367da 100644
--- a/smartyplugins/function.booticon.php
+++ b/smartyplugins/function.booticon.php
@@ -33,18 +33,31 @@ function smarty_function_booticon( $pParams ) {
 		$outstr .= '>';
 	}
 
-	$outstr .= '<span class="';
-	if( isset( $pParams["iname"] ) ) {
-		$outstr .= $pParams['iname'];
+	$outstr .= '<span class="fa ';
+	if( strpos( $pParams["iname"], 'icon-' ) === 0 ) {
+		$pParams['iname'] = str_replace( 'icon-', 'fa-', $pParams['iname'] );
 	}
+if( strpos( $pParams["iname"], 'fa-' ) !== 0 ) {
+	bit_error_log( 'missing fa '.$pParams["iname"] );
+}
+
+	$outstr .= str_replace( 'icon-', '', $pParams['iname'] );
+	
 	if( isset( $pParams["iclass"] ) ) {
 		$outstr .=  ' '.$pParams["iclass"].'';
 	}
 	if( isset( $pParams["class"] ) ) {
 		$outstr .=  ' '.$pParams["class"].'';
 	}
+	if( isset( $pParams["igroup"] ) ) {
+		$outstr .=  ' '.$pParams["igroup"].'';
+	}
 	$outstr .= '"';
 
+	if( isset( $pParams["style"] ) ) {
+		$outstr .=  ' style="'.$pParams["style"].'"';
+	}
+
 	if( isset( $pParams["id"] ) ) {
 		$outstr .=  ' id="'.$pParams['id'].'"';
 	}
diff --git a/smartyplugins/function.smartlink.php b/smartyplugins/function.smartlink.php
index 9d67ba9..a05e6cf 100644
--- a/smartyplugins/function.smartlink.php
+++ b/smartyplugins/function.smartlink.php
@@ -108,7 +108,7 @@ function smarty_function_smartlink( $pParams, &$pSmarty=NULL ) {
 		if( $sort_asc == $isort_mode ) {
 			$sorticon = array(
 				'ipackage' => 'icons',
-				'iname' => 'icon-sort-up',
+				'iname' => 'fa-sort-up',
 				'iexplain' => 'ascending',
 				'iforce' => 'icon',
 			);
@@ -116,7 +116,7 @@ function smarty_function_smartlink( $pParams, &$pSmarty=NULL ) {
 		} elseif( $sort_desc == $isort_mode ) {
 			$sorticon = array(
 				'ipackage' => 'icons',
-				'iname' => 'icon-sort-down',
+				'iname' => 'fa-sort-down',
 				'iexplain' => 'descending',
 				'iforce' => 'icon',
 			);