diff options
| author | friendica <info@friendica.com> | 2014-09-06 00:37:15 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-06 00:37:15 -0700 |
| commit | 28b75b028dcb1633a9407a5a5c79e5d2423e18a5 (patch) | |
| tree | 7d7e061cd6fb3c1c92ecdf086c668e500f4e93b1 /view | |
| parent | 7a9b1c4a77f279b04fa710df25aa289d7b2b47c1 (diff) | |
| download | volse-hubzilla-28b75b028dcb1633a9407a5a5c79e5d2423e18a5.tar.gz volse-hubzilla-28b75b028dcb1633a9407a5a5c79e5d2423e18a5.tar.bz2 volse-hubzilla-28b75b028dcb1633a9407a5a5c79e5d2423e18a5.zip | |
ajax work
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/js/mod_events.js | 37 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photosajax.tpl | 4 |
4 files changed, 45 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index b5b77d473..c31e6231a 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -689,7 +689,7 @@ function updateConvItems(mode,data) { bParam_page = 1; } - update_url = baseurl + '/directory/?f=&aj=1&page=' + bParam_page; + update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ; $("#page-spinner").spin('small'); update_mode = 'append'; diff --git a/view/js/mod_events.js b/view/js/mod_events.js new file mode 100644 index 000000000..0ce128fcc --- /dev/null +++ b/view/js/mod_events.js @@ -0,0 +1,37 @@ + +$(document).ready( function() { showHideFinishDate(); }); + +function showHideFinishDate() { + if( $('#event-nofinish-checkbox').is(':checked')) + $('#event-finish-wrapper').hide(); + else + $('#event-finish-wrapper').show(); +} + + + + function eventGetStart() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#startModal').modal(); + $('#start-modal-OKButton').on('click', function() { + reply=$('#start-date').val(); + if(reply && reply.length) { + $('#start-text').val(reply); + $('#startModal').modal('hide'); + } + }) + + + } + function eventGetFinish() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#finishModal').modal(); + $('#finish-modal-OKButton').on('click', function() { + reply=$('#finish-date').val(); + if(reply && reply.length) { + $('#finish-text').val(reply); + $('#finishModal').modal('hide'); + } + }) + + } diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 43a22a017..9be1b12a7 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -7,5 +7,8 @@ {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} +<div id="page-end"></div> </div> <div class="photos-end"></div> +<script>$(document).ready(function() { loadingPage = false;});</script> +<div id="page-spinner"></div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl new file mode 100755 index 000000000..a88682e8b --- /dev/null +++ b/view/tpl/photosajax.tpl @@ -0,0 +1,4 @@ +<!-- --> +{{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} +{{/foreach}} |