Stashing changes. Not a functional state.
This commit is contained in:
Andrew Manning
parent
e46e7002a8
commit
7fc2b13fe6
@ -1143,6 +1143,8 @@ function status_editor($a, $x, $popup = false) {
|
|||||||
$weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
|
$weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
|
||||||
if(x($x, 'hide_weblink'))
|
if(x($x, 'hide_weblink'))
|
||||||
$weblink = false;
|
$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);
|
$writefiles = (($mimetype === 'text/bbcode') ? perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage') : false);
|
||||||
if(x($x, 'hide_attach'))
|
if(x($x, 'hide_attach'))
|
||||||
@ -1178,6 +1180,12 @@ function status_editor($a, $x, $popup = false) {
|
|||||||
'$whereareu' => t('Where are you right now?'),
|
'$whereareu' => t('Where are you right now?'),
|
||||||
'$editor_autocomplete'=> ((x($x,'editor_autocomplete')) ? $x['editor_autocomplete'] : ''),
|
'$editor_autocomplete'=> ((x($x,'editor_autocomplete')) ? $x['editor_autocomplete'] : ''),
|
||||||
'$bbco_autocomplete'=> ((x($x,'bbco_autocomplete')) ? $x['bbco_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');
|
$tpl = get_markup_template('jot.tpl');
|
||||||
@ -1219,6 +1227,10 @@ function status_editor($a, $x, $popup = false) {
|
|||||||
'$code' => t('Code'),
|
'$code' => t('Code'),
|
||||||
'$attach' => t('Attach file'),
|
'$attach' => t('Attach file'),
|
||||||
'$weblink' => $weblink,
|
'$weblink' => $weblink,
|
||||||
|
'$embedPhotos' => $embedPhotos,
|
||||||
|
'$embedPhotosModalTitle' => t('Embed an image from your albums'),
|
||||||
|
'$embedPhotosModalCancel' => t('Cancel'),
|
||||||
|
'$embedPhotosModalOK' => t('OK'),
|
||||||
'$setloc' => $setloc,
|
'$setloc' => $setloc,
|
||||||
'$voting' => t('Toggle voting'),
|
'$voting' => t('Toggle voting'),
|
||||||
'$feature_voting' => $feature_voting,
|
'$feature_voting' => $feature_voting,
|
||||||
|
|||||||
@ -364,6 +364,89 @@ function enableOnUser(){
|
|||||||
|
|
||||||
{{$geotag}}
|
{{$geotag}}
|
||||||
|
|
||||||
|
|
||||||
|
var initializeEmbedPhotoDialog = function () {
|
||||||
|
$('.embed-photo-selected-photo').each(function (index) {
|
||||||
|
$(this).removeClass('embed-photo-selected-photo');
|
||||||
|
});
|
||||||
|
getPhotoAlbumList();
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').off('click');
|
||||||
|
$('#embedPhotoModal').modal();
|
||||||
|
};
|
||||||
|
|
||||||
|
var choosePhotoFromAlbum = function (album) {
|
||||||
|
$.post("embedphotos/album", {name: album},
|
||||||
|
function(data) {
|
||||||
|
if (data['status']) {
|
||||||
|
$('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').html('\
|
||||||
|
<div><ul class="nav">\n\
|
||||||
|
<li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
|
||||||
|
<i class="fa fa-chevron-left"></i> \n\
|
||||||
|
{{$modaldiffalbum}}\n\
|
||||||
|
</a>\n\
|
||||||
|
</li>\n\
|
||||||
|
</ul><br></div>')
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
|
||||||
|
evt.preventDefault();
|
||||||
|
var image = document.getElementById(evt.target.id);
|
||||||
|
if (typeof($(image).parent()[0]) !== 'undefined') {
|
||||||
|
var imageparent = document.getElementById($(image).parent()[0].id);
|
||||||
|
$(imageparent).toggleClass('embed-photo-selected-photo');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
$('#embedPhotoModalBodyAlbumListDialog').addClass('hide');
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').removeClass('hide');
|
||||||
|
$('#embed-photo-OKButton').click(function () {
|
||||||
|
$('.embed-photo-selected-photo').each(function (index) {
|
||||||
|
var href = $(this).attr('href');
|
||||||
|
$.post("embedphotos/photolink", {href: href},
|
||||||
|
function(ddata) {
|
||||||
|
if (ddata['status']) {
|
||||||
|
addeditortext(ddata['photolink']);
|
||||||
|
} else {
|
||||||
|
window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
'json');
|
||||||
|
});
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').html('');
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').off('click');
|
||||||
|
$('#embedPhotoModal').modal('hide');
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
'json');
|
||||||
|
};
|
||||||
|
|
||||||
|
var getPhotoAlbumList = function () {
|
||||||
|
$.post("embedphotos/albumlist", {},
|
||||||
|
function(data) {
|
||||||
|
if (data['status']) {
|
||||||
|
var albums = data['albumlist']; //JSON.parse(data['albumlist']);
|
||||||
|
$('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
|
||||||
|
$('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
|
||||||
|
for(var i=0; i<albums.length; i++) {
|
||||||
|
var albumName = albums[i].text;
|
||||||
|
var albumLink = '<li>';
|
||||||
|
albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
|
||||||
|
albumLink += '</li>';
|
||||||
|
$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
|
||||||
|
}
|
||||||
|
$('#embedPhotoModalBodyAlbumDialog').addClass('hide');
|
||||||
|
$('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
|
||||||
|
} else {
|
||||||
|
window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
'json');
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@ -79,6 +79,11 @@
|
|||||||
<i id="profile-link" class="fa fa-link jot-icons"></i>
|
<i id="profile-link" class="fa fa-link jot-icons"></i>
|
||||||
</button>
|
</button>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{if $embedPhotos}}
|
||||||
|
<button id="embed-photo-wrapper" class="btn btn-default btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
|
||||||
|
<i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
|
||||||
|
</button>
|
||||||
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
<div class="btn-group hidden-xs hidden-sm">
|
<div class="btn-group hidden-xs hidden-sm">
|
||||||
{{if $setloc}}
|
{{if $setloc}}
|
||||||
@ -225,6 +230,30 @@
|
|||||||
</div><!-- /.modal -->
|
</div><!-- /.modal -->
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
{{if $embedPhotos}}
|
||||||
|
<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||||
|
<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body" id="embedPhotoModalBody" >
|
||||||
|
<div id="embedPhotoModalBodyAlbumListDialog" class="hide">
|
||||||
|
<div id="embedPhotoModalBodyAlbumList"></div>
|
||||||
|
</div>
|
||||||
|
<div id="embedPhotoModalBodyAlbumDialog" class="hide">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
|
||||||
|
<button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
|
||||||
|
</div>
|
||||||
|
</div><!-- /.modal-content -->
|
||||||
|
</div><!-- /.modal-dialog -->
|
||||||
|
</div><!-- /.modal -->
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
{{if $content || $attachment || $expanded}}
|
{{if $content || $attachment || $expanded}}
|
||||||
<script>initEditor();</script>
|
<script>initEditor();</script>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|||||||
Reference in New Issue
Block a user