convert lots of biticon to booticon

6 files changed, 27 insertions, 14 deletions

diff --git a/smartyplugins/function.smartlink.php b/smartyplugins/function.smartlink.php
index c9ddd58..fed054a 100644
--- a/smartyplugins/function.smartlink.php
+++ b/smartyplugins/function.smartlink.php
@@ -107,7 +107,7 @@ function smarty_function_smartlink( $params, &$gBitSmarty ) {
 		if( $sort_asc == $isort_mode ) {
 			$sorticon = array(
 				'ipackage' => 'icons',
-				'iname' => 'view-sort-ascending',
+				'iname' => 'icon-sort-up',
 				'iexplain' => 'ascending',
 				'iforce' => 'icon',
 			);
@@ -115,7 +115,7 @@ function smarty_function_smartlink( $params, &$gBitSmarty ) {
 		} elseif( $sort_desc == $isort_mode ) {
 			$sorticon = array(
 				'ipackage' => 'icons',
-				'iname' => 'view-sort-descending',
+				'iname' => 'icon-sort-down',
 				'iexplain' => 'descending',
 				'iforce' => 'icon',
 			);
@@ -162,6 +162,7 @@ function smarty_function_smartlink( $params, &$gBitSmarty ) {
 	$url_params = preg_replace('/"/', '%22', $url_params);
 
 	require_once $gBitSmarty->_get_plugin_filepath( 'function','biticon' );
+	require_once $gBitSmarty->_get_plugin_filepath( 'function','booticon' );
 
 	if( isset( $hash['itype'] ) && $hash['itype'] == 'url' ) {
 		$ret = $url.$url_params;
@@ -169,7 +170,19 @@ function smarty_function_smartlink( $params, &$gBitSmarty ) {
 		$ret = '<a '.$atitle.' '.( !empty( $params['ionclick'] ) ? 'onclick="'.$params['ionclick'].'" ' : '' ).'href="'.$url.$url_params.( !empty( $params['ianchor'] ) ? '#'.$params['ianchor'] : '' ).'">';
 
 		// if we want to display an icon instead of text, do that
-		if( isset( $hash['ibiticon'] ) ) {
+		if( isset( $hash['booticon'] ) ) {
+			if( !empty( $tmp[2] )) {
+				$tmp[1] .= "/".$tmp[2];
+			}
+			$booticon = array(
+				'iname' => $hash['booticon'],
+				'iexplain' => $hash['ititle'], // use untranslated ititle - booticon has a tra()
+			);
+			if( !empty( $hash['iforce'] ) ) {
+				$booticon['iforce'] = $hash['iforce'];
+			}
+			$ret .= smarty_function_booticon( $booticon, $gBitSmarty );
+		} elseif( isset( $hash['ibiticon'] ) ) {
 			$tmp = explode( '/', $hash['ibiticon'] );
 			if( !empty( $tmp[2] )) {
 				$tmp[1] .= "/".$tmp[2];
@@ -188,7 +201,7 @@ function smarty_function_smartlink( $params, &$gBitSmarty ) {
 		}
 
 		if( isset( $sorticon ) ) {
-			$ret .= '&nbsp;'.smarty_function_biticon( $sorticon, $gBitSmarty );
+			$ret .= '&nbsp;'.smarty_function_booticon( $sorticon, $gBitSmarty );
 		}
 		$ret .= '</a>';
 	}
diff --git a/templates/admin_custom_modules.tpl b/templates/admin_custom_modules.tpl
index 3de1023..92d53ce 100644
--- a/templates/admin_custom_modules.tpl
+++ b/templates/admin_custom_modules.tpl
@@ -56,7 +56,7 @@
 			<td>{$customModules[user].name|escape}</td>
 			<td>{$customModules[user].title|escape}</td>
 			<td class="alignright">
-				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=layout&amp;module_name=_custom%3Acustom%2F{$customModules[user].name}">{biticon ipackage="icons" iname="mail-attachment" iexplain=assign}</a>
+				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=layout&amp;module_name=_custom%3Acustom%2F{$customModules[user].name}">{booticon iname="icon-paperclip"  ipackage="icons"  iexplain=assign}</a>
 				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=custom_modules&amp;name={$customModules[user].name}&amp;action=edit">{booticon iname="icon-edit" ipackage="icons" iexplain=edit}</a>
 				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=custom_modules&amp;name={$customModules[user].name}&amp;action=remove">{booticon iname="icon-trash" ipackage="icons" iexplain=delete}</a>
 			</td>
diff --git a/templates/admin_layout_inc.tpl b/templates/admin_layout_inc.tpl
index 3f75d2e..b63c9d8 100644
--- a/templates/admin_layout_inc.tpl
+++ b/templates/admin_layout_inc.tpl
@@ -15,7 +15,7 @@
 			<div class="control-group">
 				{formlabel label="Adjust modules" for=""}
 				{forminput}
-					<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;fixpos=1">{biticon iname="emblem-symbolic-link" iforce=icon_text iexplain="Adjust module postitions"}</a>
+					<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;fixpos=1">{booticon iname="icon-circle-arrow-right"   iforce=icon_text iexplain="Adjust module postitions"}</a>
 					{formhelp note="Reset the position numbers of <em>all modules</em> using increments of 5."}
 				{/forminput}
 			</div>
diff --git a/templates/admin_layout_overview.tpl b/templates/admin_layout_overview.tpl
index a0682e4..2ff1c99 100644
--- a/templates/admin_layout_overview.tpl
+++ b/templates/admin_layout_overview.tpl
@@ -37,8 +37,8 @@
 			{jstab title=$TabTitle}
 
 				<div class="floaticon">
-					{smartlink ititle="Edit this Layout" ibiticon="icons/accessories-text-editor" page=layout module_package=$module_package}
-					{smartlink ititle="Remove this Layout" ibiticon="icons/edit-delete" page=$page remove_layout=$module_package ionclick="return confirm('{tr}Are you sure you want to remove this layout? This can not be undone.{/tr}')"}
+					{smartlink ititle="Edit this Layout" booticon="icon-edit" page=layout module_package=$module_package}
+					{smartlink ititle="Remove this Layout" booticon="icon-trash" page=$page remove_layout=$module_package ionclick="return confirm('{tr}Are you sure you want to remove this layout? This can not be undone.{/tr}')"}
 				</div>
 
 				<h1 id="{$module_package}">
diff --git a/templates/module_config_inc.tpl b/templates/module_config_inc.tpl
index 2c3f8fb..4d8b7b9 100644
--- a/templates/module_config_inc.tpl
+++ b/templates/module_config_inc.tpl
@@ -1,5 +1,5 @@
 {capture name=shared}
-	{smartlink ititle="Up" ibiticon="icons/go-up" iforce="icon" page=$page move_module=up module_package=$module_package module_id=`$modInfo.module_id`}
+	{smartlink ititle="Up" booticon="icon-cloud-upload" iforce="icon" page=$page move_module=up module_package=$module_package module_id=`$modInfo.module_id`}
 	{smartlink ititle="Down" ibiticon="icons/go-down" iforce="icon" page=$page move_module=down module_package=$module_package module_id=`$modInfo.module_id`}
 	{if $colkey eq 'left' or $colkey eq 'right'}
 		{if $colkey == 'left'}
@@ -12,9 +12,9 @@
 		{smartlink ititle="Move module" ibiticon="icons/go-$icon" iforce="icon" iexplain="`$move`" page=$page move_module=$move module_package=$module_package module_id=$modInfo.module_id}
 	{/if}
 	{if $gBitThemes->isCustomModule( $modInfo.module_rsrc )}
-		{smartlink ititle="Edit" ibiticon="icons/accessories-text-editor" iforce=icon iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
+		{smartlink ititle="Edit" booticon="icon-edit" iforce=icon iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
 	{/if}
-	{smartlink ititle="Unassign" ibiticon="icons/edit-delete" iforce=icon iexplain="Delete" ionclick="return confirm('Are you sure you want to remove `$modInfo.name`?');" page=$page move_module=unassign module_package=$module_package module_id=$modInfo.module_id }
+	{smartlink ititle="Unassign" booticon="icon-trash" iforce=icon iexplain="Delete" ionclick="return confirm('Are you sure you want to remove `$modInfo.name`?');" page=$page move_module=unassign module_package=$module_package module_id=$modInfo.module_id }
 {/capture}
 
 {strip}
diff --git a/templates/module_config_role_inc.tpl b/templates/module_config_role_inc.tpl
index 13e2f62..1990f85 100644
--- a/templates/module_config_role_inc.tpl
+++ b/templates/module_config_role_inc.tpl
@@ -1,5 +1,5 @@
 {capture name=shared}
-	{smartlink ititle="Up" ibiticon="icons/go-up" iforce="icon" page=$page move_module=up module_package=$module_package module_id=`$modInfo.module_id`}
+	{smartlink ititle="Up" booticon="icon-cloud-upload" iforce="icon" page=$page move_module=up module_package=$module_package module_id=`$modInfo.module_id`}
 	{smartlink ititle="Down" ibiticon="icons/go-down" iforce="icon" page=$page move_module=down module_package=$module_package module_id=`$modInfo.module_id`}
 	{if $colkey eq 'left' or $colkey eq 'right'}
 		{if $colkey == 'left'}
@@ -12,9 +12,9 @@
 		{smartlink ititle="Move module" ibiticon="icons/go-$icon" iforce="icon" iexplain="`$move`" page=$page move_module=$move module_package=$module_package module_id=$modInfo.module_id}
 	{/if}
 	{if $gBitThemes->isCustomModule( $modInfo.module_rsrc )}
-		{smartlink ititle="Edit" ibiticon="icons/accessories-text-editor" iforce=icon iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
+		{smartlink ititle="Edit" booticon="icon-edit" iforce=icon iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
 	{/if}
-	{smartlink ititle="Unassign" ibiticon="icons/edit-delete" iforce=icon iexplain="Delete" ionclick="return confirm('Are you sure you want to remove `$modInfo.name`?');" page=$page move_module=unassign module_package=$module_package module_id=$modInfo.module_id }
+	{smartlink ititle="Unassign" booticon="icon-trash" iforce=icon iexplain="Delete" ionclick="return confirm('Are you sure you want to remove `$modInfo.name`?');" page=$page move_module=unassign module_package=$module_package module_id=$modInfo.module_id }
 {/capture}
 
 {strip}