harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change permission settings from radio buttons to select boxes

Browse Source
This commit is contained in:
friendica 2012-11-05 15:26:01 -08:00
parent 2752b58f33
commit 4f1170b656
5 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/permissions.php
View File

@ -4,19 +4,19 @@
function get_perms() { function get_perms() {
$global_perms = array( $global_perms = array(
// Read only permissions // Read only permissions
'view_stream' => array('channel_r_stream', intval(PERMS_R_STREAM), true, t('Who can view your "public" stream and posts')), 'view_stream' => array('channel_r_stream', intval(PERMS_R_STREAM), true, t('Who can view your "public" stream and posts'), ''),
'view_profile' => array('channel_r_profile', intval(PERMS_R_PROFILE), true, t('Who can view your "public" channel profile')), 'view_profile' => array('channel_r_profile', intval(PERMS_R_PROFILE), true, t('Who can view your "public" channel profile'), ''),
'view_photos' => array('channel_r_photos', intval(PERMS_R_PHOTOS), true, t('Who can view your "public" photo albums')), 'view_photos' => array('channel_r_photos', intval(PERMS_R_PHOTOS), true, t('Who can view your "public" photo albums'), ''),
'view_contacts' => array('channel_r_abook', intval(PERMS_R_ABOOK), true, t('Who can view your "public" address book')), 'view_contacts' => array('channel_r_abook', intval(PERMS_R_ABOOK), true, t('Who can view your "public" address book'), ''),
// Write permissions // Write permissions
'send_stream' => array('channel_w_stream', intval(PERMS_W_STREAM), false, t('Who can send you their channel stream and posts')), 'send_stream' => array('channel_w_stream', intval(PERMS_W_STREAM), false, t('Who can send you their channel stream and posts'), ''),
'post_wall' => array('channel_w_wall', intval(PERMS_W_WALL), false, t('Who can post on your channel page')), 'post_wall' => array('channel_w_wall', intval(PERMS_W_WALL), false, t('Who can post on your channel page'), ''),
'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Who can comment on your posts')), 'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Who can comment on your posts'), ''),
'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Who can send you private mail messages')), 'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Who can send you private mail messages'), ''),
'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Who can post photos to your photo albums')), 'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Who can post photos to your photo albums'), ''),
'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Who can forward to all your channel contacts via post tags')), 'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Who can forward to all your channel contacts via post tags'), t('Advanced - useful for creating group forum channels')),
'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Who can chat with you (when available)')), 'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Who can chat with you (when available)'), t('Requires compatible chat plugin')),
); );
return $global_perms; return $global_perms;
} }

20
mod/settings.php
View File

@ -765,7 +765,7 @@ function settings_content(&$a) {
$permiss = array(); $permiss = array();
$perm_cats = array( $perm_opts = array(
array( t('Nobody except yourself'), 0), array( t('Nobody except yourself'), 0),
array( t('Only those you specifically allow'), PERMS_SPECIFIC), array( t('Only those you specifically allow'), PERMS_SPECIFIC),
array( t('Anybody in your address book'), PERMS_CONTACTS), array( t('Anybody in your address book'), PERMS_CONTACTS),
@ -776,23 +776,17 @@ function settings_content(&$a) {
foreach($global_perms as $k => $perm) { foreach($global_perms as $k => $perm) {
$options = array();
$permiss[$k] = array( foreach($perm_opts as $opt) {
'key' => $k, if((! $perm[2]) && $opt[1] == PERMS_PUBLIC)
'label' => $perm[3],
'fields' => array()
);
$column = $perm[0];
foreach($perm_cats as $cat) {
if((! $perm[2]) && $cat[1] == PERMS_PUBLIC)
continue; continue;
$permiss[$k]['fields'][] = array( $column, $cat[0], $cat[1], '', (($channel[$column] == $cat[1]) ? '1' : '')); $options[$opt[1]] = $opt[0];
} }
$permiss[] = array($k,$perm[3],$channel[$perm[0]],$perm[4],$options);
} }
logger('permiss: ' . print_r($permiss,true)); // logger('permiss: ' . print_r($permiss,true));

2
version.inc
View File

@ -1 +1 @@
2012-11-04.128 2012-11-05.129

17
view/css/mod_settings.css
View File

@ -1,17 +1,8 @@
.settings-permission-label { #settings-permissions-wrapper .field {
margin-top: 10px;
font-weight: bold;
margin-bottom: 10px; margin-bottom: 10px;
} }
#settings-permissions-wrapper .field {
margin-left: 15px;
padding-bottom: 0px;
margin-bottom: 0px;
}
#settings-permissions-wrapper .field label{ #settings-permissions-wrapper .field label{
width: 200px; width: 350px;
} font-weight: bold;
#settings-permissions-wrapper .field input{
text-align: left;
width: 50px;
} }

11
view/tpl/settings.tpl
View File

@ -39,16 +39,15 @@ $nickname_block
<div id="settings-permissions-wrapper"> <div id="settings-permissions-wrapper">
{{ for $permiss_arr as $permit }} {{ for $permiss_arr as $permit }}
<div id="settings-perms-$permit.key" class="settings-permission-label">$permit.label</div> {{inc field_select.tpl with $field=$permit }}{{endinc}}
{{ for $permit.fields as $radio }}
{{inc field_radio.tpl with $field=$radio }}{{endinc}}
{{ endfor }}
{{ endfor }} {{ endfor }}
</div> </div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="$submit" />
</div>