diff options
| author | marijus <mario@mariovavti.com> | 2014-11-03 10:46:57 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-11-03 10:46:57 +0100 |
| commit | 2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb (patch) | |
| tree | ffa8e4fc1e021c2ed4a3674a9a0d17657ffb10d3 | |
| parent | 0e4f318b71fc454c3a0ce6f0e073d9808ff00269 (diff) | |
| download | volse-hubzilla-2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb.tar.gz volse-hubzilla-2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb.tar.bz2 volse-hubzilla-2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb.zip | |
if deleting a photo go away to album
| -rw-r--r-- | mod/photos.php | 4 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/mod/photos.php b/mod/photos.php index 48bc6d1e5..51ac4c25c 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -196,7 +196,7 @@ function photos_post(&$a) { } } - goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); + goaway($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']); } if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) { @@ -918,6 +918,8 @@ function photos_content(&$a) { $aclselect_e = populate_acl($ph[0]); $albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer'])); + $_SESSION['album_return'] = bin2hex($ph[0]['album']); + $edit = array( 'edit' => t('Edit photo'), 'id' => $link_item['id'], diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index d06af4f99..13fb41687 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -31,20 +31,20 @@ <div id="photos-upload-new-end" class="clear"></div> - <div class="checkbox"> + <div class="checkbox pull-left"> <label class="checkbox-inline" for="photos-upload-noshare" > <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}} </label> </div> {{if $uploader}} - <div id="photos-upload-noshare-end"></div> - <div id="photos-upload-perms" class="photos-upload-perms" > - <span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span> - <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + <div id="photos-upload-perms" class="pull-right"> + <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + <div class="pull-right"> + {{$uploader}} </div> - <div id="photos-upload-perms-end" class="clear"></div> - {{$uploader}} {{/if}} </form> </div> |