From d46d9a9bcdeeaee41138e12e2992c12bcbb454eb Mon Sep 17 00:00:00 2001 From: SisiVero Date: Wed, 16 Oct 2024 07:18:14 -0700 Subject: [PATCH 1/9] addingg aria attributes --- legal_db/templates/404.html | 24 +-- legal_db/templates/legal_db/case/detail.html | 120 ++++++------- legal_db/templates/legal_db/case/form.html | 4 +- legal_db/templates/legal_db/case/index.html | 156 ++++++++-------- legal_db/templates/legal_db/faq.html | 168 +++++++++--------- legal_db/templates/legal_db/index.html | 16 +- .../legal_db/partials/_breadcrumb.html | 52 +++--- .../templates/legal_db/partials/_search.html | 46 ++--- legal_db/templates/legal_db/result.html | 32 ++-- .../legal_db/scholarship/detail.html | 98 +++++----- 10 files changed, 359 insertions(+), 357 deletions(-) diff --git a/legal_db/templates/404.html b/legal_db/templates/404.html index 140ff1c..8ad8c68 100644 --- a/legal_db/templates/404.html +++ b/legal_db/templates/404.html @@ -1,12 +1,12 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} -
-
-

404

-

Page Not Found!

-

The page you are looking for doesn't exist.

- Return Home -
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} +
+
+

404

+

Page Not Found!

+

The page you are looking for doesn't exist.

+ Return Home +
+
+{% endblock %} diff --git a/legal_db/templates/legal_db/case/detail.html b/legal_db/templates/legal_db/case/detail.html index 4fff3a2..01a6e26 100644 --- a/legal_db/templates/legal_db/case/detail.html +++ b/legal_db/templates/legal_db/case/detail.html @@ -1,60 +1,60 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} -
-
- {% include "legal_db/partials/_breadcrumb.html" %} -

{{ case.name }}

-
-
-
-
-
- -
-

Background information

-

{{ case.background }}

-
-

Case summary

-

{{ case.summary }}

-
- {% for tag in case.tags %} - {{ tag }} - {% endfor %} -
-
-
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} +
+
+ {% include "legal_db/partials/_breadcrumb.html" %} +

{{ case.name }}

+
+
+
+
+
+ +
+

Background information

+

{{ case.background }}

+
+

Case summary

+

{{ case.summary }}

+
+ {% for tag in case.tags %} + {{ tag }} + {% endfor %} +
+
+
+
+{% endblock %} diff --git a/legal_db/templates/legal_db/case/form.html b/legal_db/templates/legal_db/case/form.html index 5fb4e31..b139907 100644 --- a/legal_db/templates/legal_db/case/form.html +++ b/legal_db/templates/legal_db/case/form.html @@ -42,7 +42,7 @@

Contact

Agreement and Consent *
{{ case_form.agreement.errors }} @@ -132,7 +132,7 @@

Links to relevant materials

{{ link_form.url.errors }}
-
diff --git a/legal_db/templates/legal_db/case/index.html b/legal_db/templates/legal_db/case/index.html index 0eb0957..b336968 100644 --- a/legal_db/templates/legal_db/case/index.html +++ b/legal_db/templates/legal_db/case/index.html @@ -1,77 +1,79 @@ -{% extends 'legal_db/base.html' %} -{% load static %} - -{% block body_content %} -
-
- {% include "legal_db/partials/_breadcrumb.html" %} -

Cases

-
- -
-

Here you will find information on litigation that involves or directly affects Creative Commons legal tools. Click on the link to each case name for more details on the dispute.

-
-
- -
-
- - -
- - - - - - - - - - - {% for case in cases %} - - - - - - - {% empty %} - - {% endfor %} - -
CountryCase nameLicenseYear of resolution
{{ case.country.name }}{{ case.name }} - {% if not case.license %} Unknown - {% else %} {{ case.license }} {% endif %} - {{ case.decision_year|default:"" }}
No cases are available. Try different filters or search terms.
-
-
-
-{% endblock %} - -{% block js_content %} - -{% endblock %} +{% extends 'legal_db/base.html' %} +{% load static %} + +{% block body_content %} +
+
+ {% include "legal_db/partials/_breadcrumb.html" %} +

Cases

+
+ +
+

Here you will find information on litigation that involves or directly affects Creative Commons legal tools. Click on the link to each case name for more details on the dispute.

+
+
+ +
+
+ + +
+ + + + + + + + + + + {% for case in cases %} + + + + + + + {% empty %} + + {% endfor %} + +
CountryCase nameLicenseYear of resolution
{{ case.country.name }}{{ case.name }} + {% if not case.license %} Unknown + {% else %} {{ case.license }} {% endif %} + {{ case.decision_year|default:"" }}
No cases are available. Try different filters or search terms.
+
+
+
+{% endblock %} + +{% block js_content %} + +{% endblock %} diff --git a/legal_db/templates/legal_db/faq.html b/legal_db/templates/legal_db/faq.html index 0899c5c..f39919a 100644 --- a/legal_db/templates/legal_db/faq.html +++ b/legal_db/templates/legal_db/faq.html @@ -1,84 +1,84 @@ -{% extends 'legal_db/base.html' %} -{% load markdown_extras %} - -{% block body_content %} -
-
- {% include "legal_db/partials/_breadcrumb.html" %} -

Frequently Asked Questions

-
-
-
-
-
-
-
- - - -
-
- {% for faq in faqs %} -
- - -
- {% endfor %} -
-
- -
-
-
-{% endblock %} - -{% block js_content %} - -{% endblock %} +{% extends 'legal_db/base.html' %} +{% load markdown_extras %} + +{% block body_content %} +
+
+ {% include "legal_db/partials/_breadcrumb.html" %} +

Frequently Asked Questions

+
+
+
+
+
+
+
+ + + +
+
+ {% for faq in faqs %} +
+ + +
+ {% endfor %} +
+
+ +
+
+
+{% endblock %} + +{% block js_content %} + +{% endblock %} diff --git a/legal_db/templates/legal_db/index.html b/legal_db/templates/legal_db/index.html index 1effa1d..71cbff6 100644 --- a/legal_db/templates/legal_db/index.html +++ b/legal_db/templates/legal_db/index.html @@ -4,7 +4,7 @@

Creative Commons Legal Database

-

This database includes case law and legal scholarship that relates to Creative Commons legal tools.
Please note that the database is not comprehensive, and CC does not necessarily endorse the views of the courts or scholars whose decisions and writings are referenced. The content provided is purely informational, designed for those seeking to better understand the legal ecosystem in which the CC legal tools operate.

+

This database includes case law and legal scholarship that relates to Creative Commons legal tools.
Please note that the database is not comprehensive, and CC does not necessarily endorse the views of the courts or scholars whose decisions and writings are referenced. The content provided is purely informational, designed for those seeking to better understand the legal ecosystem in which the CC legal tools operate.

@@ -15,14 +15,14 @@

Explore by content

Cases

{% for tag in cases_tags %} - + {{ tag }} {% endfor %}
-
+

Caselaw Database

@@ -35,13 +35,13 @@

Caselaw Database

Scholarship

{% for tag in scholarship_tags %} - + {{ tag }} {% endfor %}
-
+

Legal Scholarship Database

@@ -60,11 +60,11 @@

Legal Scholarship Database

Contribute

The information presented here has been contributed by many dedicated members of the CC Global Network and CC staff. You can contribute too using our forms linked to on this page.

- Submit a case - Submit an article + Submit a case + Submit an article
-
+
Check the

Frequently asked questions

diff --git a/legal_db/templates/legal_db/partials/_breadcrumb.html b/legal_db/templates/legal_db/partials/_breadcrumb.html index af5a645..329dc9e 100644 --- a/legal_db/templates/legal_db/partials/_breadcrumb.html +++ b/legal_db/templates/legal_db/partials/_breadcrumb.html @@ -1,26 +1,26 @@ -{% with current_path=request.resolver_match.url_name %} - -{% endwith %} +{% with current_path=request.resolver_match.url_name %} + +{% endwith %} diff --git a/legal_db/templates/legal_db/partials/_search.html b/legal_db/templates/legal_db/partials/_search.html index 089421c..9f02db2 100644 --- a/legal_db/templates/legal_db/partials/_search.html +++ b/legal_db/templates/legal_db/partials/_search.html @@ -1,23 +1,23 @@ -{% load widget_tweaks %} - -
-
- - {{ form.keywords.errors }} -
-
- - Hide topic filters - - -
-
+{% load widget_tweaks %} + +
+
+ + {{ form.keywords.errors }} +
+
+ + Hide topic filters + + +
+
diff --git a/legal_db/templates/legal_db/result.html b/legal_db/templates/legal_db/result.html index f73064b..b409927 100644 --- a/legal_db/templates/legal_db/result.html +++ b/legal_db/templates/legal_db/result.html @@ -1,16 +1,16 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} -
-
-

Thank you for your submission.
It will be reviewed by Creative Commons staff, and you may be contacted for more information.

-
- Return Home - {% if "scholarship" in action %} - Submit another article - {% else %} - Submit another case - {% endif %} -
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} +
+
+

Thank you for your submission.
It will be reviewed by Creative Commons staff, and you may be contacted for more information.

+
+ Return Home + {% if "scholarship" in action %} + Submit another article + {% else %} + Submit another case + {% endif %} +
+
+{% endblock %} diff --git a/legal_db/templates/legal_db/scholarship/detail.html b/legal_db/templates/legal_db/scholarship/detail.html index 544fad6..a456605 100644 --- a/legal_db/templates/legal_db/scholarship/detail.html +++ b/legal_db/templates/legal_db/scholarship/detail.html @@ -1,49 +1,49 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} -
-
- {% include "legal_db/partials/_breadcrumb.html" %} -

{{ scholarship.title }}

-
-
-
-
-
- -
-

Summary

-

{{ scholarship.summary }}

-
- {% for tag in scholarship.tags %} - - {{ tag }} - - {% endfor %} -
-
-
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} + +
+
+
+ +
+

Summary

+

{{ scholarship.summary }}

+
+ {% for tag in scholarship.tags %} + + {{ tag }} + + {% endfor %} +
+
+
+
+{% endblock %} From c6fd06f949542ffd77c048c9e05767f50abf8c53 Mon Sep 17 00:00:00 2001 From: SisiVero Date: Wed, 16 Oct 2024 14:18:35 -0700 Subject: [PATCH 2/9] updated 404 page --- legal_db/templates/404.html | 4 +- .../templates/legal_db/scholarship/form.html | 228 +++++++++--------- 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/legal_db/templates/404.html b/legal_db/templates/404.html index 8ad8c68..ea84276 100644 --- a/legal_db/templates/404.html +++ b/legal_db/templates/404.html @@ -1,12 +1,12 @@ {% extends 'legal_db/base.html' %} {% block body_content %} -
+

404

Page Not Found!

The page you are looking for doesn't exist.

- Return Home + Return Home
{% endblock %} diff --git a/legal_db/templates/legal_db/scholarship/form.html b/legal_db/templates/legal_db/scholarship/form.html index 0a1c44e..655bc5d 100644 --- a/legal_db/templates/legal_db/scholarship/form.html +++ b/legal_db/templates/legal_db/scholarship/form.html @@ -1,114 +1,114 @@ -{% extends 'legal_db/base.html' %} -{% load widget_tweaks %} - -{% block body_content %} -
-
-

Scholarship Submission

-

Please add any article related to Creative Commons licenses and other legal tools that you think should be included in the database.   * Required.

-
-
-
-
-
-
- {% csrf_token %} - {% if scho_form.non_field_errors %} -
- {{ scho_form.non_field_errors }} -
- {% endif %} - -

Contact

- - {% with WIDGET_ERROR_CLASS='is-danger' %} -
- - {% render_field scho_form.contributor_name|add_class:"input" %} - {{ scho_form.contributor_name.errors }} -
- -
- - {% render_field scho_form.contributor_email|add_class:"input" %} - {{ scho_form.contributor_email.errors }} -
- -
- Agreement and Consent *
- - {{ scho_form.agreement.errors }} -
-
- -

Article information

- -
- - {% render_field scho_form.title|add_class:"input" %} - {{ scho_form.title.errors }} -
- -
-
- - {% render_field scho_form.license|add_class:"input" %} - {{ scho_form.license.errors }} -
-
- - {% render_field scho_form.publication_year|add_class:"input" type="text" inputmode="numeric" placeholder="YYYY" %} - {{ scho_form.publication_year.errors }} -
-
- -
- - {% render_field scho_form.publication_name|add_class:"input" %} - {{ scho_form.publication_name.errors }} -
- -
- - {% render_field scho_form.authors|add_class:"input" %} - {{ scho_form.authors.errors }} -
- -
- - {% render_field scho_form.summary|add_class:"input textarea" placeholder="Abstract or summary of the article" %} - {{ scho_form.summary.errors }} -
-
- -

Link to article

- -
- - {% render_field link_form.url|add_class:"input" type="text" inputmode="url" placeholder="https://example.com" %} - {{ link_form.url.errors }} -
- -
-
- - {% render_field link_form.title|add_class:"input" placeholder="Title of the page being linked to" %} - {{ link_form.title.errors }} -
-
- - {% render_field link_form.label|add_class:"input" %} - {{ link_form.label.errors }} -
-
- {% endwith %} - - -
-
-
-
-{% endblock %} +{% extends 'legal_db/base.html' %} +{% load widget_tweaks %} + +{% block body_content %} +
+
+

Scholarship Submission

+

Please add any article related to Creative Commons licenses and other legal tools that you think should be included in the database.   * Required.

+
+
+
+
+
+
+ {% csrf_token %} + {% if scho_form.non_field_errors %} + + {% endif %} + +

Contact

+ + {% with WIDGET_ERROR_CLASS='is-danger' %} +
+ + {% render_field scho_form.contributor_name|add_class:"input" %} + {{ scho_form.contributor_name.errors }} +
+ +
+ + {% render_field scho_form.contributor_email|add_class:"input" %} + {{ scho_form.contributor_email.errors }} +
+ +
+ Agreement and Consent *
+ + {{ scho_form.agreement.errors }} +
+
+ +

Article information

+ +
+ + {% render_field scho_form.title|add_class:"input" %} + {{ scho_form.title.errors }} +
+ +
+
+ + {% render_field scho_form.license|add_class:"input" %} + {{ scho_form.license.errors }} +
+
+ + {% render_field scho_form.publication_year|add_class:"input" type="text" inputmode="numeric" placeholder="YYYY" %} + {{ scho_form.publication_year.errors }} +
+
+ +
+ + {% render_field scho_form.publication_name|add_class:"input" %} + {{ scho_form.publication_name.errors }} +
+ +
+ + {% render_field scho_form.authors|add_class:"input" %} + {{ scho_form.authors.errors }} +
+ +
+ + {% render_field scho_form.summary|add_class:"input textarea" placeholder="Abstract or summary of the article" %} + {{ scho_form.summary.errors }} +
+
+ +

Link to article

+ +
+ + {% render_field link_form.url|add_class:"input" type="text" inputmode="url" placeholder="https://example.com" %} + {{ link_form.url.errors }} +
+ +
+
+ + {% render_field link_form.title|add_class:"input" placeholder="Title of the page being linked to" %} + {{ link_form.title.errors }} +
+
+ + {% render_field link_form.label|add_class:"input" %} + {{ link_form.label.errors }} +
+
+ {% endwith %} + + +
+
+
+
+{% endblock %} From e408c209d71313d5b71ad1aef0dbd2d608e20fa3 Mon Sep 17 00:00:00 2001 From: SisiVero Date: Tue, 22 Oct 2024 12:58:10 -0700 Subject: [PATCH 3/9] conflict resolved. --- manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage.py b/manage.py index 929f5f7..510b410 100755 --- a/manage.py +++ b/manage.py @@ -42,4 +42,4 @@ def main(): except Exception: print("ERROR (1) Unhandled exception:", file=sys.stderr) print(traceback.print_exc(), file=sys.stderr) - sys.exit(1) + sys.exit(1) \ No newline at end of file From 640d1518f4fd835ac3355ace6e64ad6f0e1ea942 Mon Sep 17 00:00:00 2001 From: Timid Robot Zehta Date: Fri, 1 Nov 2024 11:48:19 -0700 Subject: [PATCH 4/9] restore unix line endings using dos2unix --- legal_db/templates/404.html | 24 +-- legal_db/templates/legal_db/faq.html | 168 +++++++++--------- .../legal_db/partials/_breadcrumb.html | 52 +++--- legal_db/templates/legal_db/result.html | 32 ++-- 4 files changed, 138 insertions(+), 138 deletions(-) diff --git a/legal_db/templates/404.html b/legal_db/templates/404.html index ea84276..8c1f376 100644 --- a/legal_db/templates/404.html +++ b/legal_db/templates/404.html @@ -1,12 +1,12 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} -
-
-

404

-

Page Not Found!

-

The page you are looking for doesn't exist.

- Return Home -
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} +
+
+

404

+

Page Not Found!

+

The page you are looking for doesn't exist.

+ Return Home +
+
+{% endblock %} diff --git a/legal_db/templates/legal_db/faq.html b/legal_db/templates/legal_db/faq.html index f39919a..bcdf065 100644 --- a/legal_db/templates/legal_db/faq.html +++ b/legal_db/templates/legal_db/faq.html @@ -1,84 +1,84 @@ -{% extends 'legal_db/base.html' %} -{% load markdown_extras %} - -{% block body_content %} -
-
- {% include "legal_db/partials/_breadcrumb.html" %} -

Frequently Asked Questions

-
-
-
-
-
-
-
- - - -
-
- {% for faq in faqs %} -
- - -
- {% endfor %} -
-
- -
-
-
-{% endblock %} - -{% block js_content %} - -{% endblock %} +{% extends 'legal_db/base.html' %} +{% load markdown_extras %} + +{% block body_content %} +
+
+ {% include "legal_db/partials/_breadcrumb.html" %} +

Frequently Asked Questions

+
+
+
+
+
+
+
+ + + +
+
+ {% for faq in faqs %} +
+ + +
+ {% endfor %} +
+
+ +
+
+
+{% endblock %} + +{% block js_content %} + +{% endblock %} diff --git a/legal_db/templates/legal_db/partials/_breadcrumb.html b/legal_db/templates/legal_db/partials/_breadcrumb.html index 329dc9e..0aea503 100644 --- a/legal_db/templates/legal_db/partials/_breadcrumb.html +++ b/legal_db/templates/legal_db/partials/_breadcrumb.html @@ -1,26 +1,26 @@ -{% with current_path=request.resolver_match.url_name %} - -{% endwith %} +{% with current_path=request.resolver_match.url_name %} + +{% endwith %} diff --git a/legal_db/templates/legal_db/result.html b/legal_db/templates/legal_db/result.html index b409927..a5a8c86 100644 --- a/legal_db/templates/legal_db/result.html +++ b/legal_db/templates/legal_db/result.html @@ -1,16 +1,16 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} -
-
-

Thank you for your submission.
It will be reviewed by Creative Commons staff, and you may be contacted for more information.

-
- Return Home - {% if "scholarship" in action %} - Submit another article - {% else %} - Submit another case - {% endif %} -
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} +
+
+

Thank you for your submission.
It will be reviewed by Creative Commons staff, and you may be contacted for more information.

+
+ Return Home + {% if "scholarship" in action %} + Submit another article + {% else %} + Submit another case + {% endif %} +
+
+{% endblock %} From 570fbbf84dc5785e90f27583a25c2a961dab0405 Mon Sep 17 00:00:00 2001 From: Timid Robot Zehta Date: Fri, 1 Nov 2024 11:48:49 -0700 Subject: [PATCH 5/9] restore unix line endings using dos2unix --- legal_db/templates/legal_db/case/detail.html | 120 +++++++++---------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/legal_db/templates/legal_db/case/detail.html b/legal_db/templates/legal_db/case/detail.html index 01a6e26..4fff3a2 100644 --- a/legal_db/templates/legal_db/case/detail.html +++ b/legal_db/templates/legal_db/case/detail.html @@ -1,60 +1,60 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} -
-
- {% include "legal_db/partials/_breadcrumb.html" %} -

{{ case.name }}

-
-
-
-
-
- -
-

Background information

-

{{ case.background }}

-
-

Case summary

-

{{ case.summary }}

-
- {% for tag in case.tags %} - {{ tag }} - {% endfor %} -
-
-
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} +
+
+ {% include "legal_db/partials/_breadcrumb.html" %} +

{{ case.name }}

+
+
+
+
+
+ +
+

Background information

+

{{ case.background }}

+
+

Case summary

+

{{ case.summary }}

+
+ {% for tag in case.tags %} + {{ tag }} + {% endfor %} +
+
+
+
+{% endblock %} From b70138ca5f1d7f6035e0f55e79f763a29e3cd846 Mon Sep 17 00:00:00 2001 From: Timid Robot Zehta Date: Fri, 1 Nov 2024 11:49:19 -0700 Subject: [PATCH 6/9] restore unix line endings using dos2unix --- legal_db/templates/legal_db/case/index.html | 158 ++++++------ .../legal_db/scholarship/detail.html | 98 ++++---- .../templates/legal_db/scholarship/form.html | 228 +++++++++--------- 3 files changed, 242 insertions(+), 242 deletions(-) diff --git a/legal_db/templates/legal_db/case/index.html b/legal_db/templates/legal_db/case/index.html index b336968..9999273 100644 --- a/legal_db/templates/legal_db/case/index.html +++ b/legal_db/templates/legal_db/case/index.html @@ -1,79 +1,79 @@ -{% extends 'legal_db/base.html' %} -{% load static %} - -{% block body_content %} -
-
- {% include "legal_db/partials/_breadcrumb.html" %} -

Cases

-
- -
-

Here you will find information on litigation that involves or directly affects Creative Commons legal tools. Click on the link to each case name for more details on the dispute.

-
-
- -
-
- - -
- - - - - - - - - - - {% for case in cases %} - - - - - - - {% empty %} - - {% endfor %} - -
CountryCase nameLicenseYear of resolution
{{ case.country.name }}{{ case.name }} - {% if not case.license %} Unknown - {% else %} {{ case.license }} {% endif %} - {{ case.decision_year|default:"" }}
No cases are available. Try different filters or search terms.
-
-
-
-{% endblock %} - -{% block js_content %} - -{% endblock %} +{% extends 'legal_db/base.html' %} +{% load static %} + +{% block body_content %} +
+
+ {% include "legal_db/partials/_breadcrumb.html" %} +

Cases

+
+ +
+

Here you will find information on litigation that involves or directly affects Creative Commons legal tools. Click on the link to each case name for more details on the dispute.

+
+
+ +
+
+ + +
+ + + + + + + + + + + {% for case in cases %} + + + + + + + {% empty %} + + {% endfor %} + +
CountryCase nameLicenseYear of resolution
{{ case.country.name }}{{ case.name }} + {% if not case.license %} Unknown + {% else %} {{ case.license }} {% endif %} + {{ case.decision_year|default:"" }}
No cases are available. Try different filters or search terms.
+
+
+
+{% endblock %} + +{% block js_content %} + +{% endblock %} diff --git a/legal_db/templates/legal_db/scholarship/detail.html b/legal_db/templates/legal_db/scholarship/detail.html index a456605..1bc04f3 100644 --- a/legal_db/templates/legal_db/scholarship/detail.html +++ b/legal_db/templates/legal_db/scholarship/detail.html @@ -1,49 +1,49 @@ -{% extends 'legal_db/base.html' %} - -{% block body_content %} - -
-
-
- -
-

Summary

-

{{ scholarship.summary }}

-
- {% for tag in scholarship.tags %} - - {{ tag }} - - {% endfor %} -
-
-
-
-{% endblock %} +{% extends 'legal_db/base.html' %} + +{% block body_content %} + +
+
+
+ +
+

Summary

+

{{ scholarship.summary }}

+
+ {% for tag in scholarship.tags %} + + {{ tag }} + + {% endfor %} +
+
+
+
+{% endblock %} diff --git a/legal_db/templates/legal_db/scholarship/form.html b/legal_db/templates/legal_db/scholarship/form.html index 655bc5d..35fe0e0 100644 --- a/legal_db/templates/legal_db/scholarship/form.html +++ b/legal_db/templates/legal_db/scholarship/form.html @@ -1,114 +1,114 @@ -{% extends 'legal_db/base.html' %} -{% load widget_tweaks %} - -{% block body_content %} -
-
-

Scholarship Submission

-

Please add any article related to Creative Commons licenses and other legal tools that you think should be included in the database.   * Required.

-
-
-
-
-
-
- {% csrf_token %} - {% if scho_form.non_field_errors %} - - {% endif %} - -

Contact

- - {% with WIDGET_ERROR_CLASS='is-danger' %} -
- - {% render_field scho_form.contributor_name|add_class:"input" %} - {{ scho_form.contributor_name.errors }} -
- -
- - {% render_field scho_form.contributor_email|add_class:"input" %} - {{ scho_form.contributor_email.errors }} -
- -
- Agreement and Consent *
- - {{ scho_form.agreement.errors }} -
-
- -

Article information

- -
- - {% render_field scho_form.title|add_class:"input" %} - {{ scho_form.title.errors }} -
- -
-
- - {% render_field scho_form.license|add_class:"input" %} - {{ scho_form.license.errors }} -
-
- - {% render_field scho_form.publication_year|add_class:"input" type="text" inputmode="numeric" placeholder="YYYY" %} - {{ scho_form.publication_year.errors }} -
-
- -
- - {% render_field scho_form.publication_name|add_class:"input" %} - {{ scho_form.publication_name.errors }} -
- -
- - {% render_field scho_form.authors|add_class:"input" %} - {{ scho_form.authors.errors }} -
- -
- - {% render_field scho_form.summary|add_class:"input textarea" placeholder="Abstract or summary of the article" %} - {{ scho_form.summary.errors }} -
-
- -

Link to article

- -
- - {% render_field link_form.url|add_class:"input" type="text" inputmode="url" placeholder="https://example.com" %} - {{ link_form.url.errors }} -
- -
-
- - {% render_field link_form.title|add_class:"input" placeholder="Title of the page being linked to" %} - {{ link_form.title.errors }} -
-
- - {% render_field link_form.label|add_class:"input" %} - {{ link_form.label.errors }} -
-
- {% endwith %} - - -
-
-
-
-{% endblock %} +{% extends 'legal_db/base.html' %} +{% load widget_tweaks %} + +{% block body_content %} +
+
+

Scholarship Submission

+

Please add any article related to Creative Commons licenses and other legal tools that you think should be included in the database.   * Required.

+
+
+
+
+
+
+ {% csrf_token %} + {% if scho_form.non_field_errors %} + + {% endif %} + +

Contact

+ + {% with WIDGET_ERROR_CLASS='is-danger' %} +
+ + {% render_field scho_form.contributor_name|add_class:"input" %} + {{ scho_form.contributor_name.errors }} +
+ +
+ + {% render_field scho_form.contributor_email|add_class:"input" %} + {{ scho_form.contributor_email.errors }} +
+ +
+ Agreement and Consent *
+ + {{ scho_form.agreement.errors }} +
+
+ +

Article information

+ +
+ + {% render_field scho_form.title|add_class:"input" %} + {{ scho_form.title.errors }} +
+ +
+
+ + {% render_field scho_form.license|add_class:"input" %} + {{ scho_form.license.errors }} +
+
+ + {% render_field scho_form.publication_year|add_class:"input" type="text" inputmode="numeric" placeholder="YYYY" %} + {{ scho_form.publication_year.errors }} +
+
+ +
+ + {% render_field scho_form.publication_name|add_class:"input" %} + {{ scho_form.publication_name.errors }} +
+ +
+ + {% render_field scho_form.authors|add_class:"input" %} + {{ scho_form.authors.errors }} +
+ +
+ + {% render_field scho_form.summary|add_class:"input textarea" placeholder="Abstract or summary of the article" %} + {{ scho_form.summary.errors }} +
+
+ +

Link to article

+ +
+ + {% render_field link_form.url|add_class:"input" type="text" inputmode="url" placeholder="https://example.com" %} + {{ link_form.url.errors }} +
+ +
+
+ + {% render_field link_form.title|add_class:"input" placeholder="Title of the page being linked to" %} + {{ link_form.title.errors }} +
+
+ + {% render_field link_form.label|add_class:"input" %} + {{ link_form.label.errors }} +
+
+ {% endwith %} + + +
+
+
+
+{% endblock %} From 70f1bdb3021aad087f35dc4437be89fe1047d010 Mon Sep 17 00:00:00 2001 From: SisiVero Date: Sun, 17 Nov 2024 03:46:43 -0800 Subject: [PATCH 7/9] redundant aria attrbutes removed and support for translation added where needed/appropriate --- legal_db/templates/404.html | 2 +- legal_db/templates/legal_db/case/detail.html | 6 +++--- legal_db/templates/legal_db/case/form.html | 6 +++--- .../templates/legal_db/partials/_breadcrumb.html | 12 ++++++------ legal_db/templates/legal_db/partials/_header.html | 2 +- legal_db/templates/legal_db/partials/_search.html | 4 ++-- legal_db/templates/legal_db/scholarship/detail.html | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/legal_db/templates/404.html b/legal_db/templates/404.html index 20ce2ff..4b5081f 100644 --- a/legal_db/templates/404.html +++ b/legal_db/templates/404.html @@ -2,7 +2,7 @@ {% load i18n %} {% block body_content %} -
+

404

{% trans "Page Not Found!" %}

diff --git a/legal_db/templates/legal_db/case/detail.html b/legal_db/templates/legal_db/case/detail.html index 13a6df6..cbcdc57 100644 --- a/legal_db/templates/legal_db/case/detail.html +++ b/legal_db/templates/legal_db/case/detail.html @@ -2,7 +2,7 @@ {% load i18n %} {% block body_content %} -
+
{% include "legal_db/partials/_breadcrumb.html" %}

{{ case.name }}

@@ -11,7 +11,7 @@

{{ case.name }}

-