Skip to content

add missing html tag "</p>" / clean-up template to get smaller and cleaner output #470

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.

Sign up for GitHub

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

Merged
chinyeungli merged 4 commits into from
Aug 30, 2021
Merged

add missing html tag "</p>" / clean-up template to get smaller and cleaner output #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
214a51a
- add missing html tag "</p>"
ddmesh Aug 26, 2021
5d79f70
create new "expected_default_attrib.html" to match changes in default…
ddmesh Aug 26, 2021
07fb1c3
template: minor indentation fixes
ddmesh Aug 26, 2021
196cbf1
change tab to spaces
ddmesh Aug 30, 2021
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
144 changes: 67 additions & 77 deletions templates/default_html.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,84 +30,74 @@ See "get_license_file_key" in `attrib.py` for more information
</style>
<title>Open Source Software Information</title>
</head>

<body>
<h1>OPEN SOURCE SOFTWARE INFORMATION</h1>
<div>
<p>Licenses, acknowledgments and required copyright notices for
open source components:</p>
<div> <p>Licenses, acknowledgments and required copyright notices for open source components:</p> </div>
<div class="oss-table-of-contents">
{% for about_object in abouts %}
<p><a href="#component_{{ loop.index0 }}">{{ about_object.name.value }}{% if about_object.version.value %} {{ about_object.version.value }}{% endif %}</a></p>
{% endfor %}
</div>

<div class="oss-table-of-contents">
{% for about_object in abouts %}
<p><a href="#component_{{ loop.index0 }}">{{ about_object.name.value }}{% if about_object.version.value %} {{ about_object.version.value }}{% endif %}</a></p>
{% endfor %}
</div>

<hr/>


{% for about_object in abouts %}
<div class="oss-component" id="component_{{ loop.index0 }}">
<h3 class="component-name">{{ about_object.name.value }}
{% if about_object.version.value %}{{ about_object.version.value }}{% endif %}
</h3>
{% if about_object.license_expression.value %}
<p>This component is licensed under
{{ about_object.license_expression.value }}
{% endif %}
{% if about_object.copyright.value %}
<pre>{{about_object.copyright.value}}</pre>
{% endif %}
{% if about_object.notice_file.value %}
{% for notice in about_object.notice_file.value %}
<pre class="component-notice">{{ about_object.notice_file.value[notice] }}</pre>
{% endfor %}
{% endif %}
{% if about_object.license_key.value %}
{% for license_key in about_object.license_key.value %}
{% if license_key in common_licenses %}
<p>Full text of
<a class="{{ license_key }}" href="#component-license-{{ license_key }}">
{{ license_key }}
</a>
is available at the end of this document.</p>
{% endif %}
{% endfor %}
{% if about_object.license_file.value %}
{% for lic_file_name in about_object.license_file.value %}
{% if not license_file_key_and_license_key[license_file_name_and_license_file_key[lic_file_name]] in common_licenses %}
{% if about_object.license_file.value[lic_file_name] %}
<pre>{{ about_object.license_file.value[lic_file_name] | e}}</pre>
{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% else %}
{% if about_object.license_file.value %}
{% for lic_file_name in about_object.license_file.value %}
{% if about_object.license_file.value[lic_file_name] %}
<pre>{{ about_object.license_file.value[lic_file_name] | e}}</pre>
{% endif %}
{% endfor %}
{% endif %}
{% endif %}
</div>
{% endfor %}

<hr/>

<h3>Common Licenses Used in This Product</h3>

{% for key in license_file_key_and_context %}
{% if key in common_licenses %}
<h3 id="component-license-{{ key }}">{{ key }}</h3>
<pre>{{ license_file_key_and_context[key]|e }}</pre>
{% endif %}
{% endfor %}

<h3><a id="End">End</a></h3>
<i>This file was generated with AboutCode Toolkit version: {{ tkversion }} on: {{ utcnow }} (UTC)</i>
</body>
<hr/>
{% for about_object in abouts %}
<div class="oss-component" id="component_{{ loop.index0 }}">
<h3 class="component-name">{{ about_object.name.value }} {% if about_object.version.value %}{{ about_object.version.value }}{% endif %} </h3>
{% if about_object.license_expression.value %}
<p>This component is licensed under {{ about_object.license_expression.value }}</p>
{% endif %}
{% if about_object.copyright.value %}
<pre>
{{about_object.copyright.value}}
</pre>
{% endif %}
{% if about_object.notice_file.value %}
{% for notice in about_object.notice_file.value %}
<pre class="component-notice">
{{ about_object.notice_file.value[notice] }}
</pre>
{% endfor %}
{% endif %}
{% if about_object.license_key.value %}
{% for license_key in about_object.license_key.value %}
{% if license_key in common_licenses %}
<p>Full text of <a class="{{ license_key }}" href="#component-license-{{ license_key }}"> {{ license_key }}</a> is available at the end of this document.</p>
{% endif %}
{% endfor %}
{% if about_object.license_file.value %}
{% for lic_file_name in about_object.license_file.value %}
{% if not license_file_key_and_license_key[license_file_name_and_license_file_key[lic_file_name]] in common_licenses %}
{% if about_object.license_file.value[lic_file_name] %}
<pre>
{{ about_object.license_file.value[lic_file_name] | e}}
</pre>
{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% else %}
{% if about_object.license_file.value %}
{% for lic_file_name in about_object.license_file.value %}
{% if about_object.license_file.value[lic_file_name] %}
<pre>
{{ about_object.license_file.value[lic_file_name] | e}}
</pre>
{% endif %}
{% endfor %}
{% endif %}
{% endif %}
</div>
{% endfor %}
<hr/>
<h3>Common Licenses Used in This Product</h3>
{% for key in license_file_key_and_context %}
{% if key in common_licenses %}
<h3 id="component-license-{{ key }}">{{ key }}</h3>
<pre>
{{ license_file_key_and_context[key]|e }}
</pre>
{% endif %}
{% endfor %}
<h3><a id="End">End</a></h3>
<i>This file was generated with AboutCode Toolkit version: {{ tkversion }} on: {{ utcnow }} (UTC)</i>
</body>
</html>

61 changes: 24 additions & 37 deletions tests/testdata/test_attrib/gen_default_template/expected_default_attrib.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,30 @@
</style>
<title>Open Source Software Information</title>
</head>

<body>
<h1>OPEN SOURCE SOFTWARE INFORMATION</h1>
<div>
<p>Licenses, acknowledgments and required copyright notices for
open source components:</p>
<div> <p>Licenses, acknowledgments and required copyright notices for open source components:</p> </div>
<div class="oss-table-of-contents">

<p><a href="#component_0">Apache HTTP Server 2.4.3</a></p>

</div>

<div class="oss-table-of-contents">

<p><a href="#component_0">Apache HTTP Server 2.4.3</a></p>

</div>

<hr/>



<div class="oss-component" id="component_0">
<h3 class="component-name">Apache HTTP Server
2.4.3
</h3>






</div>


<hr/>

<h3>Common Licenses Used in This Product</h3>



<h3><a id="End">End</a></h3>
</body>
</html>
<hr/>

<div class="oss-component" id="component_0">
<h3 class="component-name">Apache HTTP Server 2.4.3 </h3>






</div>

<hr/>
<h3>Common Licenses Used in This Product</h3>

<h3><a id="End">End</a></h3>
<i>This file was generated with AboutCode Toolkit version: 6.0.0 on: 2021-08-30 10:58:38.548879 (UTC)</i>
</body>
</html>