aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2015-01-01 15:54:16 +0100
committerStefan Parviainen <saparvia@caterva.eu>2015-01-01 15:54:16 +0100
commit85e76773a04995884e798a89cc285f48377bcb62 (patch)
treec1ead5390bc85fda87a406971a5efe6191ca0785 /mod
parent686b6ee1182c09969e2817b53825a78975c75bf5 (diff)
downloadvolse-hubzilla-85e76773a04995884e798a89cc285f48377bcb62.tar.gz
volse-hubzilla-85e76773a04995884e798a89cc285f48377bcb62.tar.bz2
volse-hubzilla-85e76773a04995884e798a89cc285f48377bcb62.zip
Use grouped select field for role selection
Diffstat (limited to 'mod')
-rw-r--r--mod/new_channel.php7
-rw-r--r--mod/settings.php4
2 files changed, 3 insertions, 8 deletions
diff --git a/mod/new_channel.php b/mod/new_channel.php
index 185fc7c28..047048f0a 100644
--- a/mod/new_channel.php
+++ b/mod/new_channel.php
@@ -115,11 +115,8 @@ function new_channel_content(&$a) {
'$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'),
'$label_import' => t('Or <a href="import">import an existing channel</a> from another location'),
'$name' => $name,
- '$label_role' => t('Channel Type'),
- '$questionmark' => t('?'),
- '$what_is_role' => t('What is this?'),
- '$help_role' => t('Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'),
- '$role_select' => role_selector(($privacy_role) ? $privacy_role : 'social'),
+ '$help_role' => t('Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you'),
+ '$role' => array('permissions_role' , t('Channel Type'), ($privacy_role) ? $privacy_role : 'social', '<a href="help/roles" target="_blank">'.t('Read more about roles').'</a>',get_roles()),
'$nickname' => $nickname,
'$submit' => t('Create')
));
diff --git a/mod/settings.php b/mod/settings.php
index bce04e436..6f5c4287b 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1042,9 +1042,7 @@ function settings_content(&$a) {
'$aclselect' => populate_acl($perm_defaults,false),
'$suggestme' => $suggestme,
'$group_select' => $group_select,
- '$role_lbl' => t('Channel permissions category:'),
-
- '$role_select' => role_selector($permissions_role),
+ '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()),
'$profile_in_dir' => $profile_in_dir,
'$hide_friends' => $hide_friends,