Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make error messages visible (trac #1294). 

ce4e860a introduced CSS `.alert{display:none;}` because alerts are
always included in `/signup/` and shown by JS. Use a new `.alert-hidden`
class for this purpose to avoid breaking other pages.

(imported from commit 199ba35dd3356bd4093aac2a54181331b3993ee8)
This commit is contained in:
Kevin Mehall 2013-06-10 16:14:20 -04:00 committed by Kevin Mehall
parent 10d63dff9a
commit da11e2e8df
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/zephyr/signup.html
View File

@ -20,18 +20,18 @@
<div class="row-fluid shaded-background landing-page-bottom"> <div class="row-fluid shaded-background landing-page-bottom">
<div class="content"> <div class="content">
<div class="span6 offset3" id="envelope-holder"> <div class="span6 offset3" id="envelope-holder">
<div id="success" class="alert alert-success alert-block"> <div id="success" class="alert alert-hidden alert-success alert-block">
<h4>Success!</h4> <h4>Success!</h4>
Thank you for your interest. We'll be in touch soon. Thank you for your interest. We'll be in touch soon.
While you wait, check out some of our <a href="/features">features</a>! While you wait, check out some of our <a href="/features">features</a>!
</div> </div>
<div id="error" class="alert alert-error alert-block"> <div id="error" class="alert alert-hidden alert-error alert-block">
<h4>Ruh-roh!</h4> <h4>Ruh-roh!</h4>
Hmmm, something went wrong. Please send email to <a href="mailto:support@humbughq.com">support@humbughq.com</a>. Hmmm, something went wrong. Please send email to <a href="mailto:support@humbughq.com">support@humbughq.com</a>.
</div> </div>
<div id="error-missing-email" class="alert alert-error alert-block"> <div id="error-missing-email" class="alert alert-hidden alert-error alert-block">
<h4>Your email is required!</h4> <h4>Your email is required!</h4>
How else would we be able to reach you? How else would we be able to reach you?
</div> </div>

2
zephyr/static/js/landing-page.js
View File

@ -23,7 +23,7 @@ $(function () {
$(".letter-form").ajaxForm({ $(".letter-form").ajaxForm({
dataType: 'json', // This seems to be ignored. We still get back an xhr. dataType: 'json', // This seems to be ignored. We still get back an xhr.
beforeSubmit: function (arr, form, options) { beforeSubmit: function (arr, form, options) {
$(".alert").hide(); $(".alert-hidden").hide();
var has_email = false; var has_email = false;
$.each(arr, function (idx, elt) { $.each(arr, function (idx, elt) {
if (elt.name === 'email' && elt.value.length) { if (elt.name === 'email' && elt.value.length) {

2
zephyr/static/styles/portico.css
View File

@ -308,6 +308,6 @@ img.screenshot{
} }
} }
.alert { .alert-hidden {
display: none; display: none;
} }