Skip to content

Commit

Permalink
QA fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnyu95
johnyu95 committed Mar 20, 2023
1 parent 3f18940 commit cb921c4
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 22 deletions.
2 changes: 1 addition & 1 deletion app/templates/_nyc_gov_footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<button class="ico-search">Search</button>
</form>
<div class="copyright">
<p>City of New York. 2016 All Rights Reserved,</p>
<p>City of New York. 2023 All Rights Reserved,</p>

<p>NYC is a trademark and service mark of the City of New York</p>

Expand Down
12 changes: 1 addition & 11 deletions app/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,7 @@
</a>
</div>
<div class="col-sm-2">
<div id="google_translate_element">
<div class="skiptranslate goog-te-gadget" dir="ltr">
<div id=":0.targetLanguage" class="goog-te-gadget-simple"
style="white-space: nowrap; border:none;"><span style="vertical-align: middle;"><a
role="menu" class="goog-te-menu-value2" href="javascript:void(0)"
aria-label="Translate"><span
class="translate-text">Translate</span><span
style="border-left: 1px solid rgb(187, 187, 187);padding-right:5px;">​</span><span
style="color: #666;">▼</span></a></span></div>
</div>
</div>
<div id="google_translate_element"></div>
</div>
<div class="col-sm-3"></div>

Expand Down
4 changes: 2 additions & 2 deletions app/templates/email_templates/email_edit_response.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
The <strong>{{ key }}</strong> was changed from:
</span>
</p>
<p style="padding-left: 30px;"><span class="mceNonEditable"> {{ response_data.data_old[key] }} </span></p>
<p style="padding-left: 30px;"><span class="mceNonEditable"> {{ response_data.data_old[key] | safe }} </span></p>
<p><span class="mceNonEditable"> to: <span class="mceNonEditable"></p>
<p style="padding-left: 30px;"><span class="mceNonEditable"> {{ response_data.data_new[key] }} </span></p>
<p style="padding-left: 30px;"><span class="mceNonEditable"> {{ response_data.data_new[key] | safe }} </span></p>
{% endfor %}
{% endif %}
{% if agency %}
Expand Down
5 changes: 2 additions & 3 deletions app/templates/request/responses/row.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@

<script>
{% if show_preview and response.preview is not none %}
let responseRow = $('#'+ '{{ row_html_id }}');
responseRow.html({{ response.preview | tojson }});
responseRow.html(responseRow.text());
$('#'+ '{{ row_html_id }}').html({{ response.preview | tojson }});
$('#'+ '{{ row_html_id }}').html($('#'+ '{{ row_html_id }}').text());
{% endif %}
</script>
6 changes: 2 additions & 4 deletions build_scripts/default/nginx_conf/sites/openrecords_v2_0.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ server {
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
add_header Content-Security-Policy "default-src 'self'; img-src 'self' www.gstatic.com www.google.com translate.googleapis.com http://www1.nyc.gov/ data:; style-src 'self' 'unsafe-inline' code.jquery.com ajax.googleapis.com maxcdn.bootstrapcdn.com translate.googleapis.com http://www1.nyc.gov/; script-src 'self' 'unsafe-inline' 'unsafe-eval' translate.google.com translate.googleapis.com ajax.googleapis.com code.jquery.com http://www1.nyc.gov/ https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/; font-src 'self' maxcdn.bootstrapcdn.com; object-src 'self' blob ajax.googleapis.com; frame-src 'self' https://www.google.com;";

add_header Content-Security-Policy "default-src 'self' https://translate.googleapis.com; img-src 'self' https://translate.google.com www.gstatic.com www.google.com translate.googleapis.com http://www1.nyc.gov/ data:; style-src 'self' 'unsafe-inline' https://www.gstatic.com code.jquery.com ajax.googleapis.com maxcdn.bootstrapcdn.com translate.googleapis.com http://www1.nyc.gov/; script-src 'self' 'unsafe-inline' 'unsafe-eval' translate-pa.googleapis.com translate.google.com translate.googleapis.com ajax.googleapis.com code.jquery.com http://www1.nyc.gov/ https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/; font-src 'self' maxcdn.bootstrapcdn.com; object-src 'self' blob ajax.googleapis.com; frame-src 'self' https://www.google.com;";
client_max_body_size 20M;

ssl_certificate /vagrant/build_scripts/web_setup/openrecords_v2_0_dev.pem;
Expand Down Expand Up @@ -109,8 +108,7 @@ server {
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
add_header Content-Security-Policy "default-src 'self'; img-src 'self' www.gstatic.com www.google.com translate.googleapis.com http://www1.nyc.gov/ data:; style-src 'self' 'unsafe-inline' code.jquery.com ajax.googleapis.com maxcdn.bootstrapcdn.com translate.googleapis.com http://www1.nyc.gov/; script-src 'self' 'unsafe-inline' 'unsafe-eval' translate.google.com translate.googleapis.com ajax.googleapis.com code.jquery.com http://www1.nyc.gov/ https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/; font-src 'self' maxcdn.bootstrapcdn.com; object-src 'self' blob ajax.googleapis.com; frame-src 'self' https://www.google.com;";

add_header Content-Security-Policy "default-src 'self'; img-src 'self' www.gstatic.com www.google.com translate.googleapis.com http://www1.nyc.gov/ data:; style-src 'self' 'unsafe-inline' https://www.gstatic.com/ code.jquery.com ajax.googleapis.com maxcdn.bootstrapcdn.com translate.googleapis.com http://www1.nyc.gov/; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://translate-pa.googleapis.com/ translate.google.com translate.googleapis.com ajax.googleapis.com code.jquery.com http://www1.nyc.gov/ https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/; font-src 'self' maxcdn.bootstrapcdn.com; object-src 'self' blob ajax.googleapis.com; frame-src 'self' https://www.google.com; style-src-elem 'self' https://www.gstatic.com/; script-src-elem 'self' https://translate-pa.googleapis.com/; connect-src 'self' https://translate.googleapis.com/;";
client_max_body_size 20M;

ssl_certificate /vagrant/build_scripts/web_setup/openrecords_v2_0_dev.pem;
Expand Down
2 changes: 1 addition & 1 deletion data/agencies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@
},
"monitor_agency_requests": [],
"specific_request_instructions": {
"text": "<div> <p>The Fire Department of the City of New York commonly provides access to the records to the public consistent with Federal, State and NYC laws. Below are instructions for obtaining commonly requested records by Mail, In Person or Online through Open Records, along with forms that are needed to complete the process. Note all mail requests must include a check or money order for applicable fees payable to '<strong>NYC Fire Department</strong>' (no cash accepted) and a stamped, self-addressed envelope. For in person record requests please visit:</p><p><strong>FDNY Public Records Unit</strong><br>9 MetroTech Center - First Floor<br>Brooklyn, N.Y. 11201<br>Use the FLATBUSH AVENUE ENTRANCE<br>Hours of Operation:<br>Monday - Friday 8:00am to 3:00pm (except Holidays)</p><p>Records provided through Open Records/FOIL will be redacted. If you require records with no redactions, then you must serve a 'So Ordered' subpoena. For further instructions please refer to <a href=https://www1.nyc.gov/site/fdny/about/resources/record-requests/records-request.page rel='noopener noreferrer' target=_blank>https://www1.nyc.gov/site/fdny/about/resources/record-requests/records-request.page</a>. </p><p>Please note the following records that you can obtain in person through the Public Records Unit:</p><ul> <li><strong>Copy of a Violation (Summons, Notice of violation, & Violation Order)</strong></li><li><strong>Violation Special Report</strong></li><li><strong>Fuel Tank Special Report (Environmental Assessment Report</strong></li><li><strong>Fire Incident Report</strong></li><li><strong>Ambulance Call Report/Pre-Hospital Care Report</strong></li><li><strong>Letter of Approval</strong></li><li><strong>Letter of Defect (only in person)</strong></li></ul> <hr> <h2>Building Related Reports</h2> <p>These records can be obtained by Mail, In Person or through Open Records (see dropdown below for instructions)</p><p><strong>Copy of a Violation</strong> <ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-copy-of-violation.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <p><strong>Violation Special Report</strong></p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-violation-special-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <p><strong>Fuel Tank Special Report/Environmental Assessment Report</strong></p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-fuel-tank-special-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <hr> <h2>Fire Reports</h2> <p><strong>Fire Incident Report</strong><br>These records can be obtained by Mail, In Person or Online through Open Records (see dropdown below for instructions). The Fire Incent Report must be obtained prior to requesting the Fire Marshal Investigation Report to make a determination if there is a Fire Marshal Investigation Report. </p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-fire-incident-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <p><strong>Fire Marshal Investigation Report</strong> The following record request can only be handled by mail.</p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/fire-marshal-incident-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <hr> <h2>Emergency Related Reports (FIRE/EMS)</h2> <p> These records can be obtained by Mail, In Person or Online through <a href=https://fdny.mypatientencounters.com/myrecord rel='noopener noreferrer' target=_blank>https://fdny.mypatientencounters.com/myrecord</a>. Please note ACR records cannot be obtained through Open Records. </p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-ambulance-call-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li><li>Step by step instructions for obtaining ACRs Online</li></ul> <p><strong>911 Call Report (CAD) (NOT Ambulance Call Report/ Pre-Hospital Care Report)</strong><br>These records can be obtained by Mail, In Person or Online through Open Records (see dropdown below for instructions). </p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-ambulance-call-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF) </ul> <h3><u>If your request does not fall under any of these categories please select 'Other Request' below</u></h3></div>"
"text": "<div> <p>The Fire Department of the City of New York commonly provides access to the records to the public consistent with Federal, State and NYC laws. Below are instructions for obtaining commonly requested records by Mail, In Person or Online through Open Records, along with forms that are needed to complete the process. Note all mail requests must include a check or money order for applicable fees payable to '<strong>NYC Fire Department</strong>' (no cash accepted) and a stamped, self-addressed envelope. For in person record requests please visit:</p><p><strong>FDNY Public Records Unit</strong><br>9 MetroTech Center - First Floor<br>Brooklyn, N.Y. 11201<br>Use the FLATBUSH AVENUE ENTRANCE<br>Hours of Operation:<br>Monday - Friday 8:00am to 2:30pm (except Holidays)</p><p>Records provided through Open Records/FOIL will be redacted. If you require records with no redactions, then you must serve a 'So Ordered' subpoena. For further instructions please refer to <a href=https://www1.nyc.gov/site/fdny/about/resources/record-requests/records-request.page rel='noopener noreferrer' target=_blank>https://www1.nyc.gov/site/fdny/about/resources/record-requests/records-request.page</a>. </p><p>Please note the following records that you can obtain in person through the Public Records Unit:</p><ul> <li><strong>Copy of a Violation (Summons, Notice of violation, & Violation Order)</strong></li><li><strong>Violation Special Report</strong></li><li><strong>Fuel Tank Special Report (Environmental Assessment Report</strong></li><li><strong>Fire Incident Report</strong></li><li><strong>Ambulance Call Report/Pre-Hospital Care Report</strong></li><li><strong>Letter of Approval</strong></li><li><strong>Letter of Defect (only in person)</strong></li></ul> <hr> <h2>Building Related Reports</h2> <p>These records can be obtained by Mail, In Person or through Open Records (see dropdown below for instructions)</p><p><strong>Copy of a Violation</strong> <ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-copy-of-violation.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <p><strong>Violation Special Report</strong></p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-violation-special-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <p><strong>Fuel Tank Special Report/Environmental Assessment Report</strong></p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-fuel-tank-special-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <hr> <h2>Fire Reports</h2> <p><strong>Fire Incident Report</strong><br>These records can be obtained by Mail, In Person or Online through Open Records (see dropdown below for instructions). The Fire Incent Report must be obtained prior to requesting the Fire Marshal Investigation Report to make a determination if there is a Fire Marshal Investigation Report. </p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-fire-incident-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <p><strong>Fire Marshal Investigation Report</strong> The following record request can only be handled by mail.</p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/fire-marshal-incident-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li></ul> <hr> <h2>Emergency Related Reports (FIRE/EMS)</h2> <p> These records can be obtained by Mail, In Person or Online through <a href=https://fdny.mypatientencounters.com/myrecord rel='noopener noreferrer' target=_blank>https://fdny.mypatientencounters.com/myrecord</a>. Please note ACR records cannot be obtained through Open Records. </p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-ambulance-call-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF)</li><li>Step by step instructions for obtaining ACRs Online</li></ul> <p><strong>911 Call Report (CAD) (NOT Ambulance Call Report/ Pre-Hospital Care Report)</strong><br>These records can be obtained by Mail, In Person or Online through Open Records (see dropdown below for instructions). </p><ul> <li><u><a href=https://www1.nyc.gov/assets/fdny/downloads/pdf/about/public-record-ambulance-call-report.pdf rel='noopener noreferrer' target=_blank>Get Record Request Form</a></u> (PDF) </ul> <h3><u>If your request does not fall under any of these categories please select 'Other Request' below</u></h3></div>"
}
},
"acronym": "FDNY"
Expand Down

0 comments on commit cb921c4

Please sign in to comment.