Skip to content

style: normalize html files (LF + trim) #12662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/layouts/_default/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ <h1 class="text-center">{{ if eq .CurrentSection .FirstSection }}{{ .Section | h
</article>
</div>
</div>
{{ end }}
{{ end }}
148 changes: 74 additions & 74 deletions docs/layouts/index.html
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
{{ define "main" }}
<section class="section container-fluid mt-n3 pb-3">
<div class="row justify-content-center">
<div class="col-lg-12 text-center">
<h1>{{ .Title }}</h1>
</div>
<div class="row justify-content-center text-center">Official documentation for DefectDojo Pro and Open-Source editions,<br>maintained by DefectDojo Inc. and the Open-Source community.</div>
<div class="col-lg-9 col-xl-8 text-center">
<p class="lead">{{ .Params.lead | safeHTML }}</p>
<a class="btn btn-primary btn-cta rounded-pill btn-lg my-3" href="/en/{{ if site.Params.doks.docsVersioning }}{{ site.Params.doks.docsVersion }}/{{ end }}about_defectdojo/about_docs/" role="button" style="--bs-btn-bg: #f2561d; --bs-btn-hover-bg: #f28d1d;">Open The Docs</a>
{{ .Content }}
</div>
</div>
</section>
<section class="section section-md section-features">
<div class="container">
<div class="row justify-content-center text-center">
<div class="col-lg-5" style="border-style: solid; border-radius: 2px;">
<h2 class="h4">Getting Started</h2>
<p>Start your journey with DefectDojo with our <a href="/en/about_defectdojo/new_user_checklist/">New User Checklist</a>.</p>
</div>
<div class="col-lg-5" style="border-style: solid; border-radius: 2px;">
<h2 class="h4">Import Data</h2>
<p>Learn how to import data from 190+ supported security tools <a href="/en/connecting_your_tools/import_intro/">here</a>.</p>
</div>
<div class="col-lg-5" style="border-style: solid; border-radius: 2px;">
<h2 class="h4">Create Reports</h2>
<p>Use the <a href="en/share_your_findings/pro_reports/using_the_report_builder/">Report Builder</a> to present customizable reports of Findings.</p>
</div>
</div>
</div>
</section>
{{ end }}
{{ define "sidebar-prefooter" }}
{{ if site.Params.doks.backgroundDots -}}
<div class="d-flex justify-content-start">
<div class="bg-dots"></div>
</div>
{{ end -}}
{{ if eq $.Site.Language.LanguageName "English" }}
<section class="section section-md section-features">
<div class="container">
<div class="row justify-content-center text-center">
<div class="col-lg-5">
<h2 class="h4">Join the Dojo community</h2>
<p>Check out live events, upcoming features and connect with other security professionals on our <a href="https://defectdojo.com/community">Community Page</a>.</p>
</div>
<div class="col-lg-5">
<h2 class="h4">Sign up for a trial</h2>
<p>Ready to go Pro? Request a quote from the DefectDojo Inc team <a href="https://defectdojo.com/pricing">here</a>.</p>
</div>
<div class="col-lg-5">
<h2 class="h4">Reach out to Support</h2>
<p>Need some help? Pro users can send an email to support@defectdojo.com</p>
</div>
</div>
</div>
</section>
{{ end }}
{{ end }}
{{ define "sidebar-footer" }}
{{ if site.Params.doks.sectionFooter -}}
<section class="section section-md container-fluid bg-light">
<div class="row justify-content-center text-center">
<div class="col-lg-7">
<h2 class="mt-2">Start building with Doks today</h2>
<a class="btn btn-primary rounded-pill px-4 my-2" href="/docs/{{ if site.Params.doks.docsVersioning }}{{ site.Params.doks.docsVersion }}/{{ end }}prologue/introduction/" role="button">{{ i18n "get-started" }}</a>
</div>
</div>
</section>
{{ end -}}
{{ end }}
{{ define "main" }}
<section class="section container-fluid mt-n3 pb-3">
<div class="row justify-content-center">
<div class="col-lg-12 text-center">
<h1>{{ .Title }}</h1>
</div>
<div class="row justify-content-center text-center">Official documentation for DefectDojo Pro and Open-Source editions,<br>maintained by DefectDojo Inc. and the Open-Source community.</div>
<div class="col-lg-9 col-xl-8 text-center">
<p class="lead">{{ .Params.lead | safeHTML }}</p>
<a class="btn btn-primary btn-cta rounded-pill btn-lg my-3" href="/en/{{ if site.Params.doks.docsVersioning }}{{ site.Params.doks.docsVersion }}/{{ end }}about_defectdojo/about_docs/" role="button" style="--bs-btn-bg: #f2561d; --bs-btn-hover-bg: #f28d1d;">Open The Docs</a>
{{ .Content }}
</div>
</div>
</section>
<section class="section section-md section-features">
<div class="container">
<div class="row justify-content-center text-center">
<div class="col-lg-5" style="border-style: solid; border-radius: 2px;">
<h2 class="h4">Getting Started</h2>
<p>Start your journey with DefectDojo with our <a href="/en/about_defectdojo/new_user_checklist/">New User Checklist</a>.</p>
</div>
<div class="col-lg-5" style="border-style: solid; border-radius: 2px;">
<h2 class="h4">Import Data</h2>
<p>Learn how to import data from 190+ supported security tools <a href="/en/connecting_your_tools/import_intro/">here</a>.</p>
</div>
<div class="col-lg-5" style="border-style: solid; border-radius: 2px;">
<h2 class="h4">Create Reports</h2>
<p>Use the <a href="en/share_your_findings/pro_reports/using_the_report_builder/">Report Builder</a> to present customizable reports of Findings.</p>
</div>
</div>
</div>
</section>
{{ end }}

{{ define "sidebar-prefooter" }}
{{ if site.Params.doks.backgroundDots -}}
<div class="d-flex justify-content-start">
<div class="bg-dots"></div>
</div>
{{ end -}}
{{ if eq $.Site.Language.LanguageName "English" }}
<section class="section section-md section-features">
<div class="container">
<div class="row justify-content-center text-center">
<div class="col-lg-5">
<h2 class="h4">Join the Dojo community</h2>
<p>Check out live events, upcoming features and connect with other security professionals on our <a href="https://defectdojo.com/community">Community Page</a>.</p>
</div>
<div class="col-lg-5">
<h2 class="h4">Sign up for a trial</h2>
<p>Ready to go Pro? Request a quote from the DefectDojo Inc team <a href="https://defectdojo.com/pricing">here</a>.</p>
</div>
<div class="col-lg-5">
<h2 class="h4">Reach out to Support</h2>
<p>Need some help? Pro users can send an email to support@defectdojo.com</p>
</div>
</div>
</div>
</section>
{{ end }}
{{ end }}

{{ define "sidebar-footer" }}
{{ if site.Params.doks.sectionFooter -}}
<section class="section section-md container-fluid bg-light">
<div class="row justify-content-center text-center">
<div class="col-lg-7">
<h2 class="mt-2">Start building with Doks today</h2>
<a class="btn btn-primary rounded-pill px-4 my-2" href="/docs/{{ if site.Params.doks.docsVersioning }}{{ site.Params.doks.docsVersion }}/{{ end }}prologue/introduction/" role="button">{{ i18n "get-started" }}</a>
</div>
</div>
</section>
{{ end -}}
{{ end }}
26 changes: 13 additions & 13 deletions docs/layouts/partials/footer/script-footer-custom.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{{/* Put your custom <script></script> tags here */}}
{{/* EXAMPLE - only load script for production
{{ if eq (hugo.Environment) "production" -}}
{{ partial "footer/esbuild" (dict "src" "js/instantpage.js" "load" "async" "transpile" false) -}}
{{ end -}}
*/}}
{{/* EXAMPLE - only load script for a page type e.g. contact or gallery
{{ if eq .Type "gallery" -}}
{{ partial "footer/esbuild" (dict "src" "js/gallery.js" "load" "async" "transpile" false) -}}
{{ end -}}
*/}}
{{/* Put your custom <script></script> tags here */}}

{{/* EXAMPLE - only load script for production
{{ if eq (hugo.Environment) "production" -}}
{{ partial "footer/esbuild" (dict "src" "js/instantpage.js" "load" "async" "transpile" false) -}}
{{ end -}}
*/}}

{{/* EXAMPLE - only load script for a page type e.g. contact or gallery
{{ if eq .Type "gallery" -}}
{{ partial "footer/esbuild" (dict "src" "js/gallery.js" "load" "async" "transpile" false) -}}
{{ end -}}
*/}}
2 changes: 1 addition & 1 deletion docs/layouts/partials/head/custom-head.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!-- Custom head -->
<!-- Custom head -->
2 changes: 1 addition & 1 deletion docs/layouts/partials/head/resource-hints.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<link rel="preload" href="{{ "fonts/vendor/jost/jost-v4-latin-500.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="{{ "fonts/vendor/jost/jost-v4-latin-700.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="{{ "fonts/worksans/work-sans-v19-latin-regular.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="{{ "fonts/worksans/work-sans-v19-latin-500.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="{{ "fonts/worksans/work-sans-v19-latin-500.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
12 changes: 6 additions & 6 deletions docs/layouts/partials/head/script-header.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Insert scripts NOT needed by stylesheets here -->
<!-- Start of Reo Javascript -->
<script type="text/javascript">
!function(){var e,t,n;e="a92cfcfa51eca96",t=function(){Reo.init({clientID:"a92cfcfa51eca96"})},(n=document.createElement("script")).src="https://static.reo.dev/"+e+"/reo.js",n.async=!0,n.onload=t,document.head.appendChild(n)}();
</script>
<!-- End of Reo Javascript -->
<!-- Insert scripts NOT needed by stylesheets here -->
<!-- Start of Reo Javascript -->
<script type="text/javascript">
!function(){var e,t,n;e="a92cfcfa51eca96",t=function(){Reo.init({clientID:"a92cfcfa51eca96"})},(n=document.createElement("script")).src="https://static.reo.dev/"+e+"/reo.js",n.async=!0,n.onload=t,document.head.appendChild(n)}();
</script>
<!-- End of Reo Javascript -->
4 changes: 2 additions & 2 deletions docs/layouts/partials/header/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

<!-- Site title -->
<span id="hs_cos_wrapper_header_logo" class="hs_cos_wrapper hs_cos_wrapper_widget hs_cos_wrapper_type_linked_image" data-hs-cos-general-type="widget" data-hs-cos-type="linked_image" style="border: 2px #003864; border-radius: 5px; border-style:solid; background-color: #003864; display: block; justify-content: center;">


<a href="/index.html"><img src="https://defectdojo.com/hs-fs/hubfs/DefectDojo_Logo_Color.png?width=200&?height=20?name=DefectDojo_Logo_Color.png" class="hs-image-widget" width="184" style="max-width: 110%; height: auto; background-color: #003864; display:block; margin-top: 2%; margin-bottom:2%;" alt="DefectDojo_Logo_Color" title="DefectDojo_Logo_Color" srcset="https://defectdojo.com/hs-fs/hubfs/DefectDojo_Logo_Color.png?width=1000?height=92?name=DefectDojo_Logo_Color.png 1000w, https://defectdojo.com/hs-fs/hubfs/DefectDojo_Logo_Color.png?width=2000?height=184?name=DefectDojo_Logo_Color.png 2000w, https://defectdojo.com/hs-fs/hubfs/DefectDojo_Logo_Color.png?width=3000?height=276?name=DefectDojo_Logo_Color.png 3000w, https://defectdojo.com/hs-fs/hubfs/DefectDojo_Logo_Color.png?width=4000?height=368&amp;name=DefectDojo_Logo_Color.png 4000w, https://defectdojo.com/hs-fs/hubfs/DefectDojo_Logo_Color.png?width=5000?height=460?name=DefectDojo_Logo_Color.png 5000w, https://defectdojo.com/hs-fs/hubfs/DefectDojo_Logo_Color.png?width=6000?height=552?name=DefectDojo_Logo_Color.png 6000w" sizes="(max-width: 2000px) 100vw, 2000px"></span></a>

<!-- FlexSearch mobile -->
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ <h2>
</div>
<hr/>
<p class="lightgrey">404 Not Found</p>
{% endblock %}
{% endblock %}
6 changes: 3 additions & 3 deletions dojo/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ <h3 class="no-margin-top" style="padding-bottom: 5px;">
<div class="modal fade" id="sessionTimeoutModal" tabindex="-1" role="dialog" aria-labelledby="sessionModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
Expand Down Expand Up @@ -1113,7 +1113,7 @@ <h4 class="modal-title" id="sessionModalLabel">Session Expiring Soon</h4>
function() { $(this).popover('show'); }, // hover
function() { $(this).popover('hide'); } // unhover
);

{% if request.user.is_authenticated %}
function session_notifcation() {
var warningTime = "{{ session_notify_time|default:0|escapejs }}"; // When the warning will show
Expand All @@ -1124,7 +1124,7 @@ <h4 class="modal-title" id="sessionModalLabel">Session Expiring Soon</h4>
$('#sessionTimeoutModal').modal('show');
}, Math.min(timeout, 2147483) * 1000); // Do not allow a buffer overflow here

}
}
session_notifcation();
$('#sessionTimeoutModal').on('show.bs.modal', function (event) {
$(this).attr('aria-hidden', 'false');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ <h3>Add Choice</h3>
{% block postscript %}
{{ block.super }}
<script type="application/javascript" src="{{ STATIC_URL }}admin/js/admin/RelatedObjectLookups.js"></script>
{% endblock %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ <h3>Link Questionnaire to New Engagement</h3>
</div>
</div>
</form>
{% endblock %}
{% endblock %}
4 changes: 2 additions & 2 deletions dojo/templates/defectDojo-engagement-survey/add_survey.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h3>Add Unlinked Questionnaire</h3>
<input class="btn btn-primary" type="submit" label="add_questionnaire" name="add_questionnaire" value="Add Questionnaire" />
{% if engagement %}
<input class="btn btn-primary" type="submit" label="respond_survey" name="respond_survey" value="Add Questionnaire and Respond" />
{% endif %}
{% endif %}
</div>
</div>
</form>
Expand All @@ -23,4 +23,4 @@ <h3>Add Unlinked Questionnaire</h3>
All available questionnaires have been added to this engagement.
</p>
{% endif %}
{% endblock %}
{% endblock %}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% if surveys %}
<a title="Add Questionnaire" class="pull-right btn btn-sm btn-primary" href="/engagement/{{eng.id}}/add_questionnaire"><span class="fa-solid fa-plus"></span></a>
{% endif %}
{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ <h3>Assign User to Questionnaire {{ survey }}</h3>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<a class="btn btn-primary" href="{{request.META.HTTP_REFERER}}"> Return </a>
<input class="btn btn-primary" type="submit" label="assign_questionnaire" name="assign_questionnaire" value="Assign Questionnaire" />
<input class="btn btn-primary" type="submit" label="assign_questionnaire" name="assign_questionnaire" value="Assign Questionnaire" />
</div>
</div>
</form>
{% endblock %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ <h3>Create New Questionnaire</h3>
</div>
</form>

{% endblock %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@
<script type="application/javascript">
$(function () {
$("*[data-type='choice']").parents('.form-group').hide();

if ($('#id_type').val() == 'choice'){
$("*[data-type='choice']").parents('.form-group').show();
}
if ($('#id_type').val() == 'text'){
$("*[data-type='choice']").parents('.form-group').hide();
}

$('#id_type').change(function(){
$("*[data-type='choice']").parents('.form-group').hide();
if (this.value == 'choice'){
Expand All @@ -85,4 +85,4 @@
});
});
</script>
{% endblock postscript %}
{% endblock postscript %}
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ <h3>Edit Question: {{ question.name }}</h3>
});
</script>
<script type="application/javascript" src="{{ STATIC_URL }}admin/js/admin/RelatedObjectLookups.js"></script>
{% endblock %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ <h3>Edit Questionnaire Questions ({{ survey.name }})</h3>
});
});
</script>
{% endblock postscript %}
{% endblock postscript %}
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ <h3>Link Questionnaire to Existing Engagement</h3>
</div>
</div>
</form>
{% endblock %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
{% else %}
No questionnaires found.
{% endif %}

<div class="panel panel-default">
<div class="panel-heading">
General Questionnaires
Expand All @@ -66,9 +66,9 @@
{% for survey in general %}
<tr>
<td>{{ survey.survey.name }}</td>
<td algin="center">{{ survey.num_responses }}</td>
<td algin="center">{{ survey.num_responses }}</td>
<td>{{ survey.generated }}</td>
<td>{{ survey.expiration }}</td>
<td>{{ survey.expiration }}</td>
<td>
<div class="btn-group">
<button type="button" class="btn btn-sm btn-secondary" data-toggle="modal"
Expand Down
Loading