summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rwxr-xr-xtemplates/admin_assign_user.tpl102
-rwxr-xr-xtemplates/admin_group_edit.tpl128
-rwxr-xr-xtemplates/admin_groups_list.tpl53
-rwxr-xr-xtemplates/admin_list_users.tpl33
-rw-r--r--templates/admin_login.tpl39
-rw-r--r--templates/admin_permissions.tpl114
-rw-r--r--templates/center_user_wiki_page.tpl3
-rw-r--r--templates/group_list_members.tpl52
-rwxr-xr-xtemplates/menu_users_admin.tpl9
-rw-r--r--templates/my_groups_list.tpl132
-rw-r--r--templates/register.tpl19
-rw-r--r--templates/role_list_members.tpl2
-rwxr-xr-xtemplates/users_list.tpl7
13 files changed, 26 insertions, 667 deletions
diff --git a/templates/admin_assign_user.tpl b/templates/admin_assign_user.tpl
deleted file mode 100755
index 1bb37bb..0000000
--- a/templates/admin_assign_user.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{* $Header$ *}
-{strip}
-<div class="floaticon">{bithelp}</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">
- <h1>{tr}Assign user to groups{/tr}</h1>
- <p>{tr}Assign and remove groups for user {$assignUser->mInfo.login}{/tr}</p>
- </div>
-
- <div class="body">
- <div class="row">
- <div class="col-xs-12 col-sm-6">
- {form legend="User Information" action="`$smarty.const.USERS_PKG_URL`admin/assign_user.php"}
- <input type="hidden" value="{$assignUser->mUserId}" name="assign_user" />
-
- <div class="form-group">
- {formlabel label="Username"}
- {forminput}
- {$assignUser->getDisplayName(true)}
- {/forminput}
- </div>
-
- <div class="form-group">
- {formlabel label="Email"}
- {forminput}
- {$assignUser->mInfo.email}
- {/forminput}
- </div>
-
- <div class="form-group">
- {formlabel label="User ID"}
- {forminput}
- {$assignUser->mUserId}
- {/forminput}
- </div>
-
- {if $gBitSystem->isPackageActive('quota')}
- <div class="form-group">
- {formlabel label="Quota"}
- {forminput}
- {$usage} / {$quota}MB ( {$quotaPercent}% )
- {/forminput}
- </div>
- {/if}
-
- <div class="form-group">
- {formlabel label="Groups"}
- {forminput}
- <ul>
- {foreach from=$assignUser->mGroups key=groupId item=group}
- {if $groupId eq $assignUser->mInfo.default_group_id}<strong>{/if}
- {if $groupId eq $assignUser->mInfo.default_group_id}</strong>{/if}
- {if $groupId != -1}
- &nbsp;<a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}&amp;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 />
- {/foreach}
- </li>
- {/forminput}
- </div>
-
- <div class="form-group">
- {formlabel label="Default Group" for="default_group"}
- {forminput}
- <select name="default_group" id="default_group">
- {foreach from=$assignUser->mGroups key=groupId item=group}
- <option value="{$groupId}" {if $groupId eq $assignUser->mInfo.default_group_id}selected="selected"{/if}>{$group.group_name}</option>
- {/foreach}
- </select>
- {/forminput}
- </div>
-
- <div class="form-group submit">
- <input type="submit" class="btn btn-default" value="{tr}set{/tr}" name="set_default" />
- </div>
- {/form}
- </div>
- <div class="col-xs-12 col-sm-6">
- {legend legend="Add User to Group"}
- <dl class="">
- {cycle values="even,odd" print=false}
- {foreach from=$groups key=groupId item=group}
-
- {if !$assignUser->mGroups.$groupId && $groupId != -1}
- <dt class="">
- <a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}&amp;{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">
- {$group.group_desc|escape}</dd>
- {/if}
- {/foreach}
- </dl>
- {/legend}
- </div>
- </div>
- </div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/admin_group_edit.tpl b/templates/admin_group_edit.tpl
deleted file mode 100755
index 45f8593..0000000
--- a/templates/admin_group_edit.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-{* $Header$ *}
-{strip}
-
-<div class="floaticon">
- <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">
- {booticon iname="fa-users" iexplain="Group List"}
- </a>
- {bithelp}
-</div>
-
-<div class="admin groups">
- <div class="header">
- <h1>{if $groupInfo.group_name}{tr}Administer Group{/tr}: {$groupInfo.group_name}{else}{tr}Create New Group{/tr}{/if}</h1>
- </div>
-
- <div class="body">
- {formfeedback success=$successMsg error=$errorMsg}
-
- {jstabs}
- {jstab title="Edit Group"}
- {form legend="Add or Edit a Group"}
- <input type="hidden" name="group_id" value="{$groupInfo.group_id}" />
- <div class="form-group">
- {formlabel label="Group" for="groups_group"}
- {forminput}
- <input type="text" class="form-control" name="name" id="groups_group" size="30" maxlength="30" value="{$groupInfo.group_name}" />
- {/forminput}
- </div>
-
- <div class="form-group">
- {formlabel label="Description" for="group_desc"}
- {forminput}
- <textarea rows="5" class="form-control" name="desc" id="group_desc">{$groupInfo.group_desc}</textarea>
- {/forminput}
- </div>
-
- <div class="form-group">
- {formlabel label="Group home page" for="group_home"}
- {forminput}
- <input type="text" class="form-control" name="home" id="group_home" value="{$groupInfo.group_home|escape}" />
- {formhelp note="Here you can enter the content id of any page, the wiki page name or the absolute path of any page you wish to use as a group home page. For this to work set the site homepage to <strong>Group Home</strong>" link="kernel/admin/index.php?page=features/General Settings"}
- {/forminput}
- </div>
-
- <div class="form-group">
- {formlabel label="After registration page" for="after_registration_page"}
- {forminput}
- <input type="text" class="form-control" name="after_registration_page" id="after_registration_page" value="{$groupInfo.after_registration_page|escape}" />
- {formhelp note="The same format than the Group home page. Used to redirect a user after his registration if other that the default after login page."}
- {/forminput}
- </div>
-
- <div class="form-group">
- {forminput label="checkbox"}
- <input type="checkbox" id="default_home" name="default_home_group" {if $groupInfo.group_id eq $defaultGroupId}checked="checked"{/if} value="y" />Default home page
- {formhelp note="This is the home page if a user belongs to many groups. Only one group may be the default home. If none is selected, users/my.php is the default."}
- {/forminput}
-
- {forminput label="checkbox"}
- <input type="checkbox" name="is_default" value="y" {if $groupInfo.is_default eq 'y'}checked="checked"{/if} id="is_default" />Auto members
- {formhelp note="Users are automatically added to this group when registering at your site."}
- {/forminput}
-
- {forminput label="checkbox"}
- <input type="checkbox" name="is_public" value="y" {if $groupInfo.is_public eq 'y'}checked="checked"{/if} id="is_public" />Is public
- {formhelp note="A user will be able to select this group at registration."}
- {/forminput}
- </div>
-
- <div class="form-group submit">
- <input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />&nbsp;
- {if $groupInfo.group_name}<input type="submit" class="btn btn-default" name="delete" value="{tr}Delete Group{/tr}" />&nbsp;{/if}
- <input type="submit" class="btn btn-default" name="save" value="{tr}Save Group{/tr}" />
- </div>
- {/form}
- {/jstab}
-
- {if $groupInfo.group_id}
- {jstab title="Assign Permissions"}
- {form legend="Assign permissions"}
- <input type="hidden" name="group_id" value="{$groupInfo.group_id}" />
- <input type="hidden" name="package" value="{$smarty.request.package|escape}" />
- <input type="hidden" name="perm_name[{$perms[user].perm_name}]" />
-
- <div class="form-group">
- {formlabel label="Display permissions of package"}
- {forminput}
- {smartlink ititle="All packages" group_id=$groupInfo.group_id}
- {foreach from=$permPackages key=i item=packageKey}
- {if $gBitSystem->isPackageActive($packageKey)}
- &nbsp;&bull; {smartlink ititle=$gBitSystem->mPackages.$packageKey.name|default:$packageKey group_id=$groupInfo.group_id package=$packageKey}
- {/if}
- {/foreach}
- {/forminput}
- </div>
-
- <div class="form-group">
- <table class="table data table-hover">
- <tr>
- <th>&nbsp;</th>
- <th>{smartlink ititle="Name" isort="up.perm_name" group_id=$groupInfo.group_id offset=$offset package=$smarty.request.package}</th>
- <th>{smartlink ititle="Package" isort=package group_id=$groupInfo.group_id offset=$offset package=$smarty.request.package}</th>
- <th>{smartlink ititle="User Class" isort=perm_level group_id=$groupInfo.level offset=$offset package=$smarty.request.level}</th>
- <th>{smartlink ititle="Description" isort="up.perm_desc" group_id=$groupInfo.group_id offset=$offset package=$smarty.request.package}</th>
- </tr>
- {foreach key=permName item=perm from=$allPerms}
- <tr class="{cycle values="even,odd"}">
- <td><input type="checkbox" id="{$permName}" name="perm[{$permName}]" {if $groupInfo.perms.$permName} checked="checked"{/if} /></td>
- <td><label for="{$permName}">{$permName}</label></td>
- <td>{tr}{$perm.package}{/tr}</td>
- <td>{tr}{$perm.perm_level}{/tr}</td>
- <td>{tr}{$perm.perm_desc}{/tr}</td>
- </tr>
- {/foreach}
- </table>
- </div>
-
- <div class="form-group submit">
- <input type="submit" class="btn btn-default" name="updateperms" value="{tr}Update{/tr}" />
- </div>
- {/form}
- {/jstab}
- {/if}
- {/jstabs}
- </div><!-- end .body -->
-</div><!-- end .users -->
-
-{/strip}
diff --git a/templates/admin_groups_list.tpl b/templates/admin_groups_list.tpl
deleted file mode 100755
index bf1e3f3..0000000
--- a/templates/admin_groups_list.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-{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">{booticon iname="fa-user-group"} {tr}Add a new group{/tr}</a>
- <h1>{tr}List of existing groups{/tr}</h1>
- </div>
-
- <div class="body">
-
- {formfeedback success=$successMsg error=$errorMsg}
-
- <ul class="list-inline navbar">
- <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>
- </ul>
-
- <ul class="clear data">
- {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="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="fa-gears" batch_assign=$groupId}
- {/if}
- </div>
-
- <h2>{$grp.group_name}</h2>
- <div style="float:left;width:30%;">
- {$grp.group_desc}<br />
- {if $grp.is_default eq 'y'}<small class="warning">*{tr}Default group{/tr}*</small><br/>{/if}
- {if $grp.group_home}{tr}Home Page{/tr}:<strong> {$grp.group_home}</strong><br />{/if}
- </div>
-
- <div style="float:right;width:70%;">
- {tr}Permissions{/tr}
- <ul class="small">
- {foreach from=$grp.perms key=permName item=perm}
- <li>{$perm.perm_desc}</li>
- {foreachelse}
- <li>{tr}none{/tr}</li>
- {/foreach}
- </ul>
- </div>
- <div class="clear"></div>
- </li>
- {/foreach}
- </ul>
- {pagination}
- </div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/admin_list_users.tpl b/templates/admin_list_users.tpl
index b255924..c17297f 100755
--- a/templates/admin_list_users.tpl
+++ b/templates/admin_list_users.tpl
@@ -70,25 +70,14 @@
</div>
<div class="form-group">
- {if $gBitSystem->isPackageActive('protector')}
- {if $defaultRoleId eq ''}
- {formfeedback error="No default role is currently set. Please set one in the Administration --&gt; Users --&gt; <a href=\"`$smarty.const.USERS_PKG_URL`admin/edit_role.php\">Roles and Permissions</a> page"}
- {/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="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}
- {if $defaultGroupId eq ''}
- {formfeedback error="No default group is currently set. Please set one in the Administration --&gt; Users --&gt; <a href=\"`$smarty.const.USERS_PKG_URL`admin/edit_group.php\">Groups and Permissions</a> page"}
- {/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="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}
+ {if $defaultRoleId eq ''}
+ {formfeedback error="No default role is currently set. Please set one in the Administration --&gt; Users --&gt; <a href=\"`$smarty.const.USERS_PKG_URL`admin/edit_role.php\">Roles and Permissions</a> page"}
+ {/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="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}
</div>
<div class="form-group">
@@ -120,11 +109,7 @@
{*include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"*}
<div class="form-group submit">
- {if $gBitSystem->isPackageActive('protector')}
- <input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultRoleId eq ''} disabled="disabled"{/if} />
- {else}
- <input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultGroupId eq ''} disabled="disabled"{/if} />
- {/if}
+ <input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultRoleId eq ''} disabled="disabled"{/if} />
</div>
{/form}
{/jstab}
diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl
index 51c42e4..28403d9 100644
--- a/templates/admin_login.tpl
+++ b/templates/admin_login.tpl
@@ -66,33 +66,18 @@
</div>
<div class="form-group">
- {if $roleList }
- {formlabel label="Roles choice at registration" for="registration_role_choice"}
- {forminput}
- <select class="form-control" name="registration_role_choice[]" multiple="multiple" size="5">
- <option value="">&nbsp;</option>
- {foreach key=r item=ro from=$roleList}
- {if $ro.role_id ne -1}
- <option value="{$ro.role_id}" {if $ro.is_public eq 'y'} selected="selected"{/if}>{$ro.role_name|truncate:"52":" ..."}</option>
- {/if}
- {/foreach}
- </select>
- {formhelp note="A user will be able to select one of the selected roles at registration. If you select the default role (Registered), he will not be obliged to select a role."}
- {/forminput}
- {else}
- {formlabel label="Groups choice at registration" for="registration_group_choice"}
- {forminput}
- <select class="form-control" name="registration_group_choice[]" multiple="multiple" size="5">
- <option value="">&nbsp;</option>
- {foreach key=g item=gr from=$groupList}
- {if $gr.group_id ne -1}
- <option value="{$gr.group_id}" {if $gr.is_public eq 'y'} selected="selected"{/if}>{$gr.group_name|truncate:"52":" ..."}</option>
- {/if}
- {/foreach}
- </select>
- {formhelp note="A user will be able to select one of the selected group at registration. If you select the default group (Registered), he will not be obliged to select a group."}
- {/forminput}
- {/if}
+ {formlabel label="Roles choice at registration" for="registration_role_choice"}
+ {forminput}
+ <select class="form-control" name="registration_role_choice[]" multiple="multiple" size="5">
+ <option value="">&nbsp;</option>
+ {foreach key=r item=ro from=$roleList}
+ {if $ro.role_id ne -1}
+ <option value="{$ro.role_id}" {if $ro.is_public eq 'y'} selected="selected"{/if}>{$ro.role_name|truncate:"52":" ..."}</option>
+ {/if}
+ {/foreach}
+ </select>
+ {formhelp note="A user will be able to select one of the selected roles at registration. If you select the default role (Registered), he will not be obliged to select a role."}
+ {/forminput}
</div>
{/jstab}
diff --git a/templates/admin_permissions.tpl b/templates/admin_permissions.tpl
deleted file mode 100644
index 50d9b96..0000000
--- a/templates/admin_permissions.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{strip}
-<div class="admin users">
- <div class="header">
- <h1>{tr}Assign Group Permissions{/tr}</h1>
- </div>
-
- <div class="body">
- {formfeedback hash=$feedback}
-
- {form}
- <input type="hidden" name="package" value="{$smarty.request.package}" />
-
- <p>
- {smartlink ititle=All package=$packageKey}
- {foreach from=$permPackages key=i item=packageKey}
- {if $gBitSystem->isPackageActive($packageKey)}
- &nbsp;&bull; {smartlink ititle=$gBitSystem->mPackages.$packageKey.name|default:$packageKey package=$packageKey}
- {/if}
- {/foreach}
- </p>
-
- <table class="table data">
- <caption>{tr}Available Permissions{/tr}</caption>
- {foreach from=$allPerms item=perm key=p name=perms}
- {if $prev_package != $perm.package}
- <tr>
- <th class="width1p"></th>
- <th>{tr}Permission{/tr} - {$perm.package}</th>
- {foreach from=$allGroups item=group name=groups}
- <th class="width10p"{if $group.group_id lt 4} colspan="2"{/if}>
- <abbr title="{$group.group_name}">{if $smarty.foreach.groups.total > 8}{$group.group_id}{else}{$group.group_name}{/if}</abbr>
- </th>
- {/foreach}
- </tr>
- {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="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}
- {elseif $perm.perm_level == 'editors' }{assign var=id value=2}
- {elseif $perm.perm_level == 'registered'}{assign var=id value=3}
- {elseif $perm.perm_level == 'basic' }{assign var=id value=-1}{/if}
-
- {if $id == $group.group_id && !$group.perms.$p}
- {assign var=class value="prio5"}
- {elseif $id == $group.group_id && $group.perms.$p}
- {assign var=class value="prio1"}
- {elseif $id != $group.group_id && $group.perms.$p}
- {assign var=class value="prio5"}
- {else}
- {assign var=class value=""}
- {/if}
-
- <td class="{if $group.group_id lt 4}alignright{else}content-center{/if} {$class}">
- <input id="{$p}{$group.group_id}" type="checkbox" value="{$p}" name="perms[{$group.group_id}][{$p}]" title="{$group.group_name}" {if $group.perms.$p}checked="checked"{/if}/>
- </td>
-
- {if $group.group_id lt 4}
- <td class="alignleft {$class} width5p">
- {if $id == $group.group_id}<label for="{$p}{$group.group_id}">{booticon iname="fa-check" iexplain="Default"}</label>{/if}
- </td>
- {/if}
- {/foreach}
- </tr>
- {/foreach}
- </table>
-
- <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}" />
- </div>
- {/form}
-
- {if $smarty.foreach.groups.total > 8}
- <dl>
- {foreach from=$allGroups item=group}
- <dt>{$group.group_id}</dt>
- <dd>{$group.group_name}: {$group.group_desc}</dd>
- {/foreach}
- </dl>
- {/if}
-
- {if $contentWithPermissions}
- <h2>{tr}Content with individual Permissions{/tr}</h2>
- <ul>
- {foreach from=$contentWithPermissions item=content key=content_type_guid}
- <li><em>{$gLibertySystem->getContentTypeName($content_type_guid)}</em>
- <ul>
- {foreach from=$content item=perms key=content_id}
- <li><a href="{$smarty.const.LIBERTY_PKG_URL}content_permissions.php?content_id={$content_id}">{$perms.0.title}</a>
- <ul>
- {foreach from=$perms item=perm}
- <li>
- {$perm.group_name}: {if $perm.is_revoked}
- {booticon iname="fa-circle-minus" iexplain="Removed Permission"}
- {else}
- {booticon iname="fa-circle-plus" iexplain="Added Permission"}
- {/if} {$perm.perm_name}
- </li>
- {/foreach}
- </ul>
- </li>
- {/foreach}
- </ul>
- </li>
- {/foreach}
- </ul>
- {/if}
- </div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index ec2104b..5ac6e53 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -8,8 +8,7 @@
{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 tk=$gBitUser->mTicket 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"}
+{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="fa-bolt"}
{if $userInfo.user_id != $smarty.const.ANONYMOUS_USER_ID}
{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"}
diff --git a/templates/group_list_members.tpl b/templates/group_list_members.tpl
deleted file mode 100644
index eb25f06..0000000
--- a/templates/group_list_members.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-{strip}
-<div class="floaticon">
- <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">
- {booticon iname="fa-group" iexplain="Group List"}
- </a>
- {bithelp}
-</div>
-
-<div class="listing users">
- <div class="header">
- <h1>{tr}Group Members{/tr}: {$groupInfo.group_name}</h1>
- </div>
-
- <div class="body">
- {formfeedback success=$successMsg error=$errorMsg}
-
- <table class="table">
- <thead>
- <tr>
- <td class="text-right">#</td>
- <td>{tr}Name{/tr}</td>
- <td>{tr}Email{/tr}</td>
- <td class="text-right">{tr}Registered{/tr}</td>
- <td class="text-right">{tr}Last Login{/tr}</td>
- <td></td>
- </tr>
- </thead>
- <tbody>
- {foreach from=$groupMembers key=userId item=member name=groupMembers}
- <tr>
- <td class="text-right">{$smarty.foreach.groupMembers.iteration}</td>
- <td>{displayname hash=$member}</td>
- <td>{$member.email}</td>
- <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')} &nbsp;<a class="icon" href="{$smarty.const.BITCOMMERCE_PKG_URL}admin/list_orders.php?user_id={$userId}">{booticon iname="fa-shopping-cart"}</a>{/if}
-&nbsp;<a class="icon" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php?user_id={$userId}{if $gBitSystem->isPackageActive('bitcommerce')}&amp;content_type_guid=bitproduct{/if}">{booticon iname="fa-square-list"}</a>
-&nbsp;<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}
- &nbsp;<a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&amp;group_id={$groupInfo.group_id}&amp;assign_user={$member.user_id}">{booticon iname="fa-remove-circle" iexplain="Remove From Group"}</a>
- {/if}
- </td>
- </tr>
- {foreachelse}
- <tr>{tr}The group has no members.{/tr}</tr>
- {/foreach}
- </tbody>
- </table>
- </div><!-- end .body -->
-</div>
-{/strip}
diff --git a/templates/menu_users_admin.tpl b/templates/menu_users_admin.tpl
index f6e7a75..0ba0c95 100755
--- a/templates/menu_users_admin.tpl
+++ b/templates/menu_users_admin.tpl
@@ -9,12 +9,7 @@
<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/?page=login">{tr}Login Options{/tr}</a></li>
<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/user_activity.php">{tr}User Activity{/tr}</a></li>
<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/users_import.php">{tr}Import Users{/tr}</a></li>
- {if $gBitSystem->isPackageActive('protector')}
- <li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php">{tr}Role &amp; Permissions{/tr}</a></li>
- <li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/role_permissions.php">{tr}Permission Maintenance{/tr}</a></li>
- {else}
- <li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">{tr}Groups &amp; Permissions{/tr}</a></li>
- <li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/permissions.php">{tr}Permission Maintenance{/tr}</a></li>
- {/if}
+ <li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php">{tr}Role &amp; Permissions{/tr}</a></li>
+ <li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/role_permissions.php">{tr}Permission Maintenance{/tr}</a></li>
</ul>
{/strip}
diff --git a/templates/my_groups_list.tpl b/templates/my_groups_list.tpl
deleted file mode 100644
index 65b6152..0000000
--- a/templates/my_groups_list.tpl
+++ /dev/null
@@ -1,132 +0,0 @@
-{strip}
-<div class="admin users">
- <div class="header">
- <h1>{tr}My Groups{/tr}</h1>
- </div>
-
- <div class="body">
- {formfeedback success=$successMsg error=$errorMsg}
-
- {jstabs}
- {jstab title="My System Groups"}
- <table class="table data">
- <tr>
- <th>{tr}My Groups{/tr}</th>
- <th>{tr}Description{/tr}</th>
- {if $canRemovePublic}
- <th>{tr}Action{/tr}</th>
- {/if}
- </tr>
- {foreach from=$systemGroups key=groupId item=group}
- <tr class="{cycle values="odd,even"}">
- <td>{$group.group_name}</td>
- <td>{$group.group_desc}</td>
- {if $canRemovePublic}
- <td>
- {if $group.public eq 'y'}
- <a href="{$smarty.const.USERS_PKG_URL}my_groups.php?remove_public_group=y&amp;public_group_id={$groupId}"
- onclick="return confirm('{tr}Are you sure you want to leave this group?{/tr}')">{booticon iname="fa-scissors" iexplain="Leave Group"}</a>
- {else}
- &nbsp;
- {/if}
- </td>
- {/if}
- </tr>
- {/foreach}
- </table>
-
- {if $canAddPublic}
- <br />
- <table class="table data">
- <tr>
- <th>{tr}Public Groups{/tr}</th>
- <th>{tr}Description{/tr}</th>
- <th>{tr}Action{/tr}</th>
- </tr>
- {foreach from=$publicGroups key=groupId item=group}
- {if $group.used ne 'y' && $group.is_default ne 'y'}
- <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&amp;public_group_id={$group.group_id}" title="{tr}Assign Group{/tr}">{booticon iname="fa-key" iexplain="join group"}</a></td>
- </tr>
- {/if}
- {/foreach}
- </table>
- {/if}
- {/jstab}
-
- {if $gBitUser->hasPermission( 'p_users_create_personal_groups' )}
-
- {jstab title="My User Groups"}
- <a href="{$smarty.const.USERS_PKG_URL}my_groups.php?action=create">{tr}Add new group{/tr}</a>
-
- <table class="table data">
- <tr>
- <th>
- <a href="{$smarty.const.USERS_PKG_URL}my_groups.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'group_name_desc'}group_name_asc{else}group_name_desc{/if}">{tr}Name{/tr}</a>, &amp;
- {tr}Description{/tr}</a>
- </th>
- {if $gBitUser->hasPermission( 'p_users_assign_group_members' )}
- <th>{tr}Members{/tr}</th>
- {/if}
- {if $gBitUser->hasPermission( 'p_users_assign_group_perms' )}
- <th>{tr}Permissions{/tr}</th>
- {/if}
- <th>{tr}Action{/tr}</th>
- </tr>
-
- {foreach from=$groups key=groupId item=group}
- <tr class="{cycle values="odd,even"}">
- <td>
- <strong>{$group.group_name}</strong>{if $group.is_default eq 'y'}<em class="warning"> *{tr}Default group{/tr}*</em>{/if}<br />
- {$group.group_desc}<br />
- {if $group.group_home}{tr}Home Page{/tr}:<strong> {$group.group_home}</strong><br />{/if}
- {if $group.included}
- {tr}Included Groups{/tr}
- <ul>
- {foreach from=$group.included key=incGroupId item=incGroupName}
- <li>{$incGroupName}</li>
- {/foreach}
- </ul>
- {/if}
- </td>
-
- {if $gBitUser->hasPermission( 'p_users_assign_group_members' )}
- <td>
- {foreach from=$groupUsers key=userId item=user}
- &nbsp;{displayname hash=$user}<br />
- {foreachelse}
- <strong>{tr}none{/tr}</strong>
- {/foreach}
- </td>
- {/if}
-
- {if $gBitUser->hasPermission( 'p_users_assign_group_perms' )}
- <td>
- {foreach from=$group.perms key=permName item=perm}
- &nbsp;{$perm.perm_desc}<br />
- {foreachelse}
- <strong>{tr}none{/tr}</strong>
- {/foreach}
- </td>
- {/if}
-
- <td class="actionicon">
- <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}&amp;sort_mode={$sort_mode}&amp;action=delete&amp;group_id={$groupId}"
- 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>
- {/foreach}
- </table>
-
- {pagination}
- {/jstab}
- {/if}
- {/jstabs}
- </div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/register.tpl b/templates/register.tpl
index 75ee917..13b724c 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -199,25 +199,6 @@
</div>
{/foreach}
- {if $groupList && count($groupList) > 1}
- <hr />
- {formlabel label="Group" for="group"}
- {forminput}
- {foreach item=gr from=$groupList name=group}
- <input class="form-control" type="radio" name="group" value="{$gr.group_id|escape}"{if ($reg.group eq '' && $smarty.foreach.group.last) || $reg.group eq $gr.group_id} checked="checked"{/if}>
- {if $gr.is_default eq "y"}
- {tr}None{/tr}
- {elseif $gr.group_desc}
- {$gr.group_desc}
- {else}
- {$gr.group_name}
- {/if}
- </input>
- {if !$smarty.foreach.group.last}<br />{/if}
- {/foreach}
- {formhelp note="Choose the group you belong to."}
- {/forminput}
- {/if}
{foreach item=package from=$packages}
{include file=$package.template }
diff --git a/templates/role_list_members.tpl b/templates/role_list_members.tpl
index 698da84..bb6810f 100644
--- a/templates/role_list_members.tpl
+++ b/templates/role_list_members.tpl
@@ -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}
- &nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removerole&amp;role_id={$roleInfo.role_id}&amp;assign_user={$member.user_id}">{booticon iname="fa-trash" iexplain="remove from role"}</a>
+ &nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&amp;role_id={$roleInfo.role_id}&amp;assign_user={$member.user_id}">{booticon iname="fa-trash" iexplain="remove from role"}</a>
{/if}
</li>
{foreachelse}
diff --git a/templates/users_list.tpl b/templates/users_list.tpl
index 85993e4..f1e79eb 100755
--- a/templates/users_list.tpl
+++ b/templates/users_list.tpl
@@ -82,12 +82,7 @@
{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="fa-key"}
- {else}
- {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="fa-bolt"}
+{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="Disable Account" booticon="fa-ban"}