diff options
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rw-r--r-- | view/js/mod_events.js | 34 |
2 files changed, 9 insertions, 27 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 0af27c61b..511a7f815 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -60,7 +60,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "<div class='{0}' title='{4}'><img src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link); + return "<div class='{0}' title='{4}'><img class='dropdown-menu-img-sm' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link); } else return "<div>" + item.text + "</div>"; diff --git a/view/js/mod_events.js b/view/js/mod_events.js index 270bf798b..0b7b3d24c 100644 --- a/view/js/mod_events.js +++ b/view/js/mod_events.js @@ -2,33 +2,15 @@ * JavaScript for mod/events */ -$(document).ready( function() { showHideFinishDate(); }); +$(document).ready( function() { -function showHideFinishDate() { + enableDisableFinishDate(); + +}); + +function enableDisableFinishDate() { if( $('#id_nofinish').is(':checked')) - $('#event-finish-wrapper').hide(); + $('#id_finish_text').prop("disabled", true); 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'); - } - }); + $('#id_finish_text').prop("disabled", false); } -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'); - } - }); -}
\ No newline at end of file |