Convert {booticon} to {biticon} — freedesktop/tango icon names throughout

Replace all {booticon iname="icon-*"} and {booticon iname="fa-*"} calls with
{biticon ipackage="icons" iname="<freedesktop-name>"} using the tango iconset.
Mapping covers ~70 distinct old names to tango equivalents (edit-delete,
document-properties, go-next, lock, internet-mail, etc.).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

10 files changed, 36 insertions, 37 deletions

diff --git a/.hgtags b/.hgtags
index b970318..b970318 100644..100755
--- a/.hgtags
+++ b/.hgtags
diff --git a/smartyplugins/function.bithelp.php b/smartyplugins/function.bithelp.php
index a174e77..d16d578 100755
--- a/smartyplugins/function.bithelp.php
+++ b/smartyplugins/function.bithelp.php
@@ -19,10 +19,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(['ipackage'=>'icons', 'iname'=>'icon-cogs', 'iexplain'=>'Administration Menu'] )."</a> ";
+			$outstr .= "<a href=\"".KERNEL_PKG_URL."admin/index.php\">".smarty_function_biticon(['ipackage'=>'icons', 'iname'=>'icon-cogs', 'iexplain'=>'Administration Menu'] )."</a> ";
 		}
 		if( $helpInfo = $gBitSmarty->getTemplateVars('TikiHelpInfo') ) {
-			$outstr .= "<a href=\"".$helpInfo["URL"]."\" >".smarty_function_booticon(['ipackage'=>'icons', 'iname'=>'icon-question-sign', 'iexplain'=>(empty($helpInfo["Desc"])?"help":$helpInfo["Desc"])] )."</a>";
+			$outstr .= "<a href=\"".$helpInfo["URL"]."\" >".smarty_function_biticon(['ipackage'=>'icons', 'iname'=>'icon-question-sign', 'iexplain'=>(empty($helpInfo["Desc"])?"help":$helpInfo["Desc"])] )."</a>";
 		}
 	}
 	return $outstr;
diff --git a/smartyplugins/function.booticon.php b/smartyplugins/function.booticon.php
index 78d82df..bd70e98 100755
--- a/smartyplugins/function.booticon.php
+++ b/smartyplugins/function.booticon.php
@@ -20,7 +20,7 @@ namespace Bitweaver\Plugins;
  * @access public
  * @return string Full <img> on success
  */
-function smarty_function_booticon( $pParams ) {
+function smarty_function_biticon( $pParams ) {
 	global $gBitSystem;
 
 	if( empty( $pParams['iforce'] )) {
diff --git a/smartyplugins/function.smartlink.php b/smartyplugins/function.smartlink.php
index a867ce6..94e204b 100755
--- a/smartyplugins/function.smartlink.php
+++ b/smartyplugins/function.smartlink.php
@@ -126,7 +126,7 @@ function smarty_function_smartlink( $pParams, &$pSmarty=NULL ) {
 		}
 	}
 
-	$ignore = [ 'iatitle', 'icontrol', 'isort', 'ianchor', 'isort_mode', 'iorder', 'ititle', 'idefault', 'ifile', 'ipackage', 'itype', 'iurl', 'ionclick', 'ibiticon', 'booticon', 'iforce', 'itra' ];
+	$ignore = [ 'iatitle', 'icontrol', 'isort', 'ianchor', 'isort_mode', 'iorder', 'ititle', 'idefault', 'ifile', 'ipackage', 'itype', 'iurl', 'ionclick', 'ibiticon', 'booticon', 'biticon', 'iforce', 'itra' ];
 	// append any other paramters that were passed in
 	foreach( $hash as $key => $val ) {
 		if( !empty( $val ) && !in_array( $key, $ignore ) ) {
@@ -168,18 +168,17 @@ function smarty_function_smartlink( $pParams, &$pSmarty=NULL ) {
 		$ret = '<a class="icon" '.$atitle.' '.( !empty( $pParams['ionclick'] ) ? 'onclick="'.$pParams['ionclick'].'" ' : '' ).'href="'.$url.$url_params.( !empty( $pParams['ianchor'] ) ? '#'.$pParams['ianchor'] : '' ).'">';
 
 		// if we want to display an icon instead of text, do that
-		if( isset( $hash['booticon'] ) ) {
-	//		if( !empty( $tmp[2] )) {
-	//			$tmp[1] .= "/".$tmp[2];
-	//		}
-			$booticon = [
-				'iname' => $hash['booticon'],
-				'iexplain' => $hash['ititle'], // use untranslated ititle - booticon has a KernelTools::tra()
+		if( isset( $hash['biticon'] ) || isset( $hash['booticon'] ) ) {
+			$iname = $hash['biticon'] ?? $hash['booticon'];
+			$biticon = [
+				'ipackage' => 'icons',
+				'iname'    => $iname,
+				'iexplain' => $hash['ititle'],
 			];
 			if( !empty( $hash['iforce'] ) ) {
-				$booticon['iforce'] = $hash['iforce'];
+				$biticon['iforce'] = $hash['iforce'];
 			}
-			$ret .= smarty_function_booticon( $booticon );
+			$ret .= smarty_function_biticon( $biticon );
 		} elseif( isset( $hash['ibiticon'] ) ) {
 			$tmp = explode( '/', $hash['ibiticon'] );
 			if( !empty( $tmp[2] )) {
@@ -199,7 +198,7 @@ function smarty_function_smartlink( $pParams, &$pSmarty=NULL ) {
 		}
 
 		if( isset( $sorticon ) ) {
-			$ret .= '&nbsp;'.smarty_function_booticon( $sorticon );
+			$ret .= '&nbsp;'.smarty_function_biticon( $sorticon );
 		}
 		$ret .= '</a>';
 	}
diff --git a/templates/admin_custom_modules.tpl b/templates/admin_custom_modules.tpl
index 634560a..676ab5a 100755
--- a/templates/admin_custom_modules.tpl
+++ b/templates/admin_custom_modules.tpl
@@ -56,9 +56,9 @@
 			<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}">{booticon iname="fa-paperclip" 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="fa-pen-to-square" 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="fa-trash" iexplain=delete}</a>
+				<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=custom_modules&amp;name={$customModules[user].name}&amp;action=edit">{biticon ipackage="icons" iname="document-properties" iexplain=edit}</a>
+				<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=custom_modules&amp;name={$customModules[user].name}&amp;action=remove">{biticon ipackage="icons" iname="edit-delete" iexplain=delete}</a>
 			</td>
 		</tr>
 	{sectionelse}
diff --git a/templates/admin_layout_inc.tpl b/templates/admin_layout_inc.tpl
index de2a41b..5b592e4 100755
--- a/templates/admin_layout_inc.tpl
+++ b/templates/admin_layout_inc.tpl
@@ -5,9 +5,9 @@
 				{formlabel label="Adjust display" for=""}
 				{forminput}
 					{if !$smarty.request.nocollapse|default:false}
-						<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;nocollapse=1">{booticon iname="fa-circle-plus" iexplain="Expand all modules"}</a>
+						<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;nocollapse=1">{biticon ipackage="icons" iname="list-add" iexplain="Expand all modules"}</a>
 					{else}
-						<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}">{booticon iname="fa-circle-minus" iexplain="Collapse all modules"}</a>
+						<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}">{biticon ipackage="icons" iname="list-remove" iexplain="Collapse all modules"}</a>
 					{/if}
 					{formhelp note="Toggle the state of <em>all modules</em> (expanded/collapsed). This reloads the page without saving changes made prior."}
 				{/forminput}
@@ -15,7 +15,7 @@
 			<div class="form-group">
 				{formlabel label="Adjust modules" for=""}
 				{forminput}
-					<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;fixpos=1">{booticon iname="fa-circle-arrow-right" iexplain="Adjust module postitions"}</a>
+					<a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page={$page}&amp;fixpos=1">{biticon ipackage="icons" iname="go-next" 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 1b9998a..2790c75 100755
--- a/templates/admin_layout_overview.tpl
+++ b/templates/admin_layout_overview.tpl
@@ -20,8 +20,8 @@
 			{jstab title=$tabTitle}
 
 				<div class="floaticon">
-					{smartlink ititle="Edit this Layout" booticon="fa-edit" page=layout module_package=$module_package}
-					{smartlink ititle="Remove this Layout" booticon="fa-trash" page=$page remove_layout=$module_package onclick="return confirm('{tr}Are you sure you want to remove this layout? This can not be undone.{/tr}')"}
+					{smartlink ititle="Edit this Layout" biticon="document-properties" page=layout module_package=$module_package}
+					{smartlink ititle="Remove this Layout" biticon="edit-delete" page=$page remove_layout=$module_package onclick="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/admin_themes_manager.tpl b/templates/admin_themes_manager.tpl
index bde786e..45229a5 100755
--- a/templates/admin_themes_manager.tpl
+++ b/templates/admin_themes_manager.tpl
@@ -10,8 +10,8 @@
 			<div id="themeapprove">
 				<h1>{tr}Confirm Selection{/tr}</h1>
 				<p>{tr}The settings you have chosen has not been applied to the site yet. This allows you to test the styles before applying them to your site. To accept the change, please click on the accept button below{/tr}<p>
-				<a class="btn btn-primary" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$smarty.request.site_style}&amp;style_variation={$smarty.request.style_variation}&amp;site_style_layout={$smarty.request.site_style_layout}&amp;approved=1">{booticon iname="fa-circle-check"}{tr}Accept{/tr}</a>
-				<a class="btn pull-right" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php">{booticon iname="fa-circle-xmark" }{tr}Cancel{/tr}</a>
+				<a class="btn btn-primary" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$smarty.request.site_style}&amp;style_variation={$smarty.request.style_variation}&amp;site_style_layout={$smarty.request.site_style_layout}&amp;approved=1">{biticon ipackage="icons" iname="dialog-ok"}{tr}Accept{/tr}</a>
+				<a class="btn pull-right" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php">{biticon ipackage="icons" iname="process-stop" }{tr}Cancel{/tr}</a>
 			</div>
 		{/if}
 
@@ -21,7 +21,7 @@
 					{foreach from=$stylesList item=s}
 						<legend {if $style eq $s.style}class="highlight"{/if}>
 							{if $style eq $s.style}
-								{booticon iname="fa-check" iexplain="Current Theme"}&nbsp;
+								{biticon ipackage="icons" iname="dialog-ok" iexplain="Current Theme"}&nbsp;
 							{/if}
 							<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$s.style}">{$s.style|replace:"_":" "}</a>
 						</legend>
@@ -60,7 +60,7 @@
 							<li class="item">
 								<legend {if $style eq $s.style}class="highlight"{/if}>
 									{if $gBitSystem->getConfig(site_icon_style) eq $s.style}
-										{booticon iname="fa-check" iexplain="Current Theme"}&nbsp;
+										{biticon ipackage="icons" iname="dialog-ok" iexplain="Current Theme"}&nbsp;
 									{/if}
 									<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_icon_style={$s.style}">{$s.style|replace:"_":" "}</a>
 								</legend>
@@ -75,7 +75,7 @@
 
 								<h3>{tr}Sample icons{/tr}</h3>
 								{foreach from=$sampleIcons item=icon}
-									{biticon ipackage=icons istyle=$s.style iname="fa-large/$icon" iexplain=$icon}
+									{biticon ipackage=icons istyle=$s.style iname=$icon isize="large" iexplain=$icon}
 								{/foreach}
 
 								{if $smarty.const.DEFAULT_ICON_STYLE eq $s.style}
diff --git a/templates/module_config_inc.tpl b/templates/module_config_inc.tpl
index 3e9197e..37b3352 100755
--- a/templates/module_config_inc.tpl
+++ b/templates/module_config_inc.tpl
@@ -1,18 +1,18 @@
 {capture name=shared}
-	{smartlink ititle="Up" booticon="fa-arrow-up" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
-	{smartlink ititle="Down" booticon="fa-arrow-down" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
+	{smartlink ititle="Up" biticon="go-up" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
+	{smartlink ititle="Down" biticon="go-down" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
 	{if $colkey eq 'left' || $colkey eq 'right'}
 		{if $colkey == 'left'}
 			{assign var=move value=right}
 		{elseif $colkey == 'right'}
 			{assign var=move value=left}
 		{/if}
-		{smartlink ititle="Move module" booticon="fa-arrow-$move" iexplain="`$move`" page=$page move_module=$move module_package=$module_package module_id=$modInfo.module_id}
+		{smartlink ititle="Move module" biticon="go-$move" 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" booticon="fa-edit" iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
+		{smartlink ititle="Edit" biticon="document-properties" iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
 	{/if}
-	{smartlink ititle="Unassign" booticon="fa-trash" 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" biticon="edit-delete" 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 454995e..0640b86 100755
--- a/templates/module_config_role_inc.tpl
+++ b/templates/module_config_role_inc.tpl
@@ -1,6 +1,6 @@
 {capture name=shared}
-	{smartlink ititle="Up" booticon="fa-arrow-up" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
-	{smartlink ititle="Down" booticon="fa-arrow-down" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
+	{smartlink ititle="Up" biticon="go-up" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
+	{smartlink ititle="Down" biticon="go-down" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
 	{if $colkey eq 'left' || $colkey eq 'right'}
 		{if $colkey == 'left'}
 			{assign var=icon value=next}
@@ -9,12 +9,12 @@
 			{assign var=icon value=previous}
 			{assign var=move value=left}
 		{/if}
-		{smartlink ititle="Move module" booticon="fa-arrow-$icon" iexplain="`$move`" page=$page move_module=$move module_package=$module_package module_id=$modInfo.module_id}
+		{smartlink ititle="Move module" biticon="go-$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" booticon="fa-edit" iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
+		{smartlink ititle="Edit" biticon="document-properties" iexplain="Edit" page=custom_modules name=$modInfo.module_rsrc|regex_replace:"!.*\/!":"" action=edit}
 	{/if}
-	{smartlink ititle="Unassign" booticon="fa-trash" 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" biticon="edit-delete" 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}