diff options
| author | spiderr <spiderr@bitweaver.org> | 2022-07-31 13:57:50 -0400 |
|---|---|---|
| committer | spiderr <spiderr@bitweaver.org> | 2022-07-31 13:57:50 -0400 |
| commit | 234d8073dc607c3726af8ac21ba1c70f73d5b0f7 (patch) | |
| tree | 09cb2b7e7b02ee16f07dd076c787bbbd371b46fb | |
| parent | fe81f9394953662a811ed148c0161dc8af8b443b (diff) | |
| download | users-234d8073dc607c3726af8ac21ba1c70f73d5b0f7.tar.gz users-234d8073dc607c3726af8ac21ba1c70f73d5b0f7.tar.bz2 users-234d8073dc607c3726af8ac21ba1c70f73d5b0f7.zip | |
migrate from font-awesome 3.2.1 icon- to 6.1.2 fa-
29 files changed, 119 insertions, 122 deletions
diff --git a/includes/classes/BitHybridAuthManager.php b/includes/classes/BitHybridAuthManager.php index 94cf88b..61bdfc5 100644 --- a/includes/classes/BitHybridAuthManager.php +++ b/includes/classes/BitHybridAuthManager.php @@ -184,7 +184,7 @@ class BitHybridAuthManager extends BitSingleton { } private function getProviderIcon( $pProvider ) { - $ret = 'icon-user'; + $ret = 'fa-user'; $allProviders = $this->getAllProviders(); if( !empty( $allProviders[$pProvider]['icon'] ) ) { $ret = $allProviders[$pProvider]['icon']; @@ -227,18 +227,18 @@ class BitHybridAuthManager extends BitSingleton { public function getAllProviders() { return array ( - 'google' => array( 'provider' => 'Google', 'icon' => 'icon-google-plus-sign', 'image' => USERS_PKG_URL.'hauth/images/google.png', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'amazon' => array( 'provider' => 'Amazon', 'icon' => 'icon-user', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'aol' => array( 'provider' => 'AOL', 'icon' => 'icon-user', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'facebook' => array( 'provider' => 'Facebook', 'icon' => 'icon-facebook-sign', 'keys' => array( 'id'=>'', 'secret'=> '' ), 'options' => array( 'scope'=>'Comma separated list of requested permissions. Default are: email, user_about_me, user_birthday, user_hometown, user_location, user_website, publish_actions, read_custom_friendlists' ) ), - 'foursquare' => array( 'provider' => 'Foursquare', 'icon' => 'icon-foursquare', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'instagram' => array( 'provider' => 'Instagram', 'icon' => 'icon-instagram', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'linkedin' => array( 'provider' => 'LinkedIn', 'icon' => 'icon-linkedin', 'keys' => array( 'key'=>'', 'secret'=> '' ) ), - 'live' => array( 'provider' => 'Live', 'icon' => 'icon-windows', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'openid' => array( 'provider' => 'OpenID', 'icon' => 'icon-user', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'paypal' => array( 'provider' => 'Paypal', 'icon' => 'icon-user', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), - 'twitter' => array( 'provider' => 'Twitter', 'icon' => 'icon-twitter', 'keys' => array( 'key'=>'', 'secret'=> '' ) ), - 'yahoo' => array( 'provider' => 'Yahoo', 'icon' => 'icon-user', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'google' => array( 'provider' => 'Google', 'icon' => ' fab fa-google', 'image' => USERS_PKG_URL.'hauth/images/google.png', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'amazon' => array( 'provider' => 'Amazon', 'icon' => ' fab fa-amazon', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'aol' => array( 'provider' => 'AOL', 'icon' => ' fa fa-user', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'facebook' => array( 'provider' => 'Facebook', 'icon' => ' fab fa-facebook', 'keys' => array( 'id'=>'', 'secret'=> '' ), 'options' => array( 'scope'=>'Comma separated list of requested permissions. Default are: email, user_about_me, user_birthday, user_hometown, user_location, user_website, publish_actions, read_custom_friendlists' ) ), + 'foursquare' => array( 'provider' => 'Foursquare', 'icon' => ' fab fa-foursquare', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'instagram' => array( 'provider' => 'Instagram', 'icon' => ' fab fa-instagram', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'linkedin' => array( 'provider' => 'LinkedIn', 'icon' => ' fab fa-linkedin', 'keys' => array( 'key'=>'', 'secret'=> '' ) ), + 'live' => array( 'provider' => 'Live', 'icon' => ' fab fa-windows', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'openid' => array( 'provider' => 'OpenID', 'icon' => ' fab fa-openid', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'paypal' => array( 'provider' => 'Paypal', 'icon' => ' fab fa-paypal', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), + 'twitter' => array( 'provider' => 'Twitter', 'icon' => ' fab fa-twitter', 'keys' => array( 'key'=>'', 'secret'=> '' ) ), + 'yahoo' => array( 'provider' => 'Yahoo', 'icon' => ' fab fa-yahoo', 'keys' => array( 'id'=>'', 'secret'=> '' ) ), ); } diff --git a/modules/mod_user_profile.tpl b/modules/mod_user_profile.tpl index 4355975..88eb3bc 100644 --- a/modules/mod_user_profile.tpl +++ b/modules/mod_user_profile.tpl @@ -13,10 +13,10 @@ <div class="floaticon"> {if $gQueryUserId and $gBitSystem->isPackageActive( 'messages' ) and $gBitUser->hasPermission( 'p_messages_send' ) and $userPrefs.messages_allow_messages eq 'y'} - <a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$userInfo.login}">{booticon iname="icon-envelope" ipackage="icons" iexplain="Send user a personal message" iforce="icon"}</a> + <a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$userInfo.login}">{booticon iname="fa-envelope" iexplain="Send user a personal message"}</a> {/if} {if $gBitUser->hasPermission('p_users_edit_user_homepage')} - <a href="{$smarty.const.USERS_PKG_URL}preferences.php?view_user={$userInfo.user_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit your preferences"}</a> + <a href="{$smarty.const.USERS_PKG_URL}preferences.php?view_user={$userInfo.user_id}">{booticon iname="fa-pencil" iexplain="Edit your preferences"}</a> {/if} </div> diff --git a/modules/mod_who_is_there.tpl b/modules/mod_who_is_there.tpl index f0632ec..348ee0a 100644 --- a/modules/mod_who_is_there.tpl +++ b/modules/mod_who_is_there.tpl @@ -14,7 +14,7 @@ </div> {section name=ix loop=$online_users} {if $user and $gBitSystem->isFeatureActive( 'feature_messages' ) and $gBitUser->hasPermission( 'p_messages_send' )} - <a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$online_users[ix].user}" title="{tr}Send a message to{/tr} {$online_users[ix].user}">{booticon iname="icon-envelope" ipackage="icons" style="width:8px;height:8px;"" iexplain="send message"}</a> + <a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$online_users[ix].user}" title="{tr}Send a message to{/tr} {$online_users[ix].user}">{booticon iname="fa-envelope" iexplain="send message"}</a> {/if} {if $online_users[ix].users_information eq 'public'} {math equation="x - y" x=$smarty.now y=$online_users[ix].last_get assign=idle} diff --git a/templates/admin_assign_role_user.tpl b/templates/admin_assign_role_user.tpl index 874c46f..ee91a8a 100644 --- a/templates/admin_assign_role_user.tpl +++ b/templates/admin_assign_role_user.tpl @@ -1,7 +1,7 @@ {* $Header$ *} {strip} <div class="floaticon">{bithelp}</div> -<div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{booticon iname="icon-arrow-left" ipackage="icons" iexplain="back to users"}</a></div> +<div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{booticon iname="fa-arrow-left" iexplain="back to users"}</a></div> <div class="admin users"> <div class="header"> @@ -53,7 +53,7 @@ <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$roleId}">{$role.role_name}</a> {if $roleId eq $assignUser->mInfo.default_role_id}</strong>{/if} {if $roleId != -1} - <a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&role_id={$roleId}&assign_user={$assignUser->mUserId}&tk={$gBitUser->mTicket}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove from role" iforce="icon"}</a> + <a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&role_id={$roleId}&assign_user={$assignUser->mUserId}&tk={$gBitUser->mTicket}">{booticon iname="fa-trash" iexplain="remove from role"}</a> {/if} <br /> {/foreach} @@ -93,7 +93,7 @@ <td>{$role.role_desc}</td> <td class="actionicon"> <a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?offset={$offset}&sort_mode={$sort_mode}&action=assign&role_id={$roleId}&assign_user={$assignUser->mUserId}"> - {booticon iname="icon-key" ipackage="icons" iexplain="assign" iforce="icon"} + {booticon iname="fa-key" iexplain="assign"} </a> </td> </tr> diff --git a/templates/admin_assign_user.tpl b/templates/admin_assign_user.tpl index dda3b89..dac3a38 100644 --- a/templates/admin_assign_user.tpl +++ b/templates/admin_assign_user.tpl @@ -1,7 +1,7 @@ {* $Header$ *} {strip} <div class="floaticon">{bithelp}</div> -<div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{booticon iname="icon-arrow-left" ipackage="icons" iexplain="back to users"}</a></div> +<div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{booticon iname="fa-arrow-left" iexplain="back to users"}</a></div> <div class="admin users"> <div class="header"> @@ -53,7 +53,7 @@ {if $groupId eq $assignUser->mInfo.default_group_id}<strong>{/if} {if $groupId eq $assignUser->mInfo.default_group_id}</strong>{/if} {if $groupId != -1} - <a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&group_id={$groupId}&assign_user={$assignUser->mUserId}&tk={$gBitUser->mTicket}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove from group" iforce="icon"}</a> + <a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&group_id={$groupId}&assign_user={$assignUser->mUserId}&tk={$gBitUser->mTicket}">{booticon iname="fa-trash" iexplain="remove from group"}</a> {/if} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?group_id={$groupId}">{$group.group_name}</a> <br /> @@ -86,7 +86,7 @@ {if !$assignUser->mGroups.$groupId && $groupId != -1} <dt class=""> - <a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?offset={$offset}&sort_mode={$sort_mode}&action=assign&group_id={$groupId}&assign_user={$assignUser->mUserId}&{tk}" class="btn btn-xs btn-default mr-1">{booticon iname="icon-key" ipackage="icons" iexplain="assign" iforce="icon"}</a> + <a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?offset={$offset}&sort_mode={$sort_mode}&action=assign&group_id={$groupId}&assign_user={$assignUser->mUserId}&{tk}" class="btn btn-xs btn-default mr-1">{booticon iname="fa-key" iexplain="assign"}</a> {$group.group_name|escape} </dt> <dd class="ml-3 pb-1"> diff --git a/templates/admin_group_edit.tpl b/templates/admin_group_edit.tpl index 729c79e..45f8593 100644 --- a/templates/admin_group_edit.tpl +++ b/templates/admin_group_edit.tpl @@ -3,7 +3,7 @@ <div class="floaticon"> <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php"> - {booticon iname="icon-group" ipackage="icons" iexplain="Group List"} + {booticon iname="fa-users" iexplain="Group List"} </a> {bithelp} </div> diff --git a/templates/admin_groups_list.tpl b/templates/admin_groups_list.tpl index 0ad59de..bf1e3f3 100644 --- a/templates/admin_groups_list.tpl +++ b/templates/admin_groups_list.tpl @@ -1,7 +1,7 @@ {strip} <div class="listing users"> <div class="header"> - <a class="btn btn-primary btn-xs pull-right" href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?action=create"><i class="icon-group"></i> {tr}Add a new group{/tr}</a> + <a class="btn btn-primary btn-xs pull-right" href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?action=create">{booticon iname="fa-user-group"} {tr}Add a new group{/tr}</a> <h1>{tr}List of existing groups{/tr}</h1> </div> @@ -10,7 +10,6 @@ {formfeedback success=$successMsg error=$errorMsg} <ul class="list-inline navbar"> - <li>{booticon iname="icon-circle-arrow-right" ipackage="icons" iexplain="sort by"}</li> <li>{smartlink ititle="Name" isort="group_name" offset=$offset idefault=1}</li> <li>{smartlink ititle="Description" isort="group_desc" offset=$offset}</li> <li>{smartlink ititle="Home Page" isort="group_home" offset=$offset}</li> @@ -20,10 +19,10 @@ {foreach from=$groupList key=groupId item=grp} <li class="item {cycle values='odd,even'}"> <div class="floaticon"> - {smartlink ititle="Edit" ipackage="users" ifile="admin/edit_group.php" booticon="icon-edit" group_id=$groupId} - {smartlink ititle="Group Members" ipackage="users" ifile="admin/edit_group.php" booticon="icon-group" members=$groupId} + {smartlink ititle="Edit" ipackage="users" ifile="admin/edit_group.php" booticon="fa-pencil" group_id=$groupId} + {smartlink ititle="Group Members" ipackage="users" ifile="admin/edit_group.php" booticon="fa-group" members=$groupId} {if $groupId ne $smarty.const.ANONYMOUS_GROUP_ID} - {smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_group.php" booticon="icon-cogs" batch_assign=$groupId} + {smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_group.php" booticon="fa-gears" batch_assign=$groupId} {/if} </div> diff --git a/templates/admin_list_users.tpl b/templates/admin_list_users.tpl index 12b21a0..c08435b 100644 --- a/templates/admin_list_users.tpl +++ b/templates/admin_list_users.tpl @@ -76,7 +76,7 @@ {/if} {formlabel label="User will be added to the following role" for=""} {forminput} - {$defaultRoleName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$defaultRoleId}">{booticon iname="icon-edit" ipackage="icons" iexplain="change settings"}</a> + {$defaultRoleName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$defaultRoleId}">{booticon iname="fa-pen-to-square" iexplain="change settings"}</a> {formhelp note="This is the role that is selected as the default role. If you would like to change the default role, please click on the edit icon and set a different role as default role."} {/forminput} {else} @@ -85,7 +85,7 @@ {/if} {formlabel label="User will be added to the following group" for=""} {forminput} - {$defaultGroupName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?group_id={$defaultGroupId}">{booticon iname="icon-edit" ipackage="icons" iexplain="change settings"}</a> + {$defaultGroupName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?group_id={$defaultGroupId}">{booticon iname="fa-pen-to-square" iexplain="change settings"}</a> {formhelp note="This is the group that is selected as the default group. If you would like to change the default group, please click on the edit icon and set a different group as default group."} {/forminput} {/if} diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl index 9ee7af4..2bfa005 100644 --- a/templates/admin_login.tpl +++ b/templates/admin_login.tpl @@ -104,7 +104,7 @@ {forminput} {foreach from=$hybridProviders key=providerKey item=providerHash} {assign var=providerActive value="users_ha_`$providerKey`_enabled"} - <fieldset><legend class="checkbox"><label><input id="{$providerActive}_checkbox" type="checkbox" name="hybridauth[{$providerActive}]" {if $gBitSystem->getConfig($providerActive)}checked{/if}> {booticon iname="{$providerHash.icon}"} {$providerHash.provider}</label></legend> + <fieldset><legend class="checkbox"><label><input id="{$providerActive}_checkbox" type="checkbox" name="hybridauth[{$providerActive}]" {if $gBitSystem->getConfig($providerActive)}checked{/if}> {booticon iname="fa-`$providerHash.icon`"} {$providerHash.provider}</label></legend> <script> $('#{$providerActive}_checkbox').change(function(){ if($(this).prop("checked")) $('#{$providerActive}').show(); else $('#{$providerActive}').hide(); @@ -194,7 +194,7 @@ {/foreach} {/jstab} {foreach from=$authSettings.avail item='method' key='meth_name'} - {if count($method.options)>0} + {if $method.options} {jstab title=$method.name} <input type="hidden" name="page" value="{$page}" /> {foreach from=$method.options item='output' key='op_id'} diff --git a/templates/admin_permissions.tpl b/templates/admin_permissions.tpl index e6c641f..d2cad5c 100644 --- a/templates/admin_permissions.tpl +++ b/templates/admin_permissions.tpl @@ -35,7 +35,7 @@ {assign var=prev_package value=$perm.package} {/if} <tr class="{cycle values="odd,even"}{if $unassignedPerms.$p} prio5{/if}"> - <td>{if $unassignedPerms.$p}{booticon iname="icon-warning-sign" iexplain="Unassigned Permission"}{/if}</td> + <td>{if $unassignedPerms.$p}{booticon iname="fa-triangle-exclamation" iexplain="Unassigned Permission"}{/if}</td> <td title="{$perm.perm_desc}"><abbr title="{$perm.perm_desc}">{$p}</abbr></td> {foreach from=$allGroups item=group} {if $perm.perm_level == 'admin' }{assign var=id value=1} @@ -59,7 +59,7 @@ {if $group.group_id lt 4} <td class="alignleft {$class} width5p"> - {if $id == $group.group_id}<label for="{$p}{$group.group_id}">{booticon iname="icon-ok" iexplain="Default"}</label>{/if} + {if $id == $group.group_id}<label for="{$p}{$group.group_id}">{booticon iname="fa-check" iexplain="Default"}</label>{/if} </td> {/if} {/foreach} @@ -67,7 +67,7 @@ {/foreach} </table> - <p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="icon-ok" iexplain="Default"}</p> + <p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="fa-check" iexplain="Default"}</p> <div class="submit"> <input type="submit" class="btn btn-default" name="save" value="{tr}Apply Changes{/tr}" /> @@ -95,9 +95,9 @@ {foreach from=$perms item=perm} <li> {$perm.group_name}: {if $perm.is_revoked} - {booticon iname="icon-minus-sign" iexplain="Removed Permission"} + {booticon iname="fa-circle-minus" iexplain="Removed Permission"} {else} - {booticon iname="icon-plus-sign" iexplain="Added Permission"} + {booticon iname="fa-circle-plus" iexplain="Added Permission"} {/if} {$perm.perm_name} </li> {/foreach} diff --git a/templates/admin_role_edit.tpl b/templates/admin_role_edit.tpl index 2a9d66a..3d29954 100644 --- a/templates/admin_role_edit.tpl +++ b/templates/admin_role_edit.tpl @@ -3,7 +3,7 @@ <div class="floaticon"> <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php"> - {booticon iname="icon-group" ipackage="icons" iexplain="Role List"} + {booticon iname="fa-users" iexplain="Role List"} </a> {bithelp} </div> diff --git a/templates/admin_role_permissions.tpl b/templates/admin_role_permissions.tpl index b78d714..f1006fb 100644 --- a/templates/admin_role_permissions.tpl +++ b/templates/admin_role_permissions.tpl @@ -35,7 +35,7 @@ {assign var=prev_package value=$perm.package} {/if} <tr class="{cycle values="odd,even"}{if $unassignedPerms.$p} prio5{/if}"> - <td>{if $unassignedPerms.$p}{booticon iname="icon-warning-sign" iexplain="Unassigned Permission"}{/if}</td> + <td>{if $unassignedPerms.$p}{booticon iname="fa-triangle-exclamation" iexplain="Unassigned Permission"}{/if}</td> <td title="{$perm.perm_desc}"><abbr title="{$perm.perm_desc}">{$p}</abbr></td> {foreach from=$allRoles item=role} {if $perm.perm_level == 'admin' }{assign var=id value=1} @@ -59,7 +59,7 @@ {if $role.role_id lt 4} <td class="alignleft {$class} width5p"> - {if $id == $role.role_id}<label for="{$p}{$role.role_id}">{booticon iname="icon-ok" iexplain="Default"}</label>{/if} + {if $id == $role.role_id}<label for="{$p}{$role.role_id}">{booticon iname="fa-check" iexplain="Default"}</label>{/if} </td> {/if} {/foreach} @@ -67,7 +67,7 @@ {/foreach} </table> - <p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="icon-ok" iexplain="Default"}</p> + <p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="fa-check" iexplain="Default"}</p> <div class="submit"> <input type="submit" class="btn btn-default" name="save" value="{tr}Apply Changes{/tr}" /> @@ -95,9 +95,9 @@ {foreach from=$perms item=perm} <li> {$perm.role_name}: {if $perm.is_revoked} - {booticon iname="icon-minus-sign" iexplain="Removed Permission"} + {booticon iname="fa-circle-minus" iexplain="Removed Permission"} {else} - {booticon iname="icon-plus-sign" iexplain="Added Permission"} + {booticon iname="fa-circle-plus" iexplain="Added Permission"} {/if} {$perm.perm_name} </li> {/foreach} diff --git a/templates/admin_roles_list.tpl b/templates/admin_roles_list.tpl index ee9fe13..7e885a8 100644 --- a/templates/admin_roles_list.tpl +++ b/templates/admin_roles_list.tpl @@ -8,7 +8,6 @@ {smartlink ititle="Add a new role" ipackage=users ifile="admin/edit_role.php" action=create} <ul class="list-inline navbar"> - <li>{booticon iname="icon-circle-arrow-right" ipackage="icons" iexplain="sort by"}</li> <li>{smartlink ititle="Name" isort="role_name" offset=$offset idefault=1}</li> <li>{smartlink ititle="Description" isort="role_desc" offset=$offset}</li> <li>{smartlink ititle="Home Page" isort="role_home" offset=$offset}</li> @@ -20,11 +19,11 @@ {foreach from=$roleList key=roleId item=grp} <li class="item {cycle values='odd,even'}"> <div class="floaticon"> - {smartlink ititle="Edit" ipackage="users" ifile="admin/edit_role.php" booticon="icon-edit" role_id=$roleId} - {smartlink ititle="Role Members" ipackage="users" ifile="admin/edit_role.php" booticon="icon-group" members=$roleId} + {smartlink ititle="Edit" ipackage="users" ifile="admin/edit_role.php" booticon="fa-edit" role_id=$roleId} + {smartlink ititle="Role Members" ipackage="users" ifile="admin/edit_role.php" booticon="fa-group" members=$roleId} {if $roleId ne $smarty.const.ANONYMOUS_TEAM_ID} - {smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_role.php" booticon="icon-cogs" batch_assign=$roleId} - {smartlink ititle="Remove" ipackage="users" ifile="admin/edit_role.php" booticon="icon-trash" action=delete role_id=$roleId} + {smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_role.php" booticon="fa-cogs" batch_assign=$roleId} + {smartlink ititle="Remove" ipackage="users" ifile="admin/edit_role.php" booticon="fa-trash" action=delete role_id=$roleId} {/if} </div> diff --git a/templates/center_role_wiki_page.tpl b/templates/center_role_wiki_page.tpl index 4518733..15d2047 100644 --- a/templates/center_role_wiki_page.tpl +++ b/templates/center_role_wiki_page.tpl @@ -5,24 +5,24 @@ <div class="floaticon"> {if $gBitUser->hasPermission( 'p_users_admin' )} {if $gBitUser->hasPermission( 'p_commerce_admin' )} - {smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" booticon="icon-shopping-cart" iforce="icon"} + {smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" booticon="fa-shopping-cart"} {/if} - {smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" booticon="icon-user-md" iforce="icon"} - {smartlink ipackage=users ifile="preferences.php" view_user=$userInfo.user_id ititle="Edit User Information" booticon="icon-edit" iforce="icon"} - {smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userInfo.user_id ititle="Assign Role" booticon="icon-key" iforce="icon"} - {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="icon-volume-up" iforce="icon"} + {smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" booticon="fa-user-doctor"} + {smartlink ipackage=users ifile="preferences.php" view_user=$userInfo.user_id ititle="Edit User Information" booticon="fa-edit"} + {smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userInfo.user_id ititle="Assign Role" booticon="fa-key"} + {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="fa-volume-up"} {if $users[user].user_id != $smarty.const.ANONYMOUS_USER_ID} - {smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" booticon="icon-list" iforce="icon"} - {smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" booticon="icon-trash" iforce="icon"} + {smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" booticon="fa-list"} + {smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" booticon="fa-trash"} {/if} {/if} {if $gBitUser->isRegistered() && $gBitUser->mUserId eq $gQueryUser->mUserId} {if $gBitSystem->isFeatureActive('users_preferences')} - {smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" booticon="icon-file"} + {smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" booticon="file"} {/if} {if $gBitUser->hasPermission('p_users_edit_user_homepage')} - {smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" booticon="icon-edit"} + {smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" booticon="fa-edit"} {/if} {/if} </div> diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl index 4801648..3da3b08 100644 --- a/templates/center_user_wiki_page.tpl +++ b/templates/center_user_wiki_page.tpl @@ -5,25 +5,25 @@ <div class="floaticon"> {if $gBitUser->hasPermission( 'p_users_admin' )} {if $gBitUser->hasPermission( 'p_commerce_admin' )} - {smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" booticon="icon-shopping-cart" iforce="icon"} + {smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" booticon="fa-shopping-cart"} {/if} - {smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" booticon="icon-user-md" iforce="icon"} - {smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userInfo.user_id ititle="Assign Group" booticon="icon-key" iforce="icon"} - {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="icon-bolt" iforce="icon"} + {smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" booticon="fa-user-doctor"} + {smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userInfo.user_id ititle="Assign Group" booticon="fa-key"} + {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="fa-bolt"} {if $users[user].user_id != $smarty.const.ANONYMOUS_USER_ID} - {smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" booticon="icon-list-alt" iforce="icon"} - {smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" booticon="icon-trash" iforce="icon"} + {smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" booticon="fa-square-list"} + {smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" booticon="fa-trash"} {/if} {if $gBitUser->mUserId != $gQueryUser->mUserId} - {smartlink ipackage=users ifile="preferences.php" view_user=$userInfo.user_id ititle="Edit User Information" booticon="icon-check" iforce="icon"} + {smartlink ipackage=users ifile="preferences.php" view_user=$userInfo.user_id ititle="Edit User Information" booticon="fa-check"} {/if} {/if} {if $gBitUser->isRegistered() && $gBitUser->mUserId eq $gQueryUser->mUserId} {if $gBitSystem->isFeatureActive('users_preferences')} - {smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" booticon="icon-check"} + {smartlink ipackage=users ifile="preferences.php" ititle="Edit personal profile and images" booticon="fa-check"} {/if} {if $gBitUser->hasPermission('p_users_edit_user_homepage')} - {smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" booticon="icon-edit"} + {smartlink ipackage=users ifile="edit_personal_page.php" ititle="Edit personal wiki page" booticon="fa-edit"} {/if} {/if} </div> diff --git a/templates/group_list_members.tpl b/templates/group_list_members.tpl index 165f27f..eb25f06 100644 --- a/templates/group_list_members.tpl +++ b/templates/group_list_members.tpl @@ -1,7 +1,7 @@ {strip} <div class="floaticon"> <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php"> - {booticon iname="icon-group" ipackage="icons" iexplain="Group List"} + {booticon iname="fa-group" iexplain="Group List"} </a> {bithelp} </div> @@ -34,11 +34,11 @@ <td class="text-right">{$member.registration_date|bit_short_date}</td> <td class="text-right">{$member.last_login|bit_short_date}</td> <td> - {if $gBitSystem->isPackageActive('bitcommerce')} <a class="icon" href="{$smarty.const.BITCOMMERCE_PKG_URL}admin/list_orders.php?user_id={$userId}">{booticon iname="icon-shopping-cart"}</a>{/if} - <a class="icon" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php?user_id={$userId}{if $gBitSystem->isPackageActive('bitcommerce')}&content_type_guid=bitproduct{/if}">{booticon iname="icon-list-alt"}</a> - <a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/user_activity.php?user_id={$userId}">{booticon iname="icon-bolt"}</a> + {if $gBitSystem->isPackageActive('bitcommerce')} <a class="icon" href="{$smarty.const.BITCOMMERCE_PKG_URL}admin/list_orders.php?user_id={$userId}">{booticon iname="fa-shopping-cart"}</a>{/if} + <a class="icon" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php?user_id={$userId}{if $gBitSystem->isPackageActive('bitcommerce')}&content_type_guid=bitproduct{/if}">{booticon iname="fa-square-list"}</a> + <a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/user_activity.php?user_id={$userId}">{booticon iname="fa-bolt"}</a> {if $member.user_id != $smarty.const.ANONYMOUS_USER_ID && $groupInfo.group_id != $smarty.const.ANONYMOUS_GROUP_ID} - <a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&group_id={$groupInfo.group_id}&assign_user={$member.user_id}">{booticon iname="icon-remove-circle" ipackage="icons" iexplain="Remove From Group"}</a> + <a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&group_id={$groupInfo.group_id}&assign_user={$member.user_id}">{booticon iname="fa-remove-circle" iexplain="Remove From Group"}</a> {/if} </td> </tr> diff --git a/templates/login_inc.tpl b/templates/login_inc.tpl index d9e9975..dec381a 100644 --- a/templates/login_inc.tpl +++ b/templates/login_inc.tpl @@ -56,7 +56,7 @@ <div class="form-group"> {forminput class="submit"} <input type="submit" class="btn btn-primary" name="login" value="{tr}Sign In{/tr}" /> - {if !$gBitSystem->isFeatureActive('site_https_login_required') && empty($smarty.server.HTTPS)} {booticon iname="icon-unlock" iexplain="Insecure" class="icon-large"}{/if} + {if !$gBitSystem->isFeatureActive('site_https_login_required') && empty($smarty.server.HTTPS)} {booticon iname="fa-unlock" iexplain="Insecure" class="fa-large"}{/if} {/forminput} </div> {/form} diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl index 3c3ae58..b147e14 100644 --- a/templates/menu_users.tpl +++ b/templates/menu_users.tpl @@ -5,49 +5,49 @@ {if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if} <ul class="{$packageMenuClass}"> {if $gBitUser->isRegistered()} - <li><a class="item" href="{$gBitSystem->getConfig('users_login_homepage',"`$smarty.const.USERS_PKG_URL`my.php")}">{booticon iname="icon-circle-arrow-right" iexplain="My Personal Page" ilocation=$location}</a></li> + <li><a class="item" href="{$gBitSystem->getConfig('users_login_homepage',"`$smarty.const.USERS_PKG_URL`my.php")}">{booticon iname="fa-circle-arrow-right" iexplain="My Personal Page"}</a></li> {if $gBitUser->hasPermission( 'p_users_view_user_homepage' )} - <li><a class="item" href="{$gBitUser->getDisplayUrl()}">{booticon iname="icon-home" iexplain="My Profile" ilocation=$location}</a></li> + <li><a class="item" href="{$gBitUser->getDisplayUrl()}">{booticon iname="fa-home" iexplain="My Profile"}</a></li> {/if} {if $gBitUser->hasPermission( 'p_users_edit_user_homepage' )} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">{booticon iname="icon-edit" iexplain="Edit My Homepage" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">{booticon iname="fa-pen-to-square" iexplain="Edit My Homepage"}</a></li> {/if} {if $gBitSystem->isFeatureActive( 'users_preferences' )} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}preferences.php">{booticon iname="icon-inbox" iexplain=Preferences ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}preferences.php">{booticon iname="fa-inbox" iexplain=Preferences}</a></li> {/if} {if $gBitUser->hasPermission( 'p_users_create_personal_groups' )} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_groups.php">{booticon iname="icon-group" iexplain="My Groups" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_groups.php">{booticon iname="fa-group" iexplain="My Groups"}</a></li> {/if} {if $gBitUser->hasPermission( 'p_users_create_personal_roles' )} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_roles.php">{booticon iname="icon-group" iexplain="My Roles" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_roles.php">{booticon iname="fa-group" iexplain="My Roles"}</a></li> {/if} {if $gBitSystem->isFeatureActive( 'users_watches' )} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}watches.php">{booticon iname="icon-asterisk" iexplain="My Watches" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}watches.php">{booticon iname="fa-asterisk" iexplain="My Watches"}</a></li> {/if} {if $gBitSystem->isPackageActive( 'messages' ) && $gBitUser->hasPermission( 'p_messages_send' )} - <li><a class="item" {if $unreadMsgs}title="{tr}You have unread messages{/tr}"{/if} href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">{booticon iname="icon-inbox" iexplain="Message Box" ilocation=$location}{if $unreadMsgs}<strong> [{$unreadMsgs}]</strong>{/if}</a></li> - <li><a class="item" href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{booticon iname="icon-envelope" iexplain="Compose Message" ilocation=$location}</a></li> + <li><a class="item" {if $unreadMsgs}title="{tr}You have unread messages{/tr}"{/if} href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">{booticon iname="fa-inbox" iexplain="Message Box"}{if $unreadMsgs}<strong> [{$unreadMsgs}]</strong>{/if}</a></li> + <li><a class="item" href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{booticon iname="fa-envelope" iexplain="Compose Message"}</a></li> {/if} {if $gBitSystem->isPackageActive( 'gatekeeper' )} - <li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="icon-lock" iexplain="Security Settings" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="fa-lock" iexplain="Security Settings"}</a></li> {/if} {if $gBitSystem->isPackageActive( 'quota' )} - <li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="icon-hdd" iexplain="My quota and usage" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="fa-hard-drive" iexplain="My quota and usage"}</a></li> {/if} {if $gBitUser->hasPermission( 'p_liberty_attach_attachments' )} - <li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}attachments.php">{booticon iname="icon-paperclip" iexplain="My Files" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}attachments.php">{booticon iname="fa-paperclip" iexplain="My Files"}</a></li> {/if} {if $gBitUser->hasPermission('p_liberty_list_content')} - <li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php">{booticon iname="icon-list" iexplain="List Site Content" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php">{booticon iname="fa-list" iexplain="List Site Content"}</a></li> {/if} {if $gBitUser->hasPermission('p_users_view_user_list')} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}index.php">{booticon iname="icon-group" ipackage="icons" iexplain="List Site Users" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}index.php">{booticon iname="fa-group" ipackage="icons" iexplain="List Site Users"}</a></li> {/if} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}logout.php">{booticon iname="icon-signout" iexplain="Log out" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}logout.php">{booticon iname="fa-signout" iexplain="Log out"}</a></li> {else} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}signin.php">{booticon iname="icon-signin" iexplain="Login" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}signin.php">{booticon iname="fa-signin" iexplain="Login"}</a></li> {if $gBitSystem->isFeatureActive('users_allow_register')} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}register.php">{booticon iname="icon-user" iexplain="Register" ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}register.php">{booticon iname="fa-user" iexplain="Register"}</a></li> {/if} {/if} </ul> diff --git a/templates/my_group_edit.tpl b/templates/my_group_edit.tpl index 7b5bc06..6e48093 100644 --- a/templates/my_group_edit.tpl +++ b/templates/my_group_edit.tpl @@ -116,7 +116,7 @@ {foreach from=$groupInfo.perms key=permName item=perm} <tr class="{cycle values="odd,even"}"> <td> - {smartlink ititle="Remove" booticon="icon-trash" package=$package group_id=$groupInfo.group_id action=remove permission=$permName} + {smartlink ititle="Remove" booticon="fa-trash" package=$package group_id=$groupInfo.group_id action=remove permission=$permName} {$permName} </td> <td>{$perm.perm_desc}</td> diff --git a/templates/my_groups_list.tpl b/templates/my_groups_list.tpl index 458a8e3..a8b3043 100644 --- a/templates/my_groups_list.tpl +++ b/templates/my_groups_list.tpl @@ -25,7 +25,7 @@ <td> {if $group.public eq 'y'} <a href="{$smarty.const.USERS_PKG_URL}my_groups.php?remove_public_group=y&public_group_id={$groupId}" - onclick="return confirm('{tr}Are you sure you want to leave this group?{/tr}')">{booticon ipackage="icons" iname="icon-cut" iexplain="Leave Group"}</a> + onclick="return confirm('{tr}Are you sure you want to leave this group?{/tr}')">{booticon iname="fa-scissors" iexplain="Leave Group"}</a> {else} {/if} @@ -48,7 +48,7 @@ <tr class="{cycle values="odd,even"}"> <td>{$group.group_name}</td> <td>{$group.group_desc}</td> - <td><a href="{$smarty.const.USERS_PKG_URL}my_groups.php?add_public_group=y&public_group_id={$group.group_id}" title="{tr}Assign Group{/tr}">{booticon iname="icon-key" ipackage="icons" iexplain="join group"}</a></td> + <td><a href="{$smarty.const.USERS_PKG_URL}my_groups.php?add_public_group=y&public_group_id={$group.group_id}" title="{tr}Assign Group{/tr}">{booticon iname="fa-key" iexplain="join group"}</a></td> </tr> {/if} {/foreach} @@ -113,10 +113,10 @@ {/if} <td class="actionicon"> - <a href="{$smarty.const.USERS_PKG_URL}my_groups.php?group_id={$groupId}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a> + <a href="{$smarty.const.USERS_PKG_URL}my_groups.php?group_id={$groupId}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a> {if $groupId ne ANONYMOUS_GROUP_ID} <a href="{$smarty.const.USERS_PKG_URL}my_groups.php?offset={$offset}&sort_mode={$sort_mode}&action=delete&group_id={$groupId}" - onclick="return confirm('{tr}Are you sure you want to delete this group?{/tr}')">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete Group"}</a> + onclick="return confirm('{tr}Are you sure you want to delete this group?{/tr}')">{booticon iname="fa-trash" iexplain="Delete Group"}</a> {/if} </td> </tr> diff --git a/templates/my_role_edit.tpl b/templates/my_role_edit.tpl index bffcd8a..b9da0c2 100644 --- a/templates/my_role_edit.tpl +++ b/templates/my_role_edit.tpl @@ -116,7 +116,7 @@ {foreach from=$roleInfo.perms key=permName item=perm} <tr class="{cycle values="odd,even"}"> <td> - {smartlink ititle="Remove" booticon="icon-trash" package=$package role_id=$roleInfo.role_id action=remove permission=$permName} + {smartlink ititle="Remove" booticon="fa-trash" package=$package role_id=$roleInfo.role_id action=remove permission=$permName} {$permName} </td> <td>{$perm.perm_desc}</td> diff --git a/templates/my_roles_list.tpl b/templates/my_roles_list.tpl index abc8980..0fa65ab 100644 --- a/templates/my_roles_list.tpl +++ b/templates/my_roles_list.tpl @@ -25,7 +25,7 @@ <td> {if $role.public eq 'y'} <a href="{$smarty.const.USERS_PKG_URL}my_roles.php?remove_public_role=y&public_role_id={$roleId}" - onclick="return confirm('{tr}Are you sure you want to leave this role?{/tr}')">{booticon ipackage="icons" iname="icon-cut" iexplain="Leave Role"}</a> + onclick="return confirm('{tr}Are you sure you want to leave this role?{/tr}')">{booticon iname="fa-scissors" iexplain="Leave Role"}</a> {else} {/if} @@ -48,7 +48,7 @@ <tr class="{cycle values="odd,even"}"> <td>{$role.role_name}</td> <td>{$role.role_desc}</td> - <td><a href="{$smarty.const.USERS_PKG_URL}my_roles.php?add_public_role=y&public_role_id={$role.role_id}" title="{tr}Assign Role{/tr}">{booticon iname="icon-key" ipackage="icons" iexplain="join role"}</a></td> + <td><a href="{$smarty.const.USERS_PKG_URL}my_roles.php?add_public_role=y&public_role_id={$role.role_id}" title="{tr}Assign Role{/tr}">{booticon iname="fa-key" iexplain="join role"}</a></td> </tr> {/if} {/foreach} @@ -113,10 +113,10 @@ {/if} <td class="actionicon"> - <a href="{$smarty.const.USERS_PKG_URL}my_roles.php?role_id={$roleId}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a> + <a href="{$smarty.const.USERS_PKG_URL}my_roles.php?role_id={$roleId}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a> {if $roleId ne -1}{* sorry for hardcoding, really need php define ANONYMOUS_TEAM_ID - spiderr *} <a href="{$smarty.const.USERS_PKG_URL}my_roles.php?offset={$offset}&sort_mode={$sort_mode}&action=delete&role_id={$roleId}" - onclick="return confirm('{tr}Are you sure you want to delete this role?{/tr}')">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete Role"}</a> + onclick="return confirm('{tr}Are you sure you want to delete this role?{/tr}')">{booticon iname="fa-trash" iexplain="Delete Role"}</a> {/if} </td> </tr> diff --git a/templates/role_list_members.tpl b/templates/role_list_members.tpl index 0b6aea3..698da84 100644 --- a/templates/role_list_members.tpl +++ b/templates/role_list_members.tpl @@ -1,7 +1,7 @@ {strip} <div class="floaticon"> <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php"> - {booticon iname="icon-group" ipackage="icons" iexplain="Role List"} + {booticon iname="fa-users" iexplain="Role List"} </a> {bithelp} </div> @@ -18,7 +18,7 @@ {foreach from=$roleMembers key=userId item=member} <li>{displayname hash=$member} {if $member.user_id != $smarty.const.ANONYMOUS_USER_ID && $roleInfo.role_id != $smarty.const.ANONYMOUS_TEAM_ID} - <a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removerole&role_id={$roleInfo.role_id}&assign_user={$member.user_id}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove from role"}</a> + <a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removerole&role_id={$roleInfo.role_id}&assign_user={$member.user_id}">{booticon iname="fa-trash" iexplain="remove from role"}</a> {/if} </li> {foreachelse} diff --git a/templates/user_activity.tpl b/templates/user_activity.tpl index 4ca9131..7df7864 100644 --- a/templates/user_activity.tpl +++ b/templates/user_activity.tpl @@ -35,7 +35,7 @@ {if $watches} <tr> - <td><input src="{booticon iname="icon-trash" ipackage="icons" iexplain=remove url=TRUE}" type="image" name="delete" value="{tr}delete{/tr}" /></td> + <td><button class="btn btn-default btn-sm" name="delete" value="{tr}delete{/tr}">{booticon iname="fa-trash" iexplain=Remove}</button></td> </tr> {/if} </table> diff --git a/templates/user_assigned_modules.tpl b/templates/user_assigned_modules.tpl index f899d5b..69608ca 100644 --- a/templates/user_assigned_modules.tpl +++ b/templates/user_assigned_modules.tpl @@ -25,15 +25,15 @@ {tr}Position {$modules.$area[ix].ord}{/tr}<br /> {$modules.$area[ix].name} <div style="text-align:center;"> - {smartlink ititle="Up" booticon="icon-arrow-up" fMove=up fPackage=$fPackage fModule=$modules.$area[ix].module_id} - {smartlink ititle="Down" booticon="icon-arrow-down" fMove=down fPackage=$fPackage fModule=$modules.$area[ix].module_id} + {smartlink ititle="Up" booticon="fa-arrow-up" fMove=up fPackage=$fPackage fModule=$modules.$area[ix].module_id} + {smartlink ititle="Down" booticon="fa-arrow-down" fMove=down fPackage=$fPackage fModule=$modules.$area[ix].module_id} {if $colkey eq 'right'} - {smartlink ititle="Move to Left" booticon="icon-arrow-left" fMove=left fPackage=$fPackage fModule=$modules.$area[ix].module_id} + {smartlink ititle="Move to Left" booticon="fa-arrow-left" fMove=left fPackage=$fPackage fModule=$modules.$area[ix].module_id} {elseif $colkey eq 'left'} - {smartlink ititle="Move to Right" booticon="icon-arrow-right" fMove=right fPackage=$fPackage fModule=$modules.$area[ix].module_id} + {smartlink ititle="Move to Right" booticon="fa-arrow-right" fMove=right fPackage=$fPackage fModule=$modules.$area[ix].module_id} {/if} {if $column[ix].type ne 'P'} - {smartlink ititle="Unassign" booticon="icon-trash" ionclick="return confirm('Are you sure you want to remove `$modules.$area[ix].name`?');" fMove=unassign fPackage=$fPackage fModule=$modules.$area[ix].module_id} + {smartlink ititle="Unassign" booticon="fa-trash" onclick="return confirm('Are you sure you want to remove `$modules.$area[ix].name`?');" fMove=unassign fPackage=$fPackage fModule=$modules.$area[ix].module_id} {/if} </div> </td> diff --git a/templates/user_favs_service_icon_inc.tpl b/templates/user_favs_service_icon_inc.tpl index ab75041..c986d23 100644 --- a/templates/user_favs_service_icon_inc.tpl +++ b/templates/user_favs_service_icon_inc.tpl @@ -8,9 +8,9 @@ {/foreach} <a title="{if $isBookmarked eq 'true'}{tr}Remove from your favorites{/tr}{else}{tr}Add to your favorites{/tr}{/if}" onclick="BitUser.toggleBookmark({$gContent->mContentId});" href="javascript:void(0); {* {$smarty.const.USERS_PKG_URL}bookmark.php?content_id={$gContent->mContentId} *}" > {if $isBookmarked eq 'true'} - {booticon iname="icon-bookmark-empty" ipackage="icons" iexplain="Remove Bookmark"} + {booticon iname="fa-bookmark-empty" ipackage="icons" iexplain="Remove Bookmark"} {else} - {booticon iname="icon-bookmark" ipackage="icons" iexplain="Bookmark"} + {booticon iname="fa-bookmark" ipackage="icons" iexplain="Bookmark"} {/if} </a> <script type="text/javascript">/* <![CDATA[ */ diff --git a/templates/user_watches.tpl b/templates/user_watches.tpl index 755a6e5..166eb89 100644 --- a/templates/user_watches.tpl +++ b/templates/user_watches.tpl @@ -44,7 +44,7 @@ {if $watches} <tr> - <td><input src="{booticon iname="icon-trash" ipackage="icons" iexplain=remove url=TRUE}" type="image" name="delete" value="{tr}delete{/tr}" /></td> + <td><button class="btn btn-default btn-sm" name="delete" value="{tr}delete{/tr}">{booticon iname="fa-trash" iexplain=remove}</button></td> </tr> {/if} </table> diff --git a/templates/users_list.tpl b/templates/users_list.tpl index 672fd83..f7da8e8 100644 --- a/templates/users_list.tpl +++ b/templates/users_list.tpl @@ -39,7 +39,6 @@ {/if} <nav class="clear"> <ul class="list-inline navbar"> - <li>{booticon iname="icon-circle-arrow-right" ipackage="icons" iexplain="sort by"}</li> <li>{smartlink iurl=$control.URL offset=$control.offset numrows=$control.numrows ititle="Username" isort="login"}</li> <li>{smartlink iurl=$control.URL offset=$control.offset numrows=$control.numrows ititle="Real name" isort="real_name"}</li> <li>{smartlink iurl=$control.URL offset=$control.offset numrows=$control.numrows ititle="Registration Date" isort="registration_date"}</li> @@ -79,24 +78,24 @@ <strong title="{tr}Content Count{/tr}">{$contentCount} </strong> {/if} {if $gBitUser->hasPermission( 'p_commerce_admin' )} - {smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userHash.user_id ititle="Orders" booticon="icon-shopping-cart" iforce="icon"} + {smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userHash.user_id ititle="Orders" booticon="fa-shopping-cart"} {/if} - {smartlink ipackage=liberty ifile="list_content.php" user_id=$userHash.user_id ititle="User Content" booticon="icon-list" iforce="icon"} - {smartlink ipackage=users ifile="admin/index.php" assume_user=$userHash.user_id ititle="Assume User Identity" booticon="icon-user-md" iforce=icon} - {smartlink ipackage=users ifile="preferences.php" view_user=$userHash.user_id ititle="Edit User Information" booticon="icon-edit" iforce=icon} + {smartlink ipackage=liberty ifile="list_content.php" user_id=$userHash.user_id ititle="User Content" booticon="fa-list"} + {smartlink ipackage=users ifile="admin/index.php" assume_user=$userHash.user_id ititle="Assume User Identity" booticon="fa-user-doctor"} + {smartlink ipackage=users ifile="preferences.php" view_user=$userHash.user_id ititle="Edit User Information" booticon="fa-edit"} {if $gBitSystem->isPackageActive('protector')} - {smartlink ipackage=users ifile="admin/assign_role_user.php" assign_user=$userHash.user_id ititle="Assign Group" booticon="icon-key" iforce=icon} + {smartlink ipackage=users ifile="admin/assign_role_user.php" assign_user=$userHash.user_id ititle="Assign Group" booticon="fa-key"} {else} - {smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userHash.user_id ititle="Assign Role" booticon="icon-key" iforce=icon} + {smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userHash.user_id ititle="Assign Role" booticon="fa-key"} {/if} - {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" booticon="icon-bolt" iforce="icon"} + {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" booticon="fa-bolt"} {if $userHash.user_id != $smarty.const.ANONYMOUS_USER_ID && $userHash.user_id != $smarty.const.ROOT_USER_ID && $userHash.user_id != $gBitUser->mUserId} {if $userHash.content_status_id > 0} - {smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=ban ititle="Ban User" booticon="icon-minus-sign" iforce=icon} + {smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=ban ititle="Ban User" booticon="fa-circle-minus"} {else} - {smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=unban ititle="Restore the User Account" booticon="icon-recycle" iforce=icon} + {smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=unban ititle="Restore the User Account" booticon="fa-recycle"} {/if} - {smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=delete ititle="Remove" booticon="icon-trash" iforce=icon} + {smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=delete ititle="Remove" booticon="fa-trash"} {/if} </div> <div>{tr}User ID{/tr}: {$userHash.user_id}</div> diff --git a/templates/validate_auth.tpl b/templates/validate_auth.tpl index ecd44f3..691b728 100644 --- a/templates/validate_auth.tpl +++ b/templates/validate_auth.tpl @@ -21,7 +21,7 @@ </div> </div> - <p class="alert alert-success">{booticon iname="icon-check"} {tr}Congratulations you have authenticated this account!{/tr}</p> + <p class="alert alert-success">{booticon iname="fa-square-check"} {tr}Congratulations you have authenticated this account!{/tr}</p> <p>{tr}We do not have an existing user for this account from{/tr} {$smarty.request.provider}.</p> <p>{tr}Have you previously logged into{/tr} {$gBitSystem->getSiteTitle()}? <span class="btn btn-info btn-sm" onclick="BitBase.showById('auth-local-login');BitBase.hideById('auth-local-new');">{tr}Yes{/tr}</span> <span class="btn btn-info btn-sm" onclick="BitBase.showById('auth-local-new');BitBase.hideById('auth-local-login');">{tr}No{/tr}</span></p> |