diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php index 9c9a8b7d4ddde99fe406f3dcdb6d874d4f17f89c..e6c0fdb36a4aa6268f89feb437c53e713d2ce350 100644 --- a/include/ajax.tickets.php +++ b/include/ajax.tickets.php @@ -682,7 +682,7 @@ class TicketsAjaxAPI extends AjaxController { 'title' => sprintf('Change user for ticket #%s', $ticket->getNumber()) ); - return self::_userlookup($user, $info); + return self::_userlookup($user, null, $info); } function _userlookup($user, $form, $info) { diff --git a/include/staff/templates/user-lookup.tmpl.php b/include/staff/templates/user-lookup.tmpl.php index eb93fab228e78baea30831ea74520402aa309d8f..caa80a41771c5b49ea7d0053bab58b100bca1179 100644 --- a/include/staff/templates/user-lookup.tmpl.php +++ b/include/staff/templates/user-lookup.tmpl.php @@ -89,14 +89,14 @@ $(function() { $('a#unselect-user').click( function(e) { e.preventDefault(); $('div#selected-user-info').hide(); - $('div#new-user-form').fadeIn(); + $('div#new-user-form').fadeIn({start: function(){ $('#user-search').focus(); }}); return false; }); $(document).on('click', 'form.user input.cancel', function (e) { e.preventDefault(); $('div#new-user-form').hide(); - $('div#selected-user-info').fadeIn(); + $('div#selected-user-info').fadeIn({start: function(){ $('#user-search').focus(); }}); return false; }); }); diff --git a/index.php b/index.php index 9a2ae35d32e47aee05ba40084ec256f840659c8e..cb24a560687e7e72c75e0235a386e4b368036f67 100644 --- a/index.php +++ b/index.php @@ -20,7 +20,7 @@ require(CLIENTINC_DIR.'header.inc.php'); <div id="landing_page"> <?php if($cfg && ($page = $cfg->getLandingPage())) - echo $page->getBody(); + echo $page->getBodyWithImages(); else echo '<h1>Welcome to the Support Center</h1>'; ?> diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js index baad02424fa5373f86a32a4c47bf8cc1f37a7844..0fed815da1831b9425a22d6f2702766e1ca81362 100644 --- a/js/redactor-osticket.js +++ b/js/redactor-osticket.js @@ -116,8 +116,7 @@ RedactorPlugins.draft = { self.opts.autosave = self.opts.original_autosave; } }); - }, - + } }; /* Redactor richtext init */ diff --git a/scp/js/scp.js b/scp/js/scp.js index 84a491479d8e6ff65dd63d5dcf952585606e4cf2..f7ebafcc2fcb2abd05be72f830bcb93222f2d199 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -293,7 +293,7 @@ $(document).ready(function(){ showButtonPanel: true, buttonImage: './images/cal.png', showOn:'both', - dateFormat: $.translate_format(c.date_format||'m/d/Y'), + dateFormat: $.translate_format(c.date_format||'m/d/Y') }); $(document).on('submit', 'form', function() { $('.dp', $(this)).each(function(i, e) { @@ -419,11 +419,14 @@ $(document).ready(function(){ }); }); - $.dialog = function (url, code, cb) { - + $.dialog = function (url, code, cb, options) { + options = options||{}; $('.dialog#popup .body').load(url, function () { $('#overlay').show(); - $('.dialog#popup').show(); + $('.dialog#popup').show({ + duration: 0, + complete: function() { if (options.onshow) options.onshow(); } + }); $(document).off('.dialog'); $(document).on('submit.dialog', '.dialog#popup form', function(e) { e.preventDefault(); @@ -451,12 +454,15 @@ $(document).ready(function(){ return false; }); }); + if (options.onload) { options.onload(); } }; $.userLookup = function (url, cb) { $.dialog(url, 201, function (resp) { var user = $.parseJSON(resp); if(cb) cb(user); + }, { + onshow: function() { $('#user-search').focus(); } }); };