diff --git a/include/staff/footer.inc.php b/include/staff/footer.inc.php
index d789c14474ef63caf5c06f61d60cdfb6df881bcc..90373479f3b1270bc0375826953a92c6657db403 100644
--- a/include/staff/footer.inc.php
+++ b/include/staff/footer.inc.php
@@ -13,5 +13,9 @@ if(is_object($thisstaff) && $thisstaff->isStaff()) { ?>
} ?>
</div>
<div id="overlay"></div>
+<div id="loading">
+ <h4>Please Wait!</h4>
+ <p>Please wait... it will take a second!</p>
+</div>
</body>
</html>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index e42075e4c385129823323b0aff82568b5bd8df9f..d6fab690cdcd76cc9a8c7dd9e590a6c60231a6b4 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -307,7 +307,7 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting..
<a class="refresh" href="<?php echo $_SERVER['REQUEST_URI']; ?>">Refresh</a>
<input type="hidden" name="a" value="mass_process" >
<input type="hidden" name="do" id="action" value="" >
- <input type="hidden" name="status" value="<?php echo $status; ?>" >
+ <input type="hidden" name="status" value="<?php echo $_REQUEST['status']; ?>" >
<table class="list" border="0" cellspacing="1" cellpadding="2" width="940">
<caption><?php echo $showing; ?> <?php echo $results_type; ?></caption>
<thead>
@@ -473,6 +473,11 @@ $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting..
<input class="button" type="submit" name="close" value="Close">
<?php
break;
+ case 'overdue':
+ ?>
+ <input class="button" type="submit" name="close" value="Close">
+ <?php
+ break;
default: //search??
?>
<input class="button" type="submit" name="close" value="Close" >
diff --git a/include/upgrader/upgrade.inc.php b/include/upgrader/upgrade.inc.php
index 7c8a8aae47e692d9337a51c46a46f2114c4a2848..fae6947d94849c6cfbd4a7df849df708e470f1de 100644
--- a/include/upgrader/upgrade.inc.php
+++ b/include/upgrader/upgrade.inc.php
@@ -32,7 +32,7 @@ $action=$upgrader->getNextAction();
<p>3. We can help, feel free to <a href="http://osticket.com/support/" target="_blank">contact us </a> for professional help.</p>
</div>
<div class="clear"></div>
- <div id="loading">
+ <div id="upgrading">
<h4><?php echo $action; ?></h4>
Please wait... while we upgrade your osTicket installation!
<div id="msg" style="font-weight: bold;padding-top:10px;">Smile!</div>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 67e6212512c0bf617d934fbf1feabd369784fd80..c345799ba2ecf80fe23df6ab589ed6f74a0dadde 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1373,8 +1373,28 @@ ul.progress li.no small {color:red;}
#bar.error { background: #ffd; text-align: center; color: #a00; font-weight: bold; }
/* Overlay */
-#overlay { display: none; position: fixed; background: #000; z-index: 1000; }
+#overlay {
+ display: none;
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: #000;
+ z-index: 1000;
+ -webkit-transform: translate3d(0,0,0);
+}
+
+#loading, #upgrading {
+ border:1px solid #2a67ac;
+ padding: 10px 10px 10px 60px;
+ width: 300px;
+ height: 100px;
+ background: rgb( 255, 255, 255) url('../images/FhHRx-Spinner.gif') 10px 50% no-repeat;
+ position: fixed;
+ display: none;
+ z-index: 3000;
+}
-#loading { padding: 10px 10px 10px 60px; width: 300px; height: 100px; background: url('../images/ajax-loader.gif?1312925608') 10px 50% no-repeat white; position: fixed; display: none; z-index: 3000; }
-#loading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; }
+#loading h4, #upgrading h4 { margin: 3px 0 0 0; padding: 0; color: #d80; }
diff --git a/scp/emailtest.php b/scp/emailtest.php
index 0ca1d7308cc8c62f0f9852a57f45d4e8802e805a..b39e5c7edaf82004217ad39f6c9bf8fe6b99e995 100644
--- a/scp/emailtest.php
+++ b/scp/emailtest.php
@@ -47,7 +47,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
$nav->setTabActive('emails');
require(STAFFINC_DIR.'header.inc.php');
?>
-<form action="emailtest.php" method="post" id="emailtest">
+<form action="emailtest.php" method="post" id="save">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="<?php echo $action; ?>">
<h2>Test Outgoing Email</h2>
diff --git a/scp/images/FhHRx-Spinner.gif b/scp/images/FhHRx-Spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..574b1d4a161707c6c7f0ba9d2bc531bead4a3028
Binary files /dev/null and b/scp/images/FhHRx-Spinner.gif differ
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 71d0e69a823e0869f38ec3e9a5562bec296a7baa..cf32e42d8b638ff1b465cb23eb9a196e72be31ba 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -103,6 +103,14 @@ $(document).ready(function(){
return false;
});
+ $(window).scroll(function () {
+
+ $('.dialog').css({
+ top : (($(this).height() /5)+$(this).scrollTop()),
+ left : ($(this).width() / 2 - 300)
+ });
+ });
+
if($.browser.msie) {
$('.inactive').mouseenter(function() {
var elem = $(this);
@@ -137,9 +145,9 @@ $(document).ready(function(){
}
});
- $('form#save').submit(function() {
+ $('form#save, form:has(table.list)').submit(function() {
$(window).unbind('beforeunload');
-
+ $('#overlay, #loading').show();
return true;
});
@@ -316,9 +324,7 @@ $(document).ready(function(){
$('#overlay').css({
opacity : 0.3,
top : 0,
- left : 0,
- width : $(window).width(),
- height : $(window).height()
+ left : 0
});
//Dialog
@@ -341,6 +347,12 @@ $(document).ready(function(){
left : ($(window).width() / 2 - 300)
});
+ /* loading ... */
+ $("#loading").css({
+ top : ($(window).height() / 3),
+ left : ($(window).width() / 2 - 160)
+ });
+
$('#go-advanced').click(function(e) {
e.preventDefault();
$('#result-count').html('');
diff --git a/scp/js/upgrader.js b/scp/js/upgrader.js
index 09bde7766c6f39e9f95e0b50ccf3c0efc3bbb2fb..8fe378193842494d7bed4df290828e05e091a263 100644
--- a/scp/js/upgrader.js
+++ b/scp/js/upgrader.js
@@ -17,7 +17,7 @@ jQuery(function($) {
e.preventDefault();
var form = $(this);
$('input[type=submit]', this).attr('disabled', 'disabled');
- $('#overlay, #loading').show();
+ $('#overlay, #upgrading').show();
doTasks('upgrade.php',form.serialize());
return false;