missing permissions block in mod_filestorage

This commit is contained in:
friendica 2014-04-30 16:35:50 -07:00
parent 5592802790
commit 14402bdf98
4 changed files with 10 additions and 2 deletions

View file

@ -172,7 +172,7 @@ What makes the RedMatrix unique is what we call "magic authentication" - which i
</div> </div>
<br /> <br />
<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
Warning: After experiencing magic authentication and nomadic identity, you may find it disconcerting and a bit "primitive" to go back to the old internet. You shouldn't need hundreds of different passwords to use the web ... or be totally isolated from your friends and family because a router in another country is having "<em>issues</em>". Warning: After experiencing magic authentication and nomadic identity, you may find it disconcerting and a bit "primitive" to go back to the old internet. You shouldn't need hundreds of different passwords to use the web ... or be totally isolated from your friends and family because a server or router in another country is having "<em>issues</em>".
</div> </div>
<br /> <br />
<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">

View file

@ -114,6 +114,8 @@ function filestorage_content(&$a) {
$aclselect_e = populate_acl($f); $aclselect_e = populate_acl($f);
$is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false); $is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false);
$lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock');
$o = replace_macros(get_markup_template('attach_edit.tpl'), array( $o = replace_macros(get_markup_template('attach_edit.tpl'), array(
'$header' => t('Edit file permissions'), '$header' => t('Edit file permissions'),
@ -123,6 +125,8 @@ function filestorage_content(&$a) {
'$channelnick' => $channel['channel_address'], '$channelnick' => $channel['channel_address'],
'$permissions' => t('Permissions'), '$permissions' => t('Permissions'),
'$aclselect' => $aclselect_e, '$aclselect' => $aclselect_e,
'$lockstate' => $lockstate,
'$permset' => t('Set/edit permissions'),
'$recurse' => t('Include all files and sub folders'), '$recurse' => t('Include all files and sub folders'),
'$backlink' => t('Return to file list'), '$backlink' => t('Return to file list'),
'$isadir' => $is_a_dir, '$isadir' => $is_a_dir,

View file

@ -9,3 +9,4 @@
#cutpasteinput, #linkpasteinput { #cutpasteinput, #linkpasteinput {
width: 600px; width: 600px;
} }

View file

@ -29,6 +29,9 @@
<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br />
<div id="attach-edit-perms" > <div id="attach-edit-perms" >
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
</button>
{{$aclselect}} {{$aclselect}}
</div> </div>