forked from lucyparsons/OpenOversight
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add HTML linting to
pre-commit (lucyparsons#968)
lucyparsons#239 I added `djlint` linting to the `pre-commit` script and made the corresponding changes. - [x] This branch is up-to-date with the `develop` branch. - [x] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment.
- Loading branch information
1 parent
22f166f
commit c3e9566
Showing
35 changed files
with
354 additions
and
302 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| {% extends "base.html" %} | ||
| {% block title %}About OpenOversight{% endblock %} | ||
| {% block title %} | ||
| About OpenOversight | ||
| {% endblock title %} | ||
| {% block meta %} | ||
| <meta name="description" | ||
| content="OpenOversight is a Seattle Tech Bloc project that aims to improve law enforcement visibility and transparency using public and crowdsourced data. We maintain databases, digital galleries, and profiles of individual law enforcement officers from departments the so called Pacific Northwest that consolidate information including names, birthdates, mentions in news articles, salaries, and photographs." /> | ||
| {% endblock %} | ||
| {% endblock meta %} | ||
| {% block content %} | ||
| <div role="main"> | ||
| <div class="hero-section no-sub"> | ||
|
|
@@ -23,15 +25,17 @@ | |
| <small> | ||
| This is an independent instance of OpenOversight hosted by Seattle | ||
| regional techbloc. For more info or reporting problems, reach out to | ||
| <a href="http://twitter.com/TechBlocSEA" | ||
| <a href="https://twitter.com/TechBlocSEA" | ||
| rel="noopener noreferrer" | ||
| target="_blank">TechBlocSEA on Twitter</a> | ||
| or | ||
| <a href="mailto:[email protected]">[email protected]</a>. | ||
| </small> | ||
| </p> | ||
| <div class="text-center pb-50"> | ||
| <a href="/find" class="btn btn-lg btn-info" id="try-it">Try it</a> | ||
| <a href="{{ url_for("main.get_officer") }}" | ||
| class="btn btn-lg btn-info" | ||
| id="try-it">Try it</a> | ||
| </div> | ||
| <div class="row font-weight-300 text-center display-flex"> | ||
| <div class="col-lg-4 col-half-border"> | ||
|
|
@@ -121,4 +125,4 @@ <h2>Press Release</h2> | |
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} | ||
| {% endblock content %} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,7 +42,7 @@ <h2> | |
| </div> | ||
| <div class="col-sm-3 text-center"> | ||
| <div class="docs-data"> | ||
| <form {% if department %} action="{{ url_for('main.label_data', image_id=image.id, department_id=department.id) }}" {% else %} action="{{ url_for('main.label_data', image_id=image.id) }}" {% endif %} | ||
| <form action="{{ url_for('main.label_data', image_id=image.id, department_id=department.id if department else None) }}" | ||
| method="post"> | ||
| {{ form.hidden_tag() }} | ||
| <div class="input-group input-group-sm"> | ||
|
|
@@ -164,56 +164,63 @@ <h2> | |
| <a href="{{ url_for('main.label_data', department_id=department.id) }}" | ||
| class="btn btn-lg btn-primary" | ||
| role="button"> | ||
| {% else %} | ||
| <a href="{{ url_for("main.label_data") }}" | ||
| class="btn btn-lg btn-primary" | ||
| role="button"> | ||
| {% endif %} | ||
| <span class="glyphicon glyphicon-repeat" aria-hidden="true"></span> Next Photo</a> | ||
| </div> | ||
| <div class="col-sm-2 text-center done-button"> | ||
| <a href="{{ url_for('main.complete_tagging', image_id=image.id, department_id=department.id, contains_cops=0) }}" | ||
| class="btn btn-sm btn-success"> | ||
| <span class="glyphicon glyphicon glyphicon-ok" aria-hidden="true"></span> | ||
| All officers have been identified! | ||
| <span class="glyphicon glyphicon-repeat" aria-hidden="true"></span> | ||
| Next Photo | ||
| </a> | ||
| </div> | ||
| <hr> | ||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| <div class="text-center button-explanation"> | ||
| <div class="text done-button-explanation"> | ||
| <b>Explanation</b>: click this button ONLY when all officers in it have been identified. This will remove it from the identification queue for ALL users. | ||
| </div> | ||
| <div class="text skip-button-explanation"> | ||
| <b>Explanation</b>: click this button if you would like to move on to the next image, without saving any info about this image. | ||
| </div> | ||
| <div class="text launchroster-button-explanation"> | ||
| <b>Explanation</b>: click this button to open the police roster. Use the roster to find the officer's OpenOversight ID. | ||
| </div> | ||
| {% else %} | ||
| <a href="{{ url_for("main.label_data") }}" | ||
| class="btn btn-lg btn-primary" | ||
| role="button"> | ||
| <span class="glyphicon glyphicon-repeat" aria-hidden="true"></span> | ||
| Next Photo | ||
| </a> | ||
| {% endif %} | ||
| </div> | ||
| <div class="col-sm-2 text-center done-button"> | ||
| <a href="{{ url_for('main.complete_tagging', image_id=image.id, department_id=department.id, contains_cops=0) }}" | ||
| class="btn btn-sm btn-success"> | ||
| <span class="glyphicon glyphicon glyphicon-ok" aria-hidden="true"></span> | ||
| All officers have been identified! | ||
| </a> | ||
| </div> | ||
| <hr> | ||
| <div class="row"> | ||
| <div class="col-sm-12"> | ||
| <div class="text-center button-explanation"> | ||
| <div class="text done-button-explanation"> | ||
| <b>Explanation</b>: click this button ONLY when all officers in it have been identified. This will remove it from the identification queue for ALL users. | ||
| </div> | ||
| <div class="text skip-button-explanation"> | ||
| <b>Explanation</b>: click this button if you would like to move on to the next image, without saving any info about this image. | ||
| </div> | ||
| <div class="text launchroster-button-explanation"> | ||
| <b>Explanation</b>: click this button to open the police roster. Use the roster to find the officer's OpenOversight ID. | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% elif current_user.is_disabled == True %} | ||
| <h3>Your account has been disabled due to too many incorrect classifications/tags!</h3> | ||
| <p> | ||
| <a href="mailto:[email protected]" | ||
| class="btn btn-lg btn-primary" | ||
| role="button">Mail us to get it enabled again</a> | ||
| </p> | ||
| {% else %} | ||
| <h3>All images have been tagged!</h3> | ||
| <h4> | ||
| <small class="muted">{{ department.name }}</small> | ||
| </h4> | ||
| <p> | ||
| <a href="{{ url_for("main.submit_data") }}" | ||
| class="btn btn-lg btn-primary" | ||
| role="button">Submit officer pictures to us</a> | ||
| </p> | ||
| {% endif %} | ||
| </div> | ||
| {% elif current_user.is_disabled == True %} | ||
| <h3>Your account has been disabled due to too many incorrect classifications/tags!</h3> | ||
| <p> | ||
| <a href="mailto:[email protected]" | ||
| class="btn btn-lg btn-primary" | ||
| role="button">Mail us to get it enabled again</a> | ||
| </p> | ||
| {% else %} | ||
| <h3>All images have been tagged!</h3> | ||
| <h4> | ||
| <small class="muted">{{ department.name }}</small> | ||
| </h4> | ||
| <p> | ||
| <a href="{{ url_for("main.submit_data") }}" | ||
| class="btn btn-lg btn-primary" | ||
| role="button">Submit officer pictures to us</a> | ||
| </p> | ||
| {% endif %} | ||
| </div> | ||
| {% endblock %} | ||
| {% block footer_class %}bottom-10{% endblock %} | ||
| {% endif %} | ||
| </div> | ||
| {% endblock content %} | ||
| {% block footer_class %} | ||
| bottom-10 | ||
| {% endblock footer_class %} | ||
Oops, something went wrong.