mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 04:15:12 +00:00
get rid of "provide status post for this upload"
This commit is contained in:
parent
5c31d45fa5
commit
1c09c036e2
3 changed files with 3 additions and 14 deletions
|
@ -735,10 +735,8 @@ class Photos extends Controller
|
||||||
'$nickname' => App::$data['channel']['channel_address'],
|
'$nickname' => App::$data['channel']['channel_address'],
|
||||||
'$newalbum_label' => t('Enter an album name'),
|
'$newalbum_label' => t('Enter an album name'),
|
||||||
'$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
|
'$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
|
||||||
'$visible' => array('visible', t('Create a status post for this upload'), 0, t('If multiple files are selected, the message will be repeated for each photo'), array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
|
|
||||||
'$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')),
|
'$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')),
|
||||||
'title' => ['title', t('Title (optional)')],
|
'title' => ['title', t('Title (optional)')],
|
||||||
'$body' => array('body', t('Your message (optional)'), '', 'This will only appear in the status post'),
|
|
||||||
'$albums' => $albums['albums'],
|
'$albums' => $albums['albums'],
|
||||||
'$selname' => $selname,
|
'$selname' => $selname,
|
||||||
'$permissions' => t('Permissions'),
|
'$permissions' => t('Permissions'),
|
||||||
|
|
|
@ -419,7 +419,7 @@ function photo_upload($channel, $observer, $args)
|
||||||
$activity_format = sprintf(t('%1$s posted %2$s', 'photo_upload'), $author_link, $photo_link);
|
$activity_format = sprintf(t('%1$s posted %2$s', 'photo_upload'), $author_link, $photo_link);
|
||||||
}
|
}
|
||||||
|
|
||||||
$body = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
|
$body = (isset($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
|
||||||
|
|
||||||
// If uploaded into a post, this is the text that is returned to the webapp for inclusion in the post.
|
// If uploaded into a post, this is the text that is returned to the webapp for inclusion in the post.
|
||||||
|
|
||||||
|
|
|
@ -16,15 +16,9 @@
|
||||||
</datalist>
|
</datalist>
|
||||||
</div>
|
</div>
|
||||||
{{if $default}}
|
{{if $default}}
|
||||||
<!-- div class="form-group">
|
|
||||||
<input id="photos-upload-choose" type="file" name="userfile" />
|
|
||||||
</div -->
|
|
||||||
{{include file="field_input.tpl" field=$caption}}
|
{{include file="field_input.tpl" field=$caption}}
|
||||||
{{include file="field_input.tpl" field=$title}}
|
{{include file="field_input.tpl" field=$title}}
|
||||||
{{include file="field_checkbox.tpl" field=$visible}}
|
<input type="hidden" name="visible" value="0" />
|
||||||
<div id="body-textarea">
|
|
||||||
{{include file="field_textarea.tpl" field=$body}}
|
|
||||||
</div>
|
|
||||||
<div class="pull-right btn-group">
|
<div class="pull-right btn-group">
|
||||||
<div class="btn-group">
|
<div class="btn-group">
|
||||||
{{if $lockstate}}
|
{{if $lockstate}}
|
||||||
|
@ -42,10 +36,7 @@
|
||||||
{{if $uploader}}
|
{{if $uploader}}
|
||||||
{{include file="field_input.tpl" field=$caption}}
|
{{include file="field_input.tpl" field=$caption}}
|
||||||
{{include file="field_input.tpl" field=$title}}
|
{{include file="field_input.tpl" field=$title}}
|
||||||
{{include file="field_checkbox.tpl" field=$visible}}
|
<input type="hidden" name="visible" value="0" />
|
||||||
<div id="body-textarea">
|
|
||||||
{{include file="field_textarea.tpl" field=$body}}
|
|
||||||
</div>
|
|
||||||
<div id="photos-upload-perms" class="btn-group pull-right">
|
<div id="photos-upload-perms" class="btn-group pull-right">
|
||||||
{{if $lockstate}}
|
{{if $lockstate}}
|
||||||
<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
|
<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
|
||||||
|
|
Loading…
Reference in a new issue