diff --git a/templates/default_html.template b/templates/default_html.template index 577da122..64e7d326 100644 --- a/templates/default_html.template +++ b/templates/default_html.template @@ -30,84 +30,74 @@ See "get_license_file_key" in `attrib.py` for more information Open Source Software Information -

OPEN SOURCE SOFTWARE INFORMATION

-
-

Licenses, acknowledgments and required copyright notices for - open source components:

+

Licenses, acknowledgments and required copyright notices for open source components:

+
+{% for about_object in abouts %} +

{{ about_object.name.value }}{% if about_object.version.value %} {{ about_object.version.value }}{% endif %}

+{% endfor %}
- -
- {% for about_object in abouts %} -

{{ about_object.name.value }}{% if about_object.version.value %} {{ about_object.version.value }}{% endif %}

- {% endfor %} -
- -
- - - {% for about_object in abouts %} -
-

{{ about_object.name.value }} - {% if about_object.version.value %}{{ about_object.version.value }}{% endif %} -

- {% if about_object.license_expression.value %} -

This component is licensed under - {{ about_object.license_expression.value }} - {% endif %} - {% if about_object.copyright.value %} - 

{{about_object.copyright.value}}
- {% endif %} - {% if about_object.notice_file.value %} - {% for notice in about_object.notice_file.value %} - 
{{ about_object.notice_file.value[notice] }}
- {% endfor %} - {% endif %} - {% if about_object.license_key.value %} - {% for license_key in about_object.license_key.value %} - {% if license_key in common_licenses %} -

Full text of - - {{ license_key }} - - is available at the end of this document.

- {% 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] %} - 
{{ about_object.license_file.value[lic_file_name] | e}}
- {% 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] %} - 
{{ about_object.license_file.value[lic_file_name] | e}}
- {% endif %} - {% endfor %} - {% endif %} - {% endif %} -
- {% endfor %} - -
- -

Common Licenses Used in This Product

- - {% for key in license_file_key_and_context %} - {% if key in common_licenses %} -

{{ key }}

- 
{{ license_file_key_and_context[key]|e }}
- {% endif %} - {% endfor %} - -

End

- This file was generated with AboutCode Toolkit version: {{ tkversion }} on: {{ utcnow }} (UTC) - +
+{% for about_object in abouts %} +
+

{{ about_object.name.value }} {% if about_object.version.value %}{{ about_object.version.value }}{% endif %}

+{% if about_object.license_expression.value %} +

This component is licensed under {{ about_object.license_expression.value }}

+{% endif %} +{% if about_object.copyright.value %} + 
+{{about_object.copyright.value}}
+
+{% endif %} +{% if about_object.notice_file.value %} +{% for notice in about_object.notice_file.value %} + 
+{{ about_object.notice_file.value[notice] }}
+
+{% endfor %} +{% endif %} +{% if about_object.license_key.value %} +{% for license_key in about_object.license_key.value %} +{% if license_key in common_licenses %} +

Full text of {{ license_key }} is available at the end of this document.

+{% 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] %} + 
+{{ about_object.license_file.value[lic_file_name] | e}}
+
+{% 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] %} + 
+{{ about_object.license_file.value[lic_file_name] | e}}
+
+{% endif %} +{% endfor %} +{% endif %} +{% endif %} +
+{% endfor %} +
+

Common Licenses Used in This Product

+{% for key in license_file_key_and_context %} +{% if key in common_licenses %} +

{{ key }}

+ 
+{{ license_file_key_and_context[key]|e }}
+
+{% endif %} +{% endfor %} +

End

+ This file was generated with AboutCode Toolkit version: {{ tkversion }} on: {{ utcnow }} (UTC) + - diff --git a/tests/testdata/test_attrib/gen_default_template/expected_default_attrib.html b/tests/testdata/test_attrib/gen_default_template/expected_default_attrib.html index 415b4966..adcf6c0f 100644 --- a/tests/testdata/test_attrib/gen_default_template/expected_default_attrib.html +++ b/tests/testdata/test_attrib/gen_default_template/expected_default_attrib.html @@ -9,43 +9,30 @@ Open Source Software Information -

OPEN SOURCE SOFTWARE INFORMATION

-
-

Licenses, acknowledgments and required copyright notices for - open source components:

+

Licenses, acknowledgments and required copyright notices for open source components:

+
+ +

Apache HTTP Server 2.4.3

+
- -
- -

Apache HTTP Server 2.4.3

- -
- -
- - - -
-

Apache HTTP Server - 2.4.3 -

- - - - - - -
- - -
- -

Common Licenses Used in This Product

- - - -

End

- - +
+ +
+

Apache HTTP Server 2.4.3

+ + + + + + +
+ +
+

Common Licenses Used in This Product

+ +

End

+ This file was generated with AboutCode Toolkit version: 6.0.0 on: 2021-08-30 10:58:38.548879 (UTC) + + \ No newline at end of file