diff --git a/edivorce/apps/core/static/css/bootstrap-slim.min.css b/edivorce/apps/core/static/css/bootstrap-slim.min.css new file mode 100755 index 00000000..bfa37ad3 --- /dev/null +++ b/edivorce/apps/core/static/css/bootstrap-slim.min.css @@ -0,0 +1,14 @@ +/*! + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2017 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/*! + * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=c10632e7641ea7170f89e912c0e53180) + * Config saved to config.json and https://gist.github.com/c10632e7641ea7170f89e912c0e53180 + *//*! + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role="button"]{cursor:pointer}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#777}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}mark,.mark{background-color:#fcf8e3;padding:.2em}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover,a.text-primary:focus{color:#286090}.text-success{color:#3c763d}a.text-success:hover,a.text-success:focus{color:#2b542c}.text-info{color:#31708f}a.text-info:hover,a.text-info:focus{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover,a.text-warning:focus{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover,a.text-danger:focus{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover,a.bg-primary:focus{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover,a.bg-success:focus{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover,a.bg-info:focus{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover,a.bg-warning:focus{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover,a.bg-danger:focus{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*="col-"]{position:static;float:none;display:table-column}table td[class*="col-"],table th[class*="col-"]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}.table-responsive{overflow-x:auto;min-height:0.01%}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}.clearfix:before,.clearfix:after,.dl-horizontal dd:before,.dl-horizontal dd:after{content:" ";display:table}.clearfix:after,.dl-horizontal dd:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important}.affix{position:fixed} \ No newline at end of file diff --git a/edivorce/apps/core/static/css/main.scss b/edivorce/apps/core/static/css/main.scss index 2798ba09..0ad20203 100644 --- a/edivorce/apps/core/static/css/main.scss +++ b/edivorce/apps/core/static/css/main.scss @@ -392,6 +392,13 @@ input { } } +#form_navigation { + display: flex; + form { + margin-right: 10px; + } +} + #more_information { position: absolute; top: 191px; diff --git a/edivorce/apps/core/static/css/weasyprint.css b/edivorce/apps/core/static/css/weasyprint.css index b87f3543..aaeddaa9 100644 --- a/edivorce/apps/core/static/css/weasyprint.css +++ b/edivorce/apps/core/static/css/weasyprint.css @@ -1,3 +1,34 @@ +/*** Slimmed down Font-Awesome icons, thanks to http://fontello.com ***/ +@font-face { + font-family: 'fa-slim'; + src: url('../fonts/fa-slim.eot?98608185'); + src: url('../fonts/fa-slim.eot?98608185#iefix') format('embedded-opentype'), + url('../fonts/fa-slim.woff?98608185') format('woff'), + url('../fonts/fa-slim.ttf?98608185') format('truetype'), + url('../fonts/fa-slim.svg?98608185#fontello') format('svg'); + font-weight: normal; + font-style: normal; +} + +.fa { + font-family: "fa-slim"; + font-style: normal; + font-weight: normal; + speak: none; + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + font-variant: normal; + text-transform: none; + line-height: 1em; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +/*** end font awesome ***/ + @media screen { .print-wrapper { font-size: 15px; @@ -66,4 +97,5 @@ i.fa { .table-fixed { table-layout: fixed; -} \ No newline at end of file +} + diff --git a/edivorce/apps/core/static/fonts/fa-slim.eot b/edivorce/apps/core/static/fonts/fa-slim.eot new file mode 100755 index 00000000..867b40ec Binary files /dev/null and b/edivorce/apps/core/static/fonts/fa-slim.eot differ diff --git a/edivorce/apps/core/static/fonts/fa-slim.svg b/edivorce/apps/core/static/fonts/fa-slim.svg new file mode 100755 index 00000000..f43116d6 --- /dev/null +++ b/edivorce/apps/core/static/fonts/fa-slim.svg @@ -0,0 +1,14 @@ + + + +Copyright (C) 2017 by original authors @ fontello.com + + + + + + + + + + \ No newline at end of file diff --git a/edivorce/apps/core/static/fonts/fa-slim.ttf b/edivorce/apps/core/static/fonts/fa-slim.ttf new file mode 100755 index 00000000..0cc7f08e Binary files /dev/null and b/edivorce/apps/core/static/fonts/fa-slim.ttf differ diff --git a/edivorce/apps/core/static/fonts/fa-slim.woff b/edivorce/apps/core/static/fonts/fa-slim.woff new file mode 100755 index 00000000..522258a7 Binary files /dev/null and b/edivorce/apps/core/static/fonts/fa-slim.woff differ diff --git a/edivorce/apps/core/static/fonts/fa-slim.woff2 b/edivorce/apps/core/static/fonts/fa-slim.woff2 new file mode 100755 index 00000000..869cae07 Binary files /dev/null and b/edivorce/apps/core/static/fonts/fa-slim.woff2 differ diff --git a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.eot b/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.eot deleted file mode 100644 index b93a4953..00000000 Binary files a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.eot and /dev/null differ diff --git a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.svg b/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.svg deleted file mode 100644 index 94fb5490..00000000 --- a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.svg +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.ttf b/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc60..00000000 Binary files a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.woff b/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.woff deleted file mode 100644 index 9e612858..00000000 Binary files a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.woff2 b/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b54..00000000 Binary files a/edivorce/apps/core/static/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index 357556c4..a20d621b 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -11,8 +11,7 @@ - - + @@ -49,23 +48,23 @@ Claimant 1 and Claimant 2: - began to live together in a marriage-like relationship on [dd/mm/yyyy] + {% endif %} began to live together in a marriage-like relationship on [dd/mm/yyyy] {% if responses.when_were_you_live_married_like %} {{ responses.when_were_you_live_married_like }} {% else %}   {% endif %} - were married on [dd/mm/yyyy] + {% else %} icon-check-empty"> {% endif %} were married on [dd/mm/yyyy] {% if responses.when_were_you_married %} {{ responses.when_were_you_married }} {% else %}   {% endif %} - separated on + {% else %} icon-check-empty"> {% endif %} separated on {% if responses.separation_date %} {{ responses.separation_date }} {% else %}   [dd/mmm/yyyy]{% endif %} - were divorced from each other by order made on [dd/mm/yyyy] + were divorced from each other by order made on [dd/mm/yyyy]   - were never married + were never married @@ -76,7 +75,7 @@ - + @@ -115,14 +114,14 @@ @@ -141,16 +140,16 @@ - + - + - + @@ -160,12 +159,12 @@ - - +
Claimant 1 and Claimant 2 are asking for a divorce order. Claimant 1 and Claimant 2 are asking for a divorce order.
A Personal information:
Marital status immediately before marriage: -

never married

-

divorced

-

widowed

+

{% else %} icon-check-empty"> {% endif %} never married

+

{% else %} icon-check-empty"> {% endif %} divorced

+

{% else %} icon-check-empty"> {% endif %} widowed

-

never married

-

divorced

-

widowed

+

{% else %} icon-check-empty"> {% endif %} never married

+

{% else %} icon-check-empty"> {% endif %} divorced

+

{% else %} icon-check-empty"> {% endif %} widowed

B Grounds for claim for divorce:
[If divorce is claimed as a result of having lived separate and apart, complete paragraph (i).]
(i) Claimant 1 and Claimant 2 have lived separate and apart since {% if responses.separation_date %} {{ responses.separation_date }} {% else %}   [dd/mm/yyyy]{% endif %} (i) {% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 have lived separate and apart since {% if responses.separation_date %} {{ responses.separation_date }} {% else %}   [dd/mm/yyyy]{% endif %}
AND
[Check whichever one of the following boxes is correct and complete any required information.]
Claimant 1 and Claimant 2 have not lived together since then {% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 have not lived together since then
Claimant 1 and Claimant 2 have lived together again during the following period(s), in an unsuccessful attempt to reconcile: [give dates of period(s)] {% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 have lived together again during the following period(s), in an unsuccessful attempt to reconcile: [give dates of period(s)]

From:  

From:  

From:  

[If divorce is claimed on grounds other than having lived separate and apart, complete paragraph (ii) by checking both of the following boxes and completing the required information.]
(ii) Other grounds , under section 8 (2) (b) of the Divorce Act (Canada):   + (ii) Other grounds , under section 8 (2) (b) of the Divorce Act (Canada):  

[state the grounds]

AND
There has been no condonation of any act relied on under section 8 (2) (b) of the Divorce Act (Canada) as a ground for divorce.
AND
There has been no condonation of any act relied on under section 8 (2) (b) of the Divorce Act (Canada) as a ground for divorce.
@@ -175,10 +174,10 @@ C Claimant 1 and Claimant 2 confirm that: [Check both of the following boxes.] - There is no possibility of reconciliation. + {% else %} icon-check-empty"> {% endif %} There is no possibility of reconciliation. - There has been no collusion, as defined in section 11 (4) of the Divorce Act (Canada), in relation to this claim for divorce. + {% else %} icon-check-empty"> {% endif %} There has been no collusion, as defined in section 11 (4) of the Divorce Act (Canada), in relation to this claim for divorce. @@ -188,17 +187,17 @@ D Proof of marriage:
[Check whichever one of the following boxes is correct and complete any required information.] - A certificate of marriage or registration of marriage has been filed. + {% else %} icon-check-empty"> {% endif %} A certificate of marriage or registration of marriage has been filed. - A certificate of marriage or registration of marriage is not being filed with this notice of joint family claim because + {% else %} icon-check-empty"> {% endif %} A certificate of marriage or registration of marriage is not being filed with this notice of joint family claim because {% if responses.provide_certificate_later_reason and responses.original_marriage_certificate == 'NO' and responses.provide_certificate_later == 'YES' %} {{ responses.provide_certificate_later_reason }} {% else %}   {% endif %}

[state the reasons]

and the certificate will be filed before this claim is set down for trial or an application is made for an order of divorce.

- It is impossible to obtain a certificate of marriage or registration of marriage because: + {% else %} icon-check-empty"> {% endif %} It is impossible to obtain a certificate of marriage or registration of marriage because:  {% if responses.not_provide_certificate_reason and responses.original_marriage_certificate == 'NO' and not responses.provide_certificate_later == 'YES' %} {{ responses.not_provide_certificate_reason }} {% else %}   {% endif %}

[state the reasons]

@@ -215,13 +214,13 @@ Children: [Check whichever one of the following boxes is correct and complete any required information.] - There are no children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act . + {% else %} icon-check-empty"> {% endif %} There are no children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act . [OR] - There are children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act , and those children are: + {% else %} icon-check-empty"> {% endif %} There are children of the marriage, as defined by the Divorce Act (Canada), or children of whom Claimant 1 and Claimant 2 are parents within the meaning of the Family Law Act , and those children are: @@ -262,7 +261,7 @@ - - - + - +
A Claimant 1 and Claimant 2 are asking for the following order respecting arrangements for parenting or contact:   + A Claimant 1 and Claimant 2 are asking for the following order respecting arrangements for parenting or contact:  

[set out terms of proposed order] @@ -270,17 +269,17 @@

B Claimant 1 and Claimant 2 are asking for an order for child support as follows:   + B Claimant 1 and Claimant 2 are asking for an order for child support as follows:  

[set out terms of proposed order]

C Claimant 1 and Claimant 2 are asking for the orders under paragraphs A and B of this section under the following statute(s): [Check one or both of the following boxes, as applicable.] C Claimant 1 and Claimant 2 are asking for the orders under paragraphs A and B of this section under the following statute(s): [Check one or both of the following boxes, as applicable.]
the Divorce Act (Canada) the Family Law Act the Divorce Act (Canada) the Family Law Act
@@ -291,7 +290,7 @@ - - + - +
Claimant 1 and Claimant 2 are asking for an order for spousal support as follows: + {% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 are asking for an order for spousal support as follows: {% if responses.spouse_support_details %} {{responses.spouse_support_details }} {% else %}   {% endif %}

[set out terms of proposed order] @@ -299,11 +298,11 @@

Claimant 1 and Claimant 2 are asking for an order for spousal support under [Check one or both of the following boxes, as applicable.] {% else %} icon-check-empty"> {% endif %} Claimant 1 and Claimant 2 are asking for an order for spousal support under [Check one or both of the following boxes, as applicable.]
the Divorce Act (Canada) - the Family Law Act {% else %} icon-check-empty"> {% endif %} the Divorce Act (Canada) + {% else %} icon-check-empty"> {% endif %} the Family Law Act
@@ -317,13 +316,13 @@ A Property claims under the Family Law Act - Claimant 1 and Claimant 2 are asking for an order for:
[Check whichever one of the following boxes is correct and complete any required information in relation to family property and family debt, as those terms are defined in the Family Law Act.] + Claimant 1 and Claimant 2 are asking for an order for:
[Check whichever one of the following boxes is correct and complete any required information in relation to family property and family debt, as those terms are defined in the Family Law Act.] - an equal division of family property and family debt + {% else %} icon-check-empty"> {% endif %} an equal division of family property and family debt - an unequal division of family property and family debt as follows:   + {% else %} icon-check-empty"> {% endif %} an unequal division of family property and family debt as follows:  

[set out details of proposed division]

@@ -333,7 +332,7 @@ B Other property claims - Claimant 1 and Claimant 2 ask for an order respecting an interest in property or for compensation instead of an interest in that property, as follows: + Claimant 1 and Claimant 2 ask for an order respecting an interest in property or for compensation instead of an interest in that property, as follows:   @@ -345,7 +344,7 @@ -
Claimant 1 and Claimant 2 are asking for an order in the following terms:   + Claimant 1 and Claimant 2 are asking for an order in the following terms:  

[set out terms of proposed order]

@@ -386,7 +385,7 @@ Signature of

- Claimant 1 lawyer for Claimant 1 + Claimant 1 lawyer for Claimant 1

 
[ @@ -406,7 +405,7 @@ Signature of

- Claimant 2 lawyer for Claimant 2 + Claimant 2 lawyer for Claimant 2

 
[ diff --git a/edivorce/apps/core/templates/pdf/form35.html b/edivorce/apps/core/templates/pdf/form35.html index 6fa6c537..53ab20e2 100644 --- a/edivorce/apps/core/templates/pdf/form35.html +++ b/edivorce/apps/core/templates/pdf/form35.html @@ -109,7 +109,7 @@

[type or print name]

- + diff --git a/edivorce/apps/core/templates/styleguide/guide.html b/edivorce/apps/core/templates/styleguide/guide.html index 3d3f7ce3..0e0fcf7f 100644 --- a/edivorce/apps/core/templates/styleguide/guide.html +++ b/edivorce/apps/core/templates/styleguide/guide.html @@ -143,6 +143,24 @@ +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ {% endblock %} {% block sidebarText %}

Phasellus sit amet ex diam. Morbi ultricies justo ac nibh ullamcorper ultricies. Nam quis viverra metus. Sed tincidunt mi id varius volutpat. Maecenas venenatis in velit ac tincidunt. Donec vulputate quam a metus sodales, eu aliquet lectus iaculis. Nam finibus enim sit amet ex fringilla rhoncus. Maecenas dictum nisi ac mauris faucibus pretium. Nulla varius massa in urna dignissim mattis. In eget cursus est. Nulla facilisi. Donec fringilla urna ac luctus suscipit.