projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1398204)
Modal dialog for the popup blocker warning
authorArt Cancro <ajc@citadel.org>
Tue, 30 Nov 2010 08:40:45 +0000 (03:40 -0500)
committerArt Cancro <ajc@citadel.org>
Tue, 30 Nov 2010 08:40:45 +0000 (03:40 -0500)
webcit/static/modal.js patch | blob | history
webcit/static/t/confirmlogoff.html patch | blob | history
webcit/static/t/paging/failed_hook.html patch | blob | history
webcit/static/wclib.js patch | blob | history

diff --git a/webcit/static/modal.js b/webcit/static/modal.js
index f12aed2252a13474c82c27c4acfce0915d128c03..45090b92c0cdfa3f3a3fbf81d40095272b3df30a 100644 (file)
--- a/webcit/static/modal.js
+++ b/webcit/static/modal.js
@@ -69,10 +69,12 @@ if ( isSafari ) {
 // need to do some special stuff to handle MSIE.
 
 
-var toggleModal = function () {
+var toggleModal = function (b) {
        
        html.className=modalShowing?'':'modal';
-       modalShowing = !modalShowing;
+
+       modalShowing = b;
+
        if (modalShowing) {
                dialog.focus();
        } else if (focusedElement) {
diff --git a/webcit/static/t/confirmlogoff.html b/webcit/static/t/confirmlogoff.html
index b7127abf5ab820d1797f41e01e4acc33017cad65..da5b4c534045506bcdaf2192efb0bfa46a6f631b 100644 (file)
--- a/webcit/static/t/confirmlogoff.html
+++ b/webcit/static/t/confirmlogoff.html
@@ -2,7 +2,7 @@
 <body>
 <center>
 <h1><a href="termquit"><img src="static/logoff_32x.gif" border="0">&nbsp;<?_("Log off")></a></h1>
-<h1><a href="javascript:toggleModal();"><img src="static/closewindow.gif" height="32" width="32" border="0">&nbsp;<?_("Cancel")></a></h1>
+<h1><a href="javascript:toggleModal(false);"><img src="static/closewindow.gif" height="32" width="32" border="0">&nbsp;<?_("Cancel")></a></h1>
 </center>
 </body>
 </html>
diff --git a/webcit/static/t/paging/failed_hook.html b/webcit/static/t/paging/failed_hook.html
index d814fcb6aa08c4c290b5c377dfafd661cb5ee867..46d983c3dda5307e5ecdf4a5fdd46b138f8f9ffc 100644 (file)
--- a/webcit/static/t/paging/failed_hook.html
+++ b/webcit/static/t/paging/failed_hook.html
@@ -1,5 +1,7 @@
 <script type="text/javascript">
 function PopUpFailed() {
- alert("<?_("You have one or more instant messages waiting, but the Citadel Instant Messenger window failed to open.  This is probably because you have a popup blocker installed.  Please configure your popup blocker to allow popups from this site if you wish to receive instant messages.")>");
+
+       $('md-content').innerHTML = "<div align='justify'><?_("You have one or more instant messages waiting, but the Citadel Instant Messenger window failed to open.  This is probably because you have a popup blocker installed.  Please configure your popup blocker to allow popups from this site if you wish to receive instant messages.")></div><br><br><div align='center'><h2><a href='javascript:toggleModal(false);'>OK</a></h2></div>";
+       toggleModal(true);
 }
 </script>
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 597fdd1bd0e33d80f54bb7e6c5e8fc4f85dffb19..9ec96b0e82646372ded960bbcdeb78af82fd4585 100644 (file)
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -870,7 +870,7 @@ function ConfirmLogoff() {
                 {
                         method: 'get',
                        onSuccess: function(cl_success) {
-                               toggleModal();
+                               toggleModal(true);
                        }
                 }
         );
Citadel server, clients, utilities