diff --git a/include/staff/templates/user-lookup.tmpl.php b/include/staff/templates/user-lookup.tmpl.php index 3e56def471dce072d56aea51546e006c45886f7d..de8dedb4e79b8d513dedf64c5134d6f1a579f783 100644 --- a/include/staff/templates/user-lookup.tmpl.php +++ b/include/staff/templates/user-lookup.tmpl.php @@ -34,7 +34,7 @@ if ($info['error']) { <table width="100%"> <?php if(!$form) $form = UserForm::getInstance(); - $form->render(true, 'New User Information'); ?> + $form->render(true, 'Create New User'); ?> </table> <hr> <p class="full-width"> diff --git a/include/staff/ticket-edit.inc.php b/include/staff/ticket-edit.inc.php index fa4b4069022d5453689d03820ba8479e4efa8b29..2ce26ddb5ca59d70d8ebc3539280a64a113315fa 100644 --- a/include/staff/ticket-edit.inc.php +++ b/include/staff/ticket-edit.inc.php @@ -32,8 +32,8 @@ if ($_POST) $.userLookup('ajax.php/tickets/<?php echo $ticket->getId(); ?>/change-user', function(user) { $('input#user_id').val(user.id); - $('#user_name').html(user.name); - $('#user_email').html('<'+user.email+'>'); + $('#client-name').html(user.name); + $('#client-email').html('<'+user.email+'>'); }); return false; "><i class="icon-edit"></i> Change</a> diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php index 6e7a76a96e75c282c7905c9efa704897de0ac91a..c4f6d2746a3b9e28fe6fed245f673c06cdf42bfc 100644 --- a/include/staff/ticket-open.inc.php +++ b/include/staff/ticket-open.inc.php @@ -26,11 +26,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); if ($user) { ?> <tr><td>Client:</td><td> <div id="client-info"> + <input type="hidden" name="uid" id="uid" value="<?php echo $user->getId(); ?>" /> <span id="client-name"><?php echo $user->getName(); ?></span> <span id="client-email"><<?php echo $user->getEmail(); ?>></span> <a class="action-button" style="float:none;overflow:inherit" href="#" onclick="javascript: - $.userLookup('ajax.php/users/select/<?php echo $user->getId(); ?>', + $.userLookup('ajax.php/users/select/'+$('input#uid').val(), function(user) { $('input#uid').val(user.id); $('#client-name').html(user.name); @@ -38,7 +39,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info); }); return false; "><i class="icon-edit"></i> Change</a> - <input type="hidden" name="uid" id="uid" value="<?php echo $user->getId(); ?>" /> </div> </td></tr> <?php diff --git a/scp/css/scp.css b/scp/css/scp.css index df51fade9ea67df53ceceb52fbf9136debb4b4cc..1ed00d4dbb4fe6bf044bc506268ef787e4cac89f 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -1264,7 +1264,7 @@ time { box-shadow: 0 5px 60px #001; border-radius: 5px; max-height: 72%; - overflow-y: scroll; + overflow-y: auto; } .redactor_air { @@ -1402,6 +1402,7 @@ time { } .dialog input[type=submit]:hover, .dialog input[type=submit]:active, +.dialog input[type=button]:hover, .dialog input[type=button]:active, .dialog input[type=reset]:hover, .dialog input[type=reset]:active { background-position:bottom left; }