harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix embed image modals

Browse Source
This commit is contained in:
Mario Vavti 2017-03-22 13:15:53 +01:00
parent bc3e1e99fe
commit 3a7db8ec60
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/tpl/generic_modal.tpl
View File

@ -2,8 +2,8 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4> <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body" id="generic-modal-body-{{$id}}"></div> <div class="modal-body" id="generic-modal-body-{{$id}}"></div>
<div class="modal-footer"> <div class="modal-footer">

20
view/tpl/jot-header.tpl
View File

@ -429,13 +429,13 @@ function enableOnUser(){
if (data['status']) { if (data['status']) {
$('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
$('#embedPhotoModalBodyAlbumDialog').html('\ $('#embedPhotoModalBodyAlbumDialog').html('\
<div><ul class="nav">\n\ <div><div class="nav nav-pills flex-column">\n\
<li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
<i class="fa fa-chevron-left"></i>&nbsp\n\ <i class="fa fa-chevron-left"></i>&nbsp\n\
{{$modaldiffalbum}}\n\ {{$modaldiffalbum}}\n\
</a>\n\ </a>\n\
</li>\n\ </li>\n\
</ul><br></div>') </div><br></div>')
$('#embedPhotoModalBodyAlbumDialog').append(data['content']); $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
$('#embedPhotoModalBodyAlbumDialog').click(function (evt) { $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
evt.preventDefault(); evt.preventDefault();
@ -445,8 +445,8 @@ function enableOnUser(){
$(imageparent).toggleClass('embed-photo-selected-photo'); $(imageparent).toggleClass('embed-photo-selected-photo');
} }
}); });
$('#embedPhotoModalBodyAlbumListDialog').addClass('hide'); $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
$('#embedPhotoModalBodyAlbumDialog').removeClass('hide'); $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
$('#embed-photo-OKButton').click(function () { $('#embed-photo-OKButton').click(function () {
$('.embed-photo-selected-photo').each(function (index) { $('.embed-photo-selected-photo').each(function (index) {
var href = $(this).attr('href'); var href = $(this).attr('href');
@ -479,17 +479,17 @@ function enableOnUser(){
if (data['status']) { if (data['status']) {
var albums = data['albumlist']; //JSON.parse(data['albumlist']); var albums = data['albumlist']; //JSON.parse(data['albumlist']);
$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
$('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>'); $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
for(var i=0; i<albums.length; i++) { for(var i=0; i<albums.length; i++) {
var albumName = albums[i].text; var albumName = albums[i].text;
var jsAlbumName = albums[i].jstext; var jsAlbumName = albums[i].jstext;
var albumLink = '<li>'; var albumLink = '<li class="nav-item">';
albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
albumLink += '</li>'; albumLink += '</li>';
$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
} }
$('#embedPhotoModalBodyAlbumDialog').addClass('hide'); $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
$('#embedPhotoModalBodyAlbumListDialog').removeClass('hide'); $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
} else { } else {
window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
} }

12
view/tpl/jot.tpl
View File

@ -199,8 +199,8 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4> <h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
{{$jotnets}} {{$jotnets}}
@ -226,8 +226,8 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body form-group" style="width:90%"> <div class="modal-body form-group" style="width:90%">
<div class="date"> <div class="date">
@ -253,8 +253,8 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4> <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body form-group" style="width:90%"> <div class="modal-body form-group" style="width:90%">
<div class="date"> <div class="date">
@ -280,14 +280,14 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body" id="embedPhotoModalBody" > <div class="modal-body" id="embedPhotoModalBody" >
<div id="embedPhotoModalBodyAlbumListDialog" class="hide"> <div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
<div id="embedPhotoModalBodyAlbumList"></div> <div id="embedPhotoModalBodyAlbumList"></div>
</div> </div>
<div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> <div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>

24
view/tpl/wiki.tpl
View File

@ -83,14 +83,14 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div> </div>
<div class="modal-body" id="embedPhotoModalBody" > <div class="modal-body" id="embedPhotoModalBody" >
<div id="embedPhotoModalBodyAlbumListDialog" class="hide"> <div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
<div id="embedPhotoModalBodyAlbumList"></div> <div id="embedPhotoModalBodyAlbumList"></div>
</div> </div>
<div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> <div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
@ -366,8 +366,8 @@
if (data['status']) { if (data['status']) {
$('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
$('#embedPhotoModalBodyAlbumDialog').html('\ $('#embedPhotoModalBodyAlbumDialog').html('\
<div><ul class="nav">\n\ <div><ul class="nav nav-pills flex-column">\n\
<li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
<i class="fa fa-chevron-left"></i>&nbsp;\n\ <i class="fa fa-chevron-left"></i>&nbsp;\n\
{{$modaldiffalbum}}\n\ {{$modaldiffalbum}}\n\
</a>\n\ </a>\n\
@ -382,8 +382,8 @@
$(imageparent).toggleClass('embed-photo-selected-photo'); $(imageparent).toggleClass('embed-photo-selected-photo');
} }
}); });
$('#embedPhotoModalBodyAlbumListDialog').addClass('hide'); $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
$('#embedPhotoModalBodyAlbumDialog').removeClass('hide'); $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
$('#embed-photo-OKButton').click(function () { $('#embed-photo-OKButton').click(function () {
$('.embed-photo-selected-photo').each(function (index) { $('.embed-photo-selected-photo').each(function (index) {
var href = $(this).attr('href'); var href = $(this).attr('href');
@ -422,17 +422,17 @@
if (data['status']) { if (data['status']) {
var albums = data['albumlist']; //JSON.parse(data['albumlist']); var albums = data['albumlist']; //JSON.parse(data['albumlist']);
$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
$('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>'); $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
for(var i = 0; i < albums.length; i++) { for(var i = 0; i < albums.length; i++) {
var albumName = albums[i].text; var albumName = albums[i].text;
var jsAlbumName = albums[i].jstext; var jsAlbumName = albums[i].jstext;
var albumLink = '<li>'; var albumLink = '<li class="nav-item">';
albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
albumLink += '</li>'; albumLink += '</li>';
$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
} }
$('#embedPhotoModalBodyAlbumDialog').addClass('hide'); $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
$('#embedPhotoModalBodyAlbumListDialog').removeClass('hide'); $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
} else { } else {
window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
} }