diff --git a/edivorce/apps/core/static/css/main.scss b/edivorce/apps/core/static/css/main.scss index 83b3cb9d..d3dc2d26 100644 --- a/edivorce/apps/core/static/css/main.scss +++ b/edivorce/apps/core/static/css/main.scss @@ -804,6 +804,7 @@ fieldset[disabled] .btn-radio:hover { outline: none; } + .btn-radio-long { width: auto; white-space: normal; diff --git a/edivorce/apps/core/static/js/functions.js b/edivorce/apps/core/static/js/functions.js index 31f70cdc..2ded45e7 100644 --- a/edivorce/apps/core/static/js/functions.js +++ b/edivorce/apps/core/static/js/functions.js @@ -341,8 +341,13 @@ var getValue = function(el, question){ } }); return JSON.stringify(value); - } - else{ + } else if (el.is("input[type=radio]")) { + if (el.prop('checked')) { + return el.val(); + } else { + return ''; + } + } else { return el.val(); } }; diff --git a/edivorce/apps/core/static/js/signing-filing.js b/edivorce/apps/core/static/js/signing-filing.js new file mode 100644 index 00000000..8dc885d2 --- /dev/null +++ b/edivorce/apps/core/static/js/signing-filing.js @@ -0,0 +1,97 @@ +$(window).load(function () { + function setSignSeparatelyDefaults() { + $("#sign-in-person-both").prop('checked', false); + $("#sign-virtual-both").prop('checked', false); + $("#sign-virtual-both").trigger('change'); + if ($("input:radio[name='signing_location_you']:checked").length === 0) { + $("#sign-in-person-you").prop('checked', true).trigger('change'); + } + if ($("input:radio[name='signing_location_spouse']:checked").length === 0) { + $("#sign-in-person-spouse").prop('checked', true).trigger('change'); + } + } + + function setSignTogetherDefaults() { + $("#sign-in-person-you").prop('checked', false); + $("#sign-virtual-you").prop('checked', false).trigger('change'); + $("#sign-in-person-spouse").prop('checked', false); + $("#sign-virtual-spouse").prop('checked', false).trigger('change'); + if ($("input:radio[name='signing_location']:checked").length === 0) { + $("#sign-in-person-both").prop('checked', true).trigger('change'); + } + } + + function toggleSigningLocation() { + if ($("#file-online").prop('checked')) { + $("#signing-location").show(); + + if ($("#sign-together").prop('checked')) { + setSignTogetherDefaults(); + $("#signing-location-together").show(); + $("#signing-location-separately").hide(); + } else if ($("#sign-separately").prop('checked')) { + setSignSeparatelyDefaults(); + $("#signing-location-together").hide(); + $("#signing-location-separately").show(); + } + } else { + $("#signing-location").hide(); + $("#signing-location-together").hide(); + $("#signing-location-separately").hide(); + setSignTogetherDefaults(); + setSignSeparatelyDefaults(); + } + } + + function toggleSignVirtually() { + if ($("#sign-virtual-both").prop('checked') || $("#sign-virtual-you").prop('checked') || $("#sign-virtual-spouse").prop('checked')) { + $("#sign-virtually").show(); + } else { + $("#sign-virtually").hide(); + } + if ($("#sign-virtual-both").prop('checked') || $("#sign-virtual-you").prop('checked')) { + $("#email-you").show(); + } else { + $("#email-you").hide(); + } + if ($("#sign-virtual-spouse").prop('checked')) { + $("#email-spouse").show(); + } else { + $("#email-spouse").hide(); + } + } + + function toggleFileInPerson() { + if ($("#file-in-person").prop('checked')) { + $("#sign-in-person").show(); + $("#signing-location").hide(); + } else if ($("#file-online").prop('checked')) { + $("#sign-in-person").hide(); + $("#signing-location").show(); + } + } + + function selectDefaults() { + if ($("input:radio[name='how_to_sign']:checked").length === 0) { + $("#sign-together").prop('checked', true).trigger('change'); + } + if ($("input:radio[name='how_to_file']:checked").length === 0) { + $("#file-online").prop('checked', true).trigger('change'); + } + } + + selectDefaults() + + $("#sign-separately, #sign-together, #file-online, #file-in-person").change(toggleSigningLocation); + $("#sign-virtual-both, " + + "#sign-in-person-both, " + + "#sign-virtual-you, " + + "#sign-in-person-you, " + + "#sign-in-person-spouse, " + + "#sign-virtual-spouse").change(toggleSignVirtually); + $("#file-in-person, #file-online").change(toggleFileInPerson); + + toggleSigningLocation(); + toggleSignVirtually(); + toggleFileInPerson(); +}); \ No newline at end of file diff --git a/edivorce/apps/core/templates/base.html b/edivorce/apps/core/templates/base.html index 96f609df..52f5b8bd 100644 --- a/edivorce/apps/core/templates/base.html +++ b/edivorce/apps/core/templates/base.html @@ -116,14 +116,14 @@ - {% block sidebar %} -
- {% endblock %} +{# {% block sidebar %}#} +{# #} +{# {% endblock %}#} @@ -215,6 +215,7 @@ + {% endcompress %}