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

9 files changed, 16 insertions, 16 deletions

diff --git a/templates/admin_menu_options.tpl b/templates/admin_menu_options.tpl
index d4436cf..1deb10a 100644
--- a/templates/admin_menu_options.tpl
+++ b/templates/admin_menu_options.tpl
@@ -111,8 +111,8 @@
 			<td>{$admmoptions[user].perm}</td>
 			<td>{$admmoptions[user].groupname}</td>
 			<td class="alignright">
-				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$admmoptions[user].option_id}" onclick="return confirm('{tr}Are you sure you want to delete this menu item?{/tr}')" title="{tr}Delete this menu{/tr}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a>
-				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;option_id={$admmoptions[user].option_id}" title="Edit this menu">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
+				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$admmoptions[user].option_id}" onclick="return confirm('{tr}Are you sure you want to delete this menu item?{/tr}')" title="{tr}Delete this menu{/tr}">{booticon iname="fa-trash" iexplain="remove"}</a>
+				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;menu_id={$menu_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;option_id={$admmoptions[user].option_id}" title="Edit this menu">{booticon iname="fa-pen-to-square" iexplain="edit"}</a>
 			</td>
 		</tr>
 	{sectionelse}
diff --git a/templates/admin_notifications.tpl b/templates/admin_notifications.tpl
index b02cac6..1ced4d6 100644
--- a/templates/admin_notifications.tpl
+++ b/templates/admin_notifications.tpl
@@ -55,7 +55,7 @@
 					<td>{$channels[user].event}</td>
 					<td>{$channels[user].object}</td>
 					<td>{$channels[user].email}</td>
-					<td class="actionicon">{smartlink ititle="remove" booticon="icon-trash" offset=$offset removeevent=$channels[user].event object=$channels[user].object email=$channels[user].email}</td>
+					<td class="actionicon">{smartlink ititle="remove" booticon="fa-trash" offset=$offset removeevent=$channels[user].event object=$channels[user].object email=$channels[user].email}</td>
 				</tr>
 			{sectionelse}
 				<tr class="norecords"><td colspan="4">{tr}No records found{/tr}</td></tr>
diff --git a/templates/admin_packages.tpl b/templates/admin_packages.tpl
index 410927c..774c17c 100644
--- a/templates/admin_packages.tpl
+++ b/templates/admin_packages.tpl
@@ -63,7 +63,7 @@
 										{/if}
 									{/foreach}
 									{if $is_requirement}
-										{booticon iname="icon-ok"   iexplain="Required"}
+										{booticon iname="fa-check" iexplain="Required"}
 										<input type="hidden" value="y" name="fPackage[{$name}]" id="package_{$name}" />
 									{else}
 										<input type="checkbox" value="y" name="fPackage[{$name}]" id="package_{$name}" {if $package.active_switch eq 'y' }checked="checked"{/if} />
@@ -72,7 +72,7 @@
 									{assign var=first_loop value=1}
 									{foreach from=$gBitSystem->mRequirements key=required_by item=reqs}
 										{if $reqs.$name}
-											{if $first_loop}<br />{booticon iname="icon-warning-sign"   iexplain="Requirement"} Required by {else}, {/if}{$required_by}
+											{if $first_loop}<br />{booticon iname="fa-triangle-exclamation" iexplain="Requirement"} Required by {else}, {/if}{$required_by}
 											{assign var=first_loop value=0}
 										{/if}
 									{/foreach}
@@ -111,7 +111,7 @@
 										{/if}
 									{/foreach}
 									{if $is_requirement}
-										{booticon iname="icon-ok"   iexplain="Required"}
+										{booticon iname="fa-check" iexplain="Required"}
 										<input type="hidden" value="y" name="fPackage[{$name}]" id="package_{$name}" />
 									{else}
 										<input type="checkbox" value="y" name="fPackage[{$name}]" id="package_{$name}" {if $package.active_switch eq 'y' }checked="checked"{/if} />
@@ -120,7 +120,7 @@
 									{assign var=first_loop value=1}
 									{foreach from=$gBitSystem->mRequirements key=required_by item=reqs}
 										{if $reqs.$name}
-											{if $first_loop}<br />{booticon iname="icon-warning-sign"   iexplain="Requirement"} Required by {else}, {/if}{$required_by}
+											{if $first_loop}<br />{booticon iname="fa-triangle-exclamation" iexplain="Requirement"} Required by {else}, {/if}{$required_by}
 											{assign var=first_loop value=0}
 										{/if}
 									{/foreach}
diff --git a/templates/admin_system.tpl b/templates/admin_system.tpl
index ef10ec0..a5cd97c 100644
--- a/templates/admin_system.tpl
+++ b/templates/admin_system.tpl
@@ -54,7 +54,7 @@
 							<td>{$item.path|replace:$smarty.const.BIT_ROOT_PATH:""|replace:"//":"/"}</td>
 							<td class="alignright">{$item.du.count}</td>
 							<td class="alignright">{$item.du.size|display_bytes}</td>
-							<td class="actionicon">{smartlink ititle=Empty booticon="icon-trash" prune=$key}</td>
+							<td class="actionicon">{smartlink ititle=Empty booticon="fa-trash" prune=$key}</td>
 						</tr>
 					{/foreach}
 				</table>
@@ -75,7 +75,7 @@
 							<td>{$item.path|replace:$smarty.const.BIT_ROOT_PATH:""|replace:"//":"/"}{$key}</td>
 							<td class="alignright">{$item.du.count}</td>
 							<td class="alignright">{$item.du.size|display_bytes}</td>
-							<td class="actionicon">{smartlink ititle="Compile Templates" booticon="icon-edit" compiletemplates=$key}</td>
+							<td class="actionicon">{smartlink ititle="Compile Templates" booticon="fa-edit" compiletemplates=$key}</td>
 						</tr>
 					{/foreach}
 				</table>
diff --git a/templates/ajax_file_browser_inc.tpl b/templates/ajax_file_browser_inc.tpl
index f91c185..fc83975 100644
--- a/templates/ajax_file_browser_inc.tpl
+++ b/templates/ajax_file_browser_inc.tpl
@@ -4,7 +4,7 @@
 		<div style="margin-bottom:1em;cursor:hand;">
 			{foreach from=$fileList.dir item=finfo}
 				<div class="{cycle values="even,odd"}" style="margin-left:{$finfo.indent}px;" id="{$finfo.relpath|escape}" title="open" onclick='BitFileBrowser.browse(this.id,this.title,"{$smarty.request.ajax_path_conf}");'>
-					{booticon iname="icon-folder-close"  id="image-`$finfo.relpath`"  iexplain="Open"} {$finfo.name}
+					{booticon iname="fa-folder-closed" id="image-`$finfo.relpath`" iexplain="Open"} {$finfo.name}
 				</div>
 				<div id="{$finfo.relpath|escape}-bitInsert"></div>
 			{/foreach}
@@ -16,7 +16,7 @@
 					</div>
 				{else}
 					<div class="{cycle values="even,odd"}" style="margin-left:{$finfo.indent}px;">
-						{booticon iname="icon-warning-sign"   iexplain="Empty"} [{tr}empty{/tr}]
+						{booticon iname="fa-triangle-exclamation" iexplain="Empty"} [{tr}empty{/tr}]
 					</div>
 				{/if}
 			{/foreach}
diff --git a/templates/bot_bar.tpl b/templates/bot_bar.tpl
index d55e2aa..8459772 100644
--- a/templates/bot_bar.tpl
+++ b/templates/bot_bar.tpl
@@ -1,6 +1,6 @@
 <div class="col-md-12">
 {if $gBitSystem->isFeatureActive( 'messages_site_contact' )}
-	<a href="{$smarty.const.MESSAGES_PKG_URL}contact.php">{booticon iname="icon-envelope" ilocation=menu iexplain="Contact Us"}</a> 
+	<a href="{$smarty.const.MESSAGES_PKG_URL}contact.php">{booticon iname="fa-envelope" iexplain="Contact Us"}</a> 
 {/if}
 	<a id="poweredby" class="external pull-right" href="http://www.bitweaver.org"><img src="/liberty/icons/bitweaver/bitweaver.gif" alt="Bitweaver" title="Bitweaver" class="icon"></a> {$version_info.local}
 	{if $gBitUser->isAdmin()} <strong>{$gBitSystem->getBitVersion()}</strong>
diff --git a/templates/popup_box.tpl b/templates/popup_box.tpl
index dc12448..7288eb4 100644
--- a/templates/popup_box.tpl
+++ b/templates/popup_box.tpl
@@ -4,7 +4,7 @@
 	<h3>
 		{$title}
 		{if $closebutton}
-			<a class="closebutton" onclick='javascript:return cClick();'>{booticon iname="icon-remove"  ipackage="icons"  iexplain="close" iforce="icon"}</a>
+			<a class="closebutton" onclick='javascript:return cClick();'>{booticon iname="fa-circle-xmark" iexplain="close"}</a>
 		{/if}
 	</h3>
 
diff --git a/templates/top.tpl b/templates/top.tpl
index 6acecbf..0ffb0ff 100644
--- a/templates/top.tpl
+++ b/templates/top.tpl
@@ -5,7 +5,7 @@
 			{if $gBitUser->isRegistered()}
 			<ul class="nav nav-pills">
 				<li class="active dropdown">
-					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#"><i class="icon-user"></i> {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
+					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#">{booticon iname="fa-user"} {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
 					<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
 						<li><a href="{$gBitUser->getDisplayUrl()}">{tr}My Profile{/tr}</a></li>
 						<li><a href="{$smarty.const.USERS_PKG_URL}my.php">{tr}My Account{/tr}</a></li>
diff --git a/templates/top_bar.tpl b/templates/top_bar.tpl
index f56eb7d..d265bbe 100644
--- a/templates/top_bar.tpl
+++ b/templates/top_bar.tpl
@@ -1,7 +1,7 @@
 {strip}
 <nav class="navbar navbar-default {if $gBitSystem->getConfig('layout-header')}navbar-static-top{/if}" id="bittopbar">
 	<div class="navbar-header">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bit-top-menu">{booticon iname="icon-reorder"}</button>
+		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bit-top-menu">{booticon iname="fa-bars"}</button>
 		<a class="navbar-brand" href="{$smarty.const.BIT_ROOT_URL}" {if $gBitSystem->getConfig('site_slogan')} title="{$gBitSystem->getConfig('site_slogan')|escape}" {/if}>{$gBitSystem->getConfig('site_title')}</a>
 	</div>
 	{if $gBitSystem->mAppMenu}
@@ -34,7 +34,7 @@
 		<ul class="nav navbar-nav navbar-right">
 			{if $gBitUser->isRegistered()}
 				<li class="dropdown">
-					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#"><i class="icon-user"></i> {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
+					<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#">{booticon iname="fa-user"} {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
 					<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
 						<li><a href="{$gBitUser->getDisplayUrl()}">{tr}My Profile{/tr}</a></li>
 						<li><a href="{$smarty.const.USERS_PKG_URL}my">{tr}Dashboard{/tr}</a></li>