diff options
Diffstat (limited to 'view')
-rw-r--r-- | view/css/widgets.css | 2 | ||||
-rw-r--r-- | view/tpl/help.tpl | 9 | ||||
-rw-r--r-- | view/tpl/notes.tpl | 47 | ||||
-rw-r--r-- | view/tpl/wiki.tpl | 38 |
4 files changed, 45 insertions, 51 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 402c3f473..abaf03038 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -65,7 +65,7 @@ li:hover .widget-nav-pills-icons { padding: 5px; width: 100%; resize: vertical; - height: 250px; + min-height: 250px; } /* saved searches */ diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 1c5d05738..8eb53417a 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -16,16 +16,7 @@ // Generate the table of contents in the side nav menu (see view/tpl/help.tpl) $(document).ready(function () { - $('#doco-top-toc').toc({content: "#doco-content", headings: "h1,h2,h3,h4"}); - $('.navbar-header').append('<button id="doco-return-to-top-btn">'); //.find('button'); - var goTopBtn = $('#doco-return-to-top-btn'); - goTopBtn.append('<i>').find('i').addClass('fa fa-arrow-circle-up'); - //goTopBtn.attr('id', 'doco-return-to-top-btn'); - goTopBtn.attr('type', 'button'); - goTopBtn.attr('data-toggle', 'offcanvas'); - goTopBtn.addClass('navbar-toggle'); - goTopBtn.click(function() { $(window).scrollTop(0); }); }); function docoTocToggle() { diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index 0e8c8017c..f9fed1feb 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -1,27 +1,32 @@ <div class="widget"> -<script> -var noteSaveTimer = null; -$(document).on('focusout',"#note-text",function(e){ - if(noteSaveTimer) - clearTimeout(noteSaveTimer); - notePostFinal(); - noteSaveTimer = null; -}); + <h3>{{$banner}}</h3> + <textarea name="note_text" id="note-text">{{$text}}</textarea> + <script> + var noteSaveTimer = null; + var noteText = $('#note-text'); -$(document).on('focusin',"#note-text",function(e){ - noteSaveTimer = setTimeout(noteSaveChanges,10000); -}); + $(document).ready(function(){ + noteText.height(noteText[0].scrollHeight); + }); -function notePostFinal() { - $.post('notes/sync', { 'note_text' : $('#note-text').val() }); -} + $(document).on('focusout',"#note-text",function(e){ + if(noteSaveTimer) + clearTimeout(noteSaveTimer); + notePostFinal(); + noteSaveTimer = null; + }); -function noteSaveChanges() { - $.post('notes', { 'note_text' : $('#note-text').val() }); - noteSaveTimer = setTimeout(noteSaveChanges,10000); -} -</script> + $(document).on('focusin',"#note-text",function(e){ + noteSaveTimer = setTimeout(noteSaveChanges,10000); + }); -<h3>{{$banner}}</h3> -<textarea name="note_text" id="note-text">{{$text}}</textarea> + function notePostFinal() { + $.post('notes/sync', { 'note_text' : $('#note-text').val() }); + } + + function noteSaveChanges() { + $.post('notes', { 'note_text' : $('#note-text').val() }); + noteSaveTimer = setTimeout(noteSaveChanges,10000); + } + </script> </div> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 4638e4758..1b0b06132 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -84,28 +84,26 @@ {{$wikiModal}} <div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" 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 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 --> - <script> window.wiki_resource_id = '{{$resource_id}}'; window.wiki_page_name = '{{$page}}'; |