From 12d245457c0c26fb96b0f23494892341fda3a449 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Fri, 12 Aug 2011 14:16:04 -0700
Subject: [PATCH] Correctly showing the critical error screen.
close #158.
---
.../static/dialog/controllers/page_controller.js | 12 ++++++------
browserid/static/dialog/views/body.ejs | 5 +++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/browserid/static/dialog/controllers/page_controller.js b/browserid/static/dialog/controllers/page_controller.js
index a1b6f0937..523a28921 100644
--- a/browserid/static/dialog/controllers/page_controller.js
+++ b/browserid/static/dialog/controllers/page_controller.js
@@ -106,15 +106,15 @@
},
runErrorDialog: function(info) {
- $(".dialog").hide();
+ $("#dialog").hide();
- $("#error_dialog div.title").text(info.message);
- $("#error_dialog div.content").text(info.description);
+ $("#error_dialog .title").text(info.message);
+ $("#error_dialog .content").text(info.description);
$("#back").hide();
- $("#cancel").hide();
- $("#submit").show().unbind("click").click(function() {
- }).text("Close");
+ $("input[type=submit]").hide();
+
+ $("#cancel").text("Close").addClass("action");
$("#error_dialog").fadeIn(500);
},
diff --git a/browserid/static/dialog/views/body.ejs b/browserid/static/dialog/views/body.ejs
index 813ccae98..c93e3a49c 100644
--- a/browserid/static/dialog/views/body.ejs
+++ b/browserid/static/dialog/views/body.ejs
@@ -10,6 +10,11 @@
<div id="dialog" class="dialog">
</div>
+ <div id="error_dialog">
+ <h3 class="title"></h3>
+ <p class="content"></p>
+ </div>
+
<div id="bottom-bar">
</div>
</form>
--
GitLab