Browse Source

Fixing infinately added message bug for terms modal

pull/160/head
Charles Shin 8 years ago
parent
commit
0aca234c41
5 changed files with 10 additions and 4 deletions
  1. +2
    -1
      edivorce/apps/core/static/css/main.css
  2. +1
    -1
      edivorce/apps/core/static/css/main.css.map
  3. +4
    -0
      edivorce/apps/core/static/css/main.scss
  4. +2
    -1
      edivorce/apps/core/static/js/main.js
  5. +1
    -1
      edivorce/apps/core/templates/overview.html

+ 2
- 1
edivorce/apps/core/static/css/main.css
File diff suppressed because it is too large
View File


+ 1
- 1
edivorce/apps/core/static/css/main.css.map
File diff suppressed because it is too large
View File


+ 4
- 0
edivorce/apps/core/static/css/main.scss View File

@ -1437,6 +1437,10 @@ textarea {
border: 3px solid #a94442;
padding-top: 8px;
padding-left: 8px;
#terms_warning {
color: #a94442;
}
}
/* Modals */
.modal-dialog {


+ 2
- 1
edivorce/apps/core/static/js/main.js View File

@ -24,12 +24,13 @@ $(function () {
// Only close Terms and Conditions when user check the I agree checkbox
$('#terms_agree_button').on('click', function() {
$('#terms_warning').remove();
if ($('#terms_checkbox').is(':checked')) {
$('#terms_modal').modal('hide');
}
else {
// show warning box and warning message if user does not check the box and click aceept
$('#terms_and_conditions').addClass('has-warning-box').append('<span class="help-block">Please check the box</span>');
$('#terms_and_conditions').addClass('has-warning-box').append('<span id="terms_warning" class="help-block">Please check the box</span>');
}
});


+ 1
- 1
edivorce/apps/core/templates/overview.html View File

@ -114,7 +114,7 @@
</div>
</div>
</div>
{% elif request.session.FIRST_LOGIN and not request.session.VIEWED_DASHBOARD_DURING_SESSION %}
{% else %}
<div id="terms_modal" class="modal fade" tabindex="-1" role="dialog" data-backdrop="static">
<div class="modal-dialog" role="document">
<div class="modal-content">


Loading…
Cancel
Save