diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e8bdbfce7..123294fc8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,11 @@ v32.6.1 (unreleased) - Add support for webhook subscriptions in project clone. https://github.com/nexB/scancode.io/pull/910 +- Add resources license expression summary panel in the project details view. + This panel displays the list of licenses detected in the project and include links + to the resources list. + https://github.com/nexB/scancode.io/pull/355 + v32.6.0 (2023-08-29) -------------------- diff --git a/scanpipe/templates/scanpipe/base.html b/scanpipe/templates/scanpipe/base.html index 91b98aeb6..3c99b1c39 100644 --- a/scanpipe/templates/scanpipe/base.html +++ b/scanpipe/templates/scanpipe/base.html @@ -47,9 +47,9 @@ .is-tooltip .dropdown-content {background-color: #363636;} .is-tooltip .dropdown-item {font-weight: normal; color: #fff;} .ace-marker {position: absolute; z-index: 3; background: #ffe9b3;} - .break-all {word-break: break-all;} - .break-word {word-break: break-word;} - .break-normal {word-break: normal;} + .break-all {word-break: break-all !important;} + .break-word {word-break: break-word !important;} + .break-normal {word-break: normal !important;} .nowrap {white-space: nowrap;} #content-header input[name="search"] {width: 225px;} button.as-link {height: auto; line-height: initial; font-size: inherit;} diff --git a/scanpipe/templates/scanpipe/includes/project_summary_level.html b/scanpipe/templates/scanpipe/includes/project_summary_level.html index d847cdeb3..2dad4e586 100644 --- a/scanpipe/templates/scanpipe/includes/project_summary_level.html +++ b/scanpipe/templates/scanpipe/includes/project_summary_level.html @@ -45,7 +45,7 @@
Resources
{% if project.resource_count %} - + {{ project.resource_count|intcomma }} {% else %} diff --git a/scanpipe/templates/scanpipe/includes/resource_chart_column.html b/scanpipe/templates/scanpipe/includes/resource_chart_column.html index aea01f97a..7358aa89e 100644 --- a/scanpipe/templates/scanpipe/includes/resource_chart_column.html +++ b/scanpipe/templates/scanpipe/includes/resource_chart_column.html @@ -1,6 +1,6 @@
+ Resources detected license expressions +
+ {% for license_expression, count in resource_licenses_summary.items %} + + {{ license_expression|default:'no licenses' }} + {{ count|intcomma }} + + {% endfor %} + \ No newline at end of file diff --git a/scanpipe/templates/scanpipe/includes/resource_status_summary.html b/scanpipe/templates/scanpipe/includes/resource_status_summary.html index e5a27e266..c0abf8a1d 100644 --- a/scanpipe/templates/scanpipe/includes/resource_status_summary.html +++ b/scanpipe/templates/scanpipe/includes/resource_status_summary.html @@ -4,13 +4,9 @@ Resources status {% for status, count in resource_status_summary.items %} - - {% if status %} - {{ status }} - {% else %} - (no status) - {% endif %} - : {{ count|intcomma }} + + {{ status|default:'no status' }} + {{ count|intcomma }} {% endfor %} \ No newline at end of file diff --git a/scanpipe/templates/scanpipe/project_detail.html b/scanpipe/templates/scanpipe/project_detail.html index 809101a13..b31df3d96 100644 --- a/scanpipe/templates/scanpipe/project_detail.html +++ b/scanpipe/templates/scanpipe/project_detail.html @@ -85,20 +85,28 @@