Skip to content

Commit a22bcb8

Browse files
committed
Refine the tooltip display on disabled Scan button #222
Signed-off-by: tdruez <[email protected]>
1 parent bda0db6 commit a22bcb8

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

product_portfolio/templates/product_portfolio/product_details.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,15 @@
4848
{% endif %}
4949
{% if has_scan_all_packages %}
5050
<div class="dropdown-header">Scan</div>
51-
<a class="dropdown-item{% if not tabsets.Inventory %} disabled{% endif %}" href="#" data-bs-toggle="modal" data-bs-target="#scan-all-packages-modal"><i class="fas fa-barcode"></i> {% trans 'Scan all Packages' %}</a>
51+
<a class="dropdown-item{% if not tabsets.Inventory %} disabled{% endif %}" href="#" data-bs-toggle="modal" data-bs-target="#scan-all-packages-modal">
52+
<i class="fas fa-barcode"></i> <strong>Scan</strong>
53+
</a>
5254
{% endif %}
53-
{% if request.user.dataspace.enable_purldb_access %}
55+
{% if purldb_enabled %}
5456
<div class="dropdown-header">PurlDB</div>
55-
<a class="dropdown-item" id="improve_from_purldb" href="{{ object.get_improve_packages_from_purldb_url }}"><i class="fas fa-database"></i> {% trans 'Improve Packages from PurlDB' %}</a>
57+
<a class="dropdown-item" id="improve_from_purldb" href="{{ object.get_improve_packages_from_purldb_url }}">
58+
<i class="fas fa-database"></i> <strong>Improve</strong> Packages from PurlDB
59+
</a>
5660
{% endif %}
5761
</div>
5862
</div>
@@ -132,7 +136,7 @@
132136
{% block extrastyle %}
133137
{{ block.super }}
134138
{% if has_edit_productpackage or has_edit_productcomponent %}
135-
<link href="{% static "awesomplete/awesomplete-1.1.5.css" %}" rel="stylesheet" integrity="sha384-pfLLVHVEI786OaichPaTYxVzYEhaODDVjI6M6aNF9XN6G5Xtcw54aAXnBqtRw0Br" crossorigin="anonymous">
139+
<link href="{% static 'awesomplete/awesomplete-1.1.5.css' %}" rel="stylesheet" integrity="sha384-pfLLVHVEI786OaichPaTYxVzYEhaODDVjI6M6aNF9XN6G5Xtcw54aAXnBqtRw0Br" crossorigin="anonymous">
136140
{% endif %}
137141
{% endblock %}
138142

product_portfolio/templates/product_portfolio/tabs/tab_inventory.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,11 @@
150150
{% elif relation.package %}
151151
{% with relation.package.download_url as download_url %}
152152
<span{% if download_url %} data-bs-toggle="modal" data-bs-target="#scan-package-modal" data-package-scan-url="{% url 'component_catalog:package_scan' user.dataspace relation.package.uuid %}"{% endif %}>
153-
<button type="button" class="btn btn-outline-dark btn-sm{% if not download_url %} disabled{% endif %}" data-bs-toggle="tooltip" title="{% if download_url %}{% trans 'Submit Scan Request' %}{% else %}{% trans 'Download URL not available' %}{% endif %}"><i class="fas fa-barcode"></i> Scan</button>
153+
<span data-bs-toggle="tooltip" title="{% if download_url %}{% trans 'Submit Scan Request' %}{% else %}{% trans 'Download URL not available' %}{% endif %}">
154+
<button type="button" class="btn btn-outline-dark btn-sm{% if not download_url %} disabled{% endif %}">
155+
<i class="fas fa-barcode"></i> Scan
156+
</button>
157+
</span>
154158
</span>
155159
{% endwith %}
156160
{% endif %}

0 commit comments

Comments
 (0)