diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/generic_modal.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 20 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 12 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 24 |
4 files changed, 29 insertions, 29 deletions
diff --git a/view/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl index 0af44c269..18279b6f7 100644 --- a/view/tpl/generic_modal.tpl +++ b/view/tpl/generic_modal.tpl @@ -2,8 +2,8 @@ <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="generic-modal-title-{{$id}}">{{$title}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body" id="generic-modal-body-{{$id}}"></div> <div class="modal-footer"> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 66c813f1f..853146a17 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -429,13 +429,13 @@ function enableOnUser(){ if (data['status']) { $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); $('#embedPhotoModalBodyAlbumDialog').html('\ - <div><ul class="nav">\n\ - <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ + <div><div class="nav nav-pills flex-column">\n\ + <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ <i class="fa fa-chevron-left"></i> \n\ {{$modaldiffalbum}}\n\ </a>\n\ </li>\n\ - </ul><br></div>') + </div><br></div>') $('#embedPhotoModalBodyAlbumDialog').append(data['content']); $('#embedPhotoModalBodyAlbumDialog').click(function (evt) { evt.preventDefault(); @@ -445,8 +445,8 @@ function enableOnUser(){ $(imageparent).toggleClass('embed-photo-selected-photo'); } }); - $('#embedPhotoModalBodyAlbumListDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); $('#embed-photo-OKButton').click(function () { $('.embed-photo-selected-photo').each(function (index) { var href = $(this).attr('href'); @@ -479,17 +479,17 @@ function enableOnUser(){ if (data['status']) { var albums = data['albumlist']; //JSON.parse(data['albumlist']); $('#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++) { var albumName = albums[i].text; var jsAlbumName = albums[i].jstext; - var albumLink = '<li>'; - albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; + var albumLink = '<li class="nav-item">'; + albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '</li>'; $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); } - $('#embedPhotoModalBodyAlbumDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); } else { window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 0ed63a7c0..dbbb470c5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -199,8 +199,8 @@ <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="expiryModalLabel">{{$jotnets_label}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body"> {{$jotnets}} @@ -226,8 +226,8 @@ <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="expiryModalLabel">{{$expires}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body form-group" style="width:90%"> <div class="date"> @@ -253,8 +253,8 @@ <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="createdModalLabel">{{$future_txt}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body form-group" style="width:90%"> <div class="date"> @@ -280,14 +280,14 @@ <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> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body" id="embedPhotoModalBody" > - <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> + <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> <div id="embedPhotoModalBodyAlbumList"></div> </div> - <div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> + <div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div> </div> <div class="modal-footer"> <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 27592a4b4..e54ab9680 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -83,14 +83,14 @@ <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> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body" id="embedPhotoModalBody" > - <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> + <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> <div id="embedPhotoModalBodyAlbumList"></div> </div> - <div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> + <div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div> </div> <div class="modal-footer"> <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> @@ -366,8 +366,8 @@ if (data['status']) { $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); $('#embedPhotoModalBodyAlbumDialog').html('\ - <div><ul class="nav">\n\ - <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ + <div><ul class="nav nav-pills flex-column">\n\ + <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ <i class="fa fa-chevron-left"></i> \n\ {{$modaldiffalbum}}\n\ </a>\n\ @@ -382,8 +382,8 @@ $(imageparent).toggleClass('embed-photo-selected-photo'); } }); - $('#embedPhotoModalBodyAlbumListDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); $('#embed-photo-OKButton').click(function () { $('.embed-photo-selected-photo').each(function (index) { var href = $(this).attr('href'); @@ -422,17 +422,17 @@ if (data['status']) { var albums = data['albumlist']; //JSON.parse(data['albumlist']); $('#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++) { var albumName = albums[i].text; var jsAlbumName = albums[i].jstext; - var albumLink = '<li>'; - albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; + var albumLink = '<li class="nav-item">'; + albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '</li>'; $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); } - $('#embedPhotoModalBodyAlbumDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); } else { window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); } |