aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorhubzilla <git@macgirvin.com>2016-06-13 10:15:09 +1000
committerGitHub <noreply@github.com>2016-06-13 10:15:09 +1000
commitb18b9464a4b830ec50412bb688727d7170a90398 (patch)
treedc762bfa1192ac1be695f7d713fdb51cbce1ed58 /include
parent81b3c5971119c5ceb2ae8cbfee71ad548a531140 (diff)
parent71d4f65cb21875176da2b77610a9a6cc86d10384 (diff)
downloadvolse-hubzilla-b18b9464a4b830ec50412bb688727d7170a90398.tar.gz
volse-hubzilla-b18b9464a4b830ec50412bb688727d7170a90398.tar.bz2
volse-hubzilla-b18b9464a4b830ec50412bb688727d7170a90398.zip
Merge pull request #416 from anaqreon/embedphotos
Add embed photos button with album browser to new post editor
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 518193b08..bf29048b6 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1143,6 +1143,8 @@ function status_editor($a, $x, $popup = false) {
$weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
if(x($x, 'hide_weblink'))
$weblink = false;
+
+ $embedPhotos = t('Embed image from photo albums');
$writefiles = (($mimetype === 'text/bbcode') ? perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage') : false);
if(x($x, 'hide_attach'))
@@ -1178,6 +1180,12 @@ function status_editor($a, $x, $popup = false) {
'$whereareu' => t('Where are you right now?'),
'$editor_autocomplete'=> ((x($x,'editor_autocomplete')) ? $x['editor_autocomplete'] : ''),
'$bbco_autocomplete'=> ((x($x,'bbco_autocomplete')) ? $x['bbco_autocomplete'] : ''),
+ '$modalchooseimages' => t('Choose images to embed'),
+ '$modalchoosealbum' => t('Choose an album'),
+ '$modaldiffalbum' => t('Choose a different album...'),
+ '$modalerrorlist' => t('Error getting album list'),
+ '$modalerrorlink' => t('Error getting photo link'),
+ '$modalerroralbum' => t('Error getting album'),
));
$tpl = get_markup_template('jot.tpl');
@@ -1219,6 +1227,10 @@ function status_editor($a, $x, $popup = false) {
'$code' => t('Code'),
'$attach' => t('Attach file'),
'$weblink' => $weblink,
+ '$embedPhotos' => $embedPhotos,
+ '$embedPhotosModalTitle' => t('Embed an image from your albums'),
+ '$embedPhotosModalCancel' => t('Cancel'),
+ '$embedPhotosModalOK' => t('OK'),
'$setloc' => $setloc,
'$voting' => t('Toggle voting'),
'$feature_voting' => $feature_voting,