diff --git a/browserid/static/dialog/controllers/dialog_controller.js b/browserid/static/dialog/controllers/dialog_controller.js index dc1b0923681c4f35a9fc769bcc014d2863c1eedd..488577cfb055a7e00242c17a45aaca647fb4a8fc 100644 --- a/browserid/static/dialog/controllers/dialog_controller.js +++ b/browserid/static/dialog/controllers/dialog_controller.js @@ -44,8 +44,6 @@ PageController.extend("Dialog", {}, { init: function(el) { - var html = $.View("//dialog/views/body.ejs", {}); - this.element.html(html); this.element.show(); // keep track of where we are and what we do on success and error diff --git a/browserid/static/dialog/views/body.ejs b/browserid/static/dialog/views/body.ejs deleted file mode 100644 index 52e240068c805042271183cb1a2efd1f01ad4dea..0000000000000000000000000000000000000000 --- a/browserid/static/dialog/views/body.ejs +++ /dev/null @@ -1,43 +0,0 @@ -<div id="wrapper"> - <header id="header" class="cf"> - <ul> - <li><a class="home" target="_blank" href="/"></a></li> - </ul> - </header> - - <div id="formWrap" class="cf"> - <form novalidate> - <div id="dialog" class="dialog cf"> - </div> - - <div id="error_dialog"> - <h3 class="title"></h3> - <p class="content"></p> - </div> - - </form> - </div> - - <footer> - <ul class="cf"> - <li>By <a href="http://mozillalabs.com">Mozilla Labs</a></li> - - <li>—</li> - <li><a href="#">Privacy</a></li> - <li><a href="#">TOS</a></li> - </ul> - - <div class="learn"> - BrowserID is the fast and secure way to sign in — <a target="_blank" href="/about">learn more</a> - </div> - - <a class="help" href="http://support.mozilla.com/en-US/home" target="_blank">need help?</a> - </footer> - -</div> - -<script type="text/html" id="templateTooltip"> - <div class="tooltip"> - {{ contents }} - </div> -</script> diff --git a/browserid/views/dialog.ejs b/browserid/views/dialog.ejs index 8f6827e02edfaad4fb48792263f8bc0fa1b55258..a8a693c196d6d610b8c03949faba7806acc99fef 100644 --- a/browserid/views/dialog.ejs +++ b/browserid/views/dialog.ejs @@ -4,13 +4,58 @@ <meta charset="utf-8"> <meta name="viewport" content="initial-scale=1.0; maximum-scale=1.0; width=device-width;"> <!--[if lt IE 9]> - <script src="/js/html5shim.js"></script> + <script type="text/javascript" src="/js/html5shim.js"></script> <![endif]--> - <link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic' rel='stylesheet' type='text/css'> + <link href="https://fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic" rel="stylesheet" type="text/css"> <title>Browser ID</title> </head> <body> + <div id="wrapper"> + <header id="header" class="cf"> + <ul> + <li><a class="home" target="_blank" href="/"></a></li> + </ul> + </header> + + <div id="formWrap" class="cf"> + <form novalidate> + + <div id="dialog" class="dialog cf"> + + </div> + + <div id="error_dialog"> + <h3 class="title"></h3> + <p class="content"></p> + </div> + + </form> + </div> + + <footer> + <ul class="cf"> + <li>By <a href="http://mozillalabs.com">Mozilla Labs</a></li> + + <li>—</li> + <li><a href="#">Privacy</a></li> + <li><a href="#">TOS</a></li> + </ul> + + <div class="learn"> + BrowserID is the fast and secure way to sign in — <a target="_blank" href="/about">learn more</a> + </div> + + <a class="help" href="http://support.mozilla.com/en-US/home" target="_blank">need help?</a> + </footer> + + </div> + + <script type="text/html" id="templateTooltip"> + <div class="tooltip"> + {{ contents }} + </div> + </script> + <script type="text/javascript" src="/vepbundle"></script> + <script type="text/javascript" src="steal/steal<%= production ? '.production' : '' %>.js?dialog"></script> </body> </html> -<script type='text/javascript' src='/vepbundle'></script> -<script type='text/javascript' src='steal/steal<%= production ? ".production" : "" %>.js?dialog'></script>