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

10 files changed, 34 insertions, 34 deletions

diff --git a/templates/edit_image.tpl b/templates/edit_image.tpl
index 66cb30f..e9b54d4 100644
--- a/templates/edit_image.tpl
+++ b/templates/edit_image.tpl
@@ -70,10 +70,10 @@
 							{formlabel label="Rotate Image"}
 							{forminput}
 {if function_exists('exif_read_data')}
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="auto"/> {booticon iname="icon-chevron-sign-up" iexplain="Auto Rotate"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="auto"/> {booticon iname="fa-chevron-up" iexplain="Auto Rotate"}</label>
 {/if}
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="-90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Counter Clockwise"}</label>
-								<label class="radio-inline"><input type="radio" name="rotate_image" value="90"/> {booticon iname="icon-rotate-left" iexplain="Rotate Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="-90"/> {booticon iname="fa-arrow-rotate-left" iexplain="Rotate Counter Clockwise"}</label>
+								<label class="radio-inline"><input type="radio" name="rotate_image" value="90"/> {booticon iname="fa-arrow-rotate-left" iexplain="Rotate Clockwise"}</label>
 								<label class="radio-inline"><input type="radio" name="rotate_image" value="" checked="checked"/> {tr}don't rotate{/tr}</label>
 							{/forminput}
 						</div>
diff --git a/templates/gallery_icons_inc.tpl b/templates/gallery_icons_inc.tpl
index 9cc6ed8..aa08b8d 100644
--- a/templates/gallery_icons_inc.tpl
+++ b/templates/gallery_icons_inc.tpl
@@ -1,20 +1,20 @@
 <div class="floaticon">
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
 	{if $gContent->hasUserPermission( 'p_fisheye_download_gallery_arc' ) }	
-		<a title="{tr}Download Gallery{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}view.php?gallery_id={$gContent->mGalleryId}&amp;download=1">{booticon iname="icon-cloud-download" iexplain="Download Gallery"}</a>
+		<a title="{tr}Download Gallery{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}view.php?gallery_id={$gContent->mGalleryId}&amp;download=1">{booticon iname="fa-cloud-down-arrow" iexplain="Download Gallery"}</a>
 	{/if}
 	{if $gContent->hasUpdatePermission()}
-		<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{booticon iname="icon-edit"  ipackage="icons"  iexplain="Edit"}</a>
-		<a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{booticon iname="icon-sort" iexplain="Image Order"}</a>
+		<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-pen-to-square"  ipackage="icons"  iexplain="Edit"}</a>
+		<a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-sort" iexplain="Image Order"}</a>
 	{/if}
 	{if $gContent->hasUpdatePermission() || $gContent->getPreference('is_public')}
-		<a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{booticon iname="icon-arrow-up" ipackage="icons" iexplain="Add Image"}</a>
+		<a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-arrow-sup" ipackage="icons" iexplain="Add Image"}</a>
 	{/if}
 	{if $gContent->getPreference('is_public')}
-		{booticon iname="icon-asterisk"  ipackage="icons"  iexplain="Public"}
+		{booticon iname="fa-asterisk"  ipackage="icons"  iexplain="Public"}
 	{/if}
 	{if $gContent->hasAdminPermission()}
-		<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}&amp;delete=1">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete Gallery"}</a>
-	{* appears broken at the moment	<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$gContent->mGalleryId}">{booticon iname="icon-key" ipackage="icons" iexplain="User Permissions"}</a> *}
+		<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}&amp;delete=1">{booticon iname="fa-trash" ipackage="icons" iexplain="Delete Gallery"}</a>
+	{* appears broken at the moment	<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-key" ipackage="icons" iexplain="User Permissions"}</a> *}
 	{/if}
 </div>
diff --git a/templates/gallery_nav.tpl b/templates/gallery_nav.tpl
index d011591..e192e67 100644
--- a/templates/gallery_nav.tpl
+++ b/templates/gallery_nav.tpl
@@ -28,7 +28,7 @@
 				{if $gGallery->mInfo.previous_image_id}
 					<a href="{$gContent->getImageUrl($gGallery->mInfo.previous_image_id)|escape}">
 						{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
-							{booticon iname="icon-arrow-left"  ipackage="icons"  iexplain=previous iforce="icon"}
+							{booticon iname="fa-arrow-left"  ipackage="icons"  iexplain=previous}
 						{else}
 							&laquo;&nbsp;{tr}previous{/tr}
 						{/if}
@@ -44,7 +44,7 @@
 				{if $gGallery->mInfo.next_image_id}
 					<a href="{$gContent->getImageUrl($gGallery->mInfo.next_image_id)|escape}">
 						{if $gBitSystem->isFeatureActive( 'gallerybar_use_icons' )}
-							{booticon iname="icon-arrow-right" iexplain=next}
+							{booticon iname="fa-arrow-right" iexplain=next}
 						{else}
 							{tr}next{/tr}&nbsp;&raquo;
 						{/if}
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index 154819c..f07cc96 100644
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -48,10 +48,10 @@
 							<strong>{tr}Uploaded{/tr}</strong>: {$galItem->mInfo.created|bit_short_datetime}<br />
 							<strong>{tr}File name{/tr}</strong>: {$galItem->mInfo.filename} <br />
 								{if $galItem->mInfo.user_id == $gBitUser->mUserId || $gBitUser->isAdmin()}
-								<strong>{tr}Edit Image{/tr}</strong>: <a href="javascript:void(0);" onclick="BitAjax.updater( 'imgedit', '{$smarty.const.FISHEYE_PKG_URL}edit_image.php', 'ajax=true&amp;content_id={$galItem->mInfo.content_id}&amp;gallery_id={$gContent->mGalleryId}' );">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Details"}</a>
-								<noscript><div><a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Image"}</a></div></noscript>
+								<strong>{tr}Edit Image{/tr}</strong>: <a href="javascript:void(0);" onclick="BitAjax.updater( 'imgedit', '{$smarty.const.FISHEYE_PKG_URL}edit_image.php', 'ajax=true&amp;content_id={$galItem->mInfo.content_id}&amp;gallery_id={$gContent->mGalleryId}' );">{booticon iname="fa-pen-to-square" iexplain="Edit Details"}</a>
+								<noscript><div><a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a></div></noscript>
 {*								jspopup href="`$smarty.const.FISHEYE_PKG_URL`edit_image.php?content_id=$galItem->mInfo.content_id" title="edit image" *}
-{*								<a target="_new" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Image"}</a> *}
+{*								<a target="_new" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a> *}
 								<br />
 								{/if}
 							{/if}
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index 7d32308..1265b72 100644
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -10,7 +10,7 @@
 
 	<section class="body">
 		<ul class="list-inline sortby">
-			<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="sort by" iforce="icon"}</li>
+			<li>{booticon iname="fa-circle-arrow-right" iexplain="sort by"}</li>
 			{if $gBitSystem->isFeatureActive('fisheye_list_title')}
 				<li>{smartlink ititle="Gallery Name" isort="title" user_id=$gQuerUserId offset=$iMaxRows home=$userInfo.login search=$iSearchString}</li>
 			{/if}
@@ -38,7 +38,7 @@
 					{assign var=thumbnailUri value=$gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.FISHEYE_PKG_URL`image/no_image.png")}
 					<a href="{$gal.display_url}"><div class="square" style="background-image:url('{$thumbnailUri}');"alt="{$gal.title|escape}" title="{$gal.title|truncate:50|escape}" {if !empty($gal.data)} data-toggle="popover" data-trigger="click hover focus" data-placement="top" data-content="{$gal.data|truncate:100}"{else}{/if}><img src="{$thumbnailUri}" alt="{$gal.title|escape}"><h3 class="gallery-title"><a href="{$gal.display_url}">{if $gBitSystem->isFeatureActive('fisheye_list_title')}{$gal.title|truncate:25|escape}{else}Gallery {$gal.gallery_id}{/if}</a></h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
 							{if $gal.is_hidden=='y' || $gal.is_private=='y' || $gal.access_answer}
-								{booticon iname="icon-lock" ipackage="icons" iexplain="Security" label=TRUE}
+								{booticon iname="fa-lock" iexplain="Security" label=TRUE}
 							{/if}
 							{if $gal.is_hidden=='y'}
 								<span style="padding:5px;">{tr}Hidden{/tr}</span>
@@ -57,7 +57,7 @@
 						<strong>{displayname hash=$gal nolink=TRUE}</strong> <small><a href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gal.user_id}" style="display:block;">{tr}Galleries{/tr}</a></small>
 					{/if}
 					{* if $galleryList[ix]->isProtected()}
-						{booticon iname="icon-lock" ipackage="icons" iexplain="Protected"}
+						{booticon iname="fa-lock" iexplain="Protected"}
 					{/if *}
 
 					{if $gBitSystem->isFeatureActive('fisheye_list_created' ) or $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
diff --git a/templates/menu_fisheye.tpl b/templates/menu_fisheye.tpl
index 4dfad14..12ea186 100644
--- a/templates/menu_fisheye.tpl
+++ b/templates/menu_fisheye.tpl
@@ -2,23 +2,23 @@
 {if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
 <ul class="{$packageMenuClass}">
 	{if $gBitUser->hasPermission('p_fisheye_view')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{booticon iname="icon-list" iexplain="List Galleries" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{booticon iname="fa-list-ul" iexplain="List Galleries" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission('p_fisheye_create')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gBitUser->mUserId}">{booticon iname="icon-picture" iexplain="My Galleries" ilocation=menu}</a></li>
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit.php">{booticon iname="icon-camera" iexplain="Create a Gallery" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gBitUser->mUserId}">{booticon iname="fa-image-landscape" iexplain="My Galleries" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit.php">{booticon iname="fa-camera" iexplain="Create a Gallery" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission('p_fisheye_upload')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}upload.php">{booticon iname="icon-cloud-upload" iexplain="Upload Images" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}upload.php">{booticon iname="fa-cloud-arrow-up" iexplain="Upload Images" ilocation=menu}</a></li>
 	{/if}
 	{* if $gBitUser->hasPermission('p_fisheye_view')}
-		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{booticon iname="icon-sitemap" iexplain="growser gallery tree" ilocation=menu} {tr}Browse Gallery Tree{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{booticon iname="fa-sitemap" iexplain="growser gallery tree" ilocation=menu} {tr}Browse Gallery Tree{/tr}</a></li>
 	{/if *}
 	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('quota')}
-		<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="icon-hdd" iexplain="Usage" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="fa-hard-drive" iexplain="Usage" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('gatekeeper')}
-		<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="icon-lock" iexplain="Security" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="fa-lock" iexplain="Security" ilocation=menu}</a></li>
 	{/if}
 	{*if $gBitUser->hasPermission('p_fisheye_admin')}
 		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}admin/admin_imagegals.php">{tr}Admin Galleries{/tr}</a></li>
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl
index 86bf82b..d466ca0 100644
--- a/templates/upload_fisheye.tpl
+++ b/templates/upload_fisheye.tpl
@@ -6,7 +6,7 @@
 {strip}
 <div class="admin fisheye">
 	<div class="header">
-		<h1>{booticon iname="icon-cloud-upload" ipackage="icons" iexplain="^"} {tr}Upload Photos{/tr}</h1>
+		<h1>{booticon iname="fa-cloud-arrow-up" iexplain="^"} {tr}Upload Photos{/tr}</h1>
 	</div>
 
 	<div class="body">
@@ -16,7 +16,7 @@
 					{jstab title="Upload Files"}
 						{formfeedback note=$quotaMessage}
 
-						<p class="warning">{booticon iname="icon-warning-sign"  ipackage="icons"  iexplain=Warning iforce=icon} {tr}The maximum file size you can upload is {$uploadMax} Megabytes{/tr}</p>
+						<p class="warning">{booticon iname="fa-triangle-exclamation" iexplain=Warning} {tr}The maximum file size you can upload is {$uploadMax} Megabytes{/tr}</p>
 						{formfeedback error=$errors}
 
 						{formhelp note="Here you can upload files. You can upload single files, or you can upload archived files (.zip's, .tar's, etc.) Archived uploads will automatically be decompressed, and a gallery will created for every gallery in it. If you have nested folders, the hierarchy will be maintained for you with nested galleries." force=true}
diff --git a/templates/view_gallery_files_inc.tpl b/templates/view_gallery_files_inc.tpl
index bcc9f10..88b0402 100644
--- a/templates/view_gallery_files_inc.tpl
+++ b/templates/view_gallery_files_inc.tpl
@@ -2,7 +2,7 @@
 {minifind}
 
 <ul class="list-inline navbar sortby">
-	<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="sort by"}</li>
+	<li>{booticon iname="fa-circle-arrow-right" iexplain="sort by"}</li>
 	<li>{smartlink ititle="Created" isort="created" numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}</li>
 	<li>{smartlink ititle="Last Modified" isort="last_modified" numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}</li>
 	<li>{smartlink ititle="File Type" isort="file_type" numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}</li>
diff --git a/templates/view_gallery_images_inc.tpl b/templates/view_gallery_images_inc.tpl
index 0c07a70..d3c30ad 100644
--- a/templates/view_gallery_images_inc.tpl
+++ b/templates/view_gallery_images_inc.tpl
@@ -124,11 +124,11 @@
 							<a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
 						{/if}
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
-							<a href="{$galItem->getDisplayUrl()}">{booticon iname="icon-folder-open"  ipackage="icons"  iexplain="View File"}</a>
+							<a href="{$galItem->getDisplayUrl()}">{booticon iname="fa-folder-open" iexplain="View File"}</a>
 						{/if}
 						{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
-							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit File"}</a>
-							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{booticon iname="icon-trash" ipackage="icons" iexplain="Remove File"}</a>
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{booticon iname="fa-pen-to-square" iexplain="Edit File"}</a>
+							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{booticon iname="fa-trash" iexplain="Remove File"}</a>
 						{/if}
 					{/if}
 				</td>
diff --git a/templates/view_image.tpl b/templates/view_image.tpl
index c7deb4e..5884bd1 100644
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -8,9 +8,9 @@
 		<div class="floaticon">
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
 			{if $gContent->hasUpdatePermission()}
-				<a title="{tr}Refresh{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image/{$gContent->mImageId}?rethumb=1">{booticon iname="icon-refresh" ipackage="icons" iexplain="Refresh"}</a>
-				<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image?image_id={$gContent->mImageId}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit Image"}</a>
-				<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image?image_id={$gContent->mImageId}&amp;delete=1">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete Image"}</a>
+				<a title="{tr}Refresh{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image/{$gContent->mImageId}?rethumb=1">{booticon iname="fa-arrows-rotate" iexplain="Refresh"}</a>
+				<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image?image_id={$gContent->mImageId}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a>
+				<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image?image_id={$gContent->mImageId}&amp;delete=1">{booticon iname="fa-trash" iexplain="Delete Image"}</a>
 			{/if}
 		</div>
 	{/if}