Added hide button on reconnect dialog (Fixes ether#203)

redhog · May 16, 2011 · c409163 · c409163
1 parent 5dbcea7
commit c409163
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css
@@ -596,8 +596,10 @@ table#otheruserstable { display: none; }
 .cboxdisconnected_initsocketfail #connectionboxinner #reconnect_advise,
 .cboxdisconnected_looping #connectionboxinner #reconnect_advise,
 .cboxdisconnected_slowcommit #connectionboxinner #reconnect_advise,
-.cboxdisconnected_unknown #connectionboxinner #reconnect_advise { display: block; }
+.cboxdisconnected_unknown #connectionboxinner #reconnect_advise { display: block; } 
+.cboxdisconnected_unknown #connectionboxinner #offline_notification { display: block; } 
 .cboxdisconnected div#reconnect_form { display: block; }
+.cboxdisconnected div#hide_dialog{ display: block; }
 .cboxdisconnected .disconnected h2 { display: none; }
 .cboxdisconnected .disconnected .h2_disconnect { display: block; }
 .cboxdisconnected_userdup .disconnected h2.h2_disconnect { display: none; }
@@ -643,6 +645,10 @@ table#otheruserstable { display: none; }
   font-size: 12pt;
 }
 
+#hide_dialog button {
+  font-size: 12pt;
+}
+
 /* We give docbar a higher z-index than its descendant impexp-wrapper in
    order to allow the Import/Export panel to be on top of stuff lower
    down on the page in IE.  Strange but it works! */

diff --git a/etherpad/src/static/js/pad_connectionstatus.js b/etherpad/src/static/js/pad_connectionstatus.js
@@ -22,6 +22,12 @@ var padconnectionstatus = (function() {
     init: function() {
       $('button#forcereconnect').click(function() {
         pad.forceReconnect();
+      }
+	  );
+      $('button#hidedialog').click(function() {
+        padmodals.dismissModal();
+//	This changes name from Etherpad 1.1 to Etherpad 1.1 (Offline) 
+	document.getElementById('topbarBrand').innerHTML = document.getElementById('topbarBrand').innerHTML + " (Offline)";
       });
     },
     connected: function() {
@@ -50,4 +56,4 @@ var padconnectionstatus = (function() {
     getStatus: function() { return status; }
   };
   return self;
-}());
+}());
diff --git a/etherpad/src/static/js/pad_modals.js b/etherpad/src/static/js/pad_modals.js
@@ -169,6 +169,10 @@ var padmodals = (function() {
       $(".modaldialog").animate({'opacity': 0}, duration, function () { $("#modaloverlay").hide(); });
       $("#modaloverlay").animate({'opacity': 0}, duration, function () { $("#modaloverlay").hide(); });
     },
+    dismissModal: function() {
+      $(".modaldialog").hide();
+      $("#modaloverlay").hide();
+    },
     hideFeedbackLaterIfNoOtherInteraction: function() {
       return padutils.getCancellableAction('hide-feedbackbox',
                                            function() {

diff --git a/etherpad/src/themes/default/templates/pad/pad_body2.ejs b/etherpad/src/themes/default/templates/pad/pad_body2.ejs
@@ -445,6 +445,11 @@ limitations under the License. */ %>
 	  <div id="reconnect_form">
 	    <button id="forcereconnect">Reconnect Now</button>
 	  </div>
+	  <div id="offline_notification">
+	    <p>Or just hide this dialog and review document.</p>
+	  <div id="hide_dialog">
+	    <button id="hidedialog">Hide</button>
+	  </div>
 	</div>
       </div>
     </div>