From 11c19a2da935da903cc71c16388c177353a5fa32 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 14 Dec 2012 12:40:36 -0500
Subject: [PATCH] Float popup dialog on scroll Add overlay + please wait
spinner on form submit
---
include/staff/footer.inc.php | 4 ++++
include/upgrader/upgrade.inc.php | 2 +-
scp/css/scp.css | 26 +++++++++++++++++++++++---
scp/emailtest.php | 2 +-
scp/images/FhHRx-Spinner.gif | Bin 0 -> 2608 bytes
scp/js/scp.js | 22 +++++++++++++++++-----
scp/js/upgrader.js | 2 +-
7 files changed, 47 insertions(+), 11 deletions(-)
create mode 100644 scp/images/FhHRx-Spinner.gif
diff --git a/include/staff/footer.inc.php b/include/staff/footer.inc.php
index d789c1447..90373479f 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/upgrader/upgrade.inc.php b/include/upgrader/upgrade.inc.php
index 7c8a8aae4..fae6947d9 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 67e621251..c345799ba 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 0ca1d7308..b39e5c7ed 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
GIT binary patch
literal 2608
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
Xkl*Zq4U--AirZwbxJ^s{qgU%+zl^Ou
literal 0
HcmV?d00001
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 71d0e69a8..cf32e42d8 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 09bde7766..8fe378193 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;
--
GitLab