diff options
| author | friendica <info@friendica.com> | 2014-04-30 16:35:50 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-30 16:35:50 -0700 |
| commit | 14402bdf9806929d910d8f6a2549de7f45c2a61f (patch) | |
| tree | e93238a870f76e8778f9eea5bf62cc440c2aa3ca | |
| parent | 5592802790dbc2a934f772b2b9108ee0cd409831 (diff) | |
| download | volse-hubzilla-14402bdf9806929d910d8f6a2549de7f45c2a61f.tar.gz volse-hubzilla-14402bdf9806929d910d8f6a2549de7f45c2a61f.tar.bz2 volse-hubzilla-14402bdf9806929d910d8f6a2549de7f45c2a61f.zip | |
missing permissions block in mod_filestorage
| -rw-r--r-- | assets/home.html | 2 | ||||
| -rw-r--r-- | mod/filestorage.php | 4 | ||||
| -rw-r--r-- | view/css/mod_filestorage.css | 3 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/assets/home.html b/assets/home.html index b5e18a4b9..2e926ba3b 100644 --- a/assets/home.html +++ b/assets/home.html @@ -172,7 +172,7 @@ What makes the RedMatrix unique is what we call "magic authentication" - which i </div> <br /> <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> <br /> <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;"> diff --git a/mod/filestorage.php b/mod/filestorage.php index 3e53a1e93..ed7164070 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -114,6 +114,8 @@ function filestorage_content(&$a) { $aclselect_e = populate_acl($f); $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( '$header' => t('Edit file permissions'), @@ -123,6 +125,8 @@ function filestorage_content(&$a) { '$channelnick' => $channel['channel_address'], '$permissions' => t('Permissions'), '$aclselect' => $aclselect_e, + '$lockstate' => $lockstate, + '$permset' => t('Set/edit permissions'), '$recurse' => t('Include all files and sub folders'), '$backlink' => t('Return to file list'), '$isadir' => $is_a_dir, diff --git a/view/css/mod_filestorage.css b/view/css/mod_filestorage.css index 98fa8e93d..22f8a53d9 100644 --- a/view/css/mod_filestorage.css +++ b/view/css/mod_filestorage.css @@ -8,4 +8,5 @@ #cutpasteinput, #linkpasteinput { width: 600px; -}
\ No newline at end of file +} + diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 77f32b5bc..5d2703a2d 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -29,6 +29,9 @@ <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> <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}} </div> |