From 320a07a91b3bfaef2342d82308b4dc91cceddfd4 Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Mon, 10 Jul 2023 13:06:37 +0200
Subject: [PATCH] Started migrating labels to badges
---
ckanext/odsh/fanstatic/odsh.css | 29 ++++++-------------
.../odsh/templates/datarequests/comment.html | 4 +--
ckanext/odsh/templates/datarequests/show.html | 4 +--
.../snippets/datarequest_item.html | 4 +--
ckanext/odsh/templates/package/read.html | 2 +-
.../package/snippets/resource_info.html | 2 +-
.../package/snippets/resource_item.html | 2 +-
.../odsh/templates/snippets/package_item.html | 8 ++---
8 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/ckanext/odsh/fanstatic/odsh.css b/ckanext/odsh/fanstatic/odsh.css
index 75044105..bbca0ff4 100644
--- a/ckanext/odsh/fanstatic/odsh.css
+++ b/ckanext/odsh/fanstatic/odsh.css
@@ -937,9 +937,6 @@ ul.dataset-resources {
.dataformat-label {
background-color: #003064 !important;
- padding: 3px 3px 1px 3px;
- font-size: 14px;
- margin-right: 4px;
}
@@ -993,10 +990,6 @@ a.odsh-star:hover {
vertical-align: middle;
}
-.dataformat-label:hover {
- background-color: #d4004b !important;
-}
-
.dataset-info p {
font-size: 12px;
margin-bottom: 1px;
@@ -1490,15 +1483,15 @@ body {
}
}
-.toolbar .breadcrumb>li+li::before {
- padding: 0 9px;
+.toolbar .breadcrumb li:not(:first-child)::before {
+ float: left;
+ padding-right: 9px;
background-image: url(/base/images/arrow-right.png);
background-repeat: no-repeat;
background-size: 8px 12px;
- background-position: 4px 1px;
- display: inline-block;
+ background-position: 4px 5px;
width: 12px;
- height: 12px;
+ height: 21px;
content: "";
}
@@ -1663,10 +1656,6 @@ body {
text-align: center;
}
-.dataformat-label:hover {
- background-color: #d4004b !important;
-}
-
.resource-title {
float: left;
margin-left: 5px;
@@ -2843,17 +2832,17 @@ p.package-info-issued {
}
-.label.label-open {
+.badge.label-open {
color: white;
background-color: #003064;
}
-.label.label-closed {
+.badge.label-closed {
color: white;
background-color: #DBDBDB;
}
-.datarequest .dataset-heading .label {
+.datarequest .dataset-heading .badge {
vertical-align: top;
}
@@ -2947,7 +2936,7 @@ p.package-info-issued {
display: inline-block;
}
-.datarequest .additional-info .label {
+.datarequest .additional-info .badge {
margin: 8px;
}
diff --git a/ckanext/odsh/templates/datarequests/comment.html b/ckanext/odsh/templates/datarequests/comment.html
index 01d29f12..8551f193 100644
--- a/ckanext/odsh/templates/datarequests/comment.html
+++ b/ckanext/odsh/templates/datarequests/comment.html
@@ -56,11 +56,11 @@
<div >{{ _('Status') }}:
<div class="dataset-details">
{% if c.datarequest.get('closed', False) %}
- <div class="label label-closed">
+ <div class="badge label-closed">
{% trans %}Done{% endtrans %}
</div>
{% else %}
- <div class="label label-open">
+ <div class="badge label-open">
{% trans %}Open{% endtrans %}
</div>
{% endif %}
diff --git a/ckanext/odsh/templates/datarequests/show.html b/ckanext/odsh/templates/datarequests/show.html
index 60a25beb..82c3983b 100644
--- a/ckanext/odsh/templates/datarequests/show.html
+++ b/ckanext/odsh/templates/datarequests/show.html
@@ -30,12 +30,12 @@
{% block primary_content_inner %}
{% if c.datarequest.closed %}
- <span class="uppercase label label-closed pull-right">
+ <span class="uppercase badge label-closed pull-right">
<i class="icon-lock fa fa-lock"></i>
{{ _('Closed') }}
</span>
{% else %}
- <span class="uppercase label label-open pull-right">
+ <span class="uppercase badge label-open pull-right">
<i class="icon-unlock fa fa-unlock"></i>
{{ _('Open') }}
</span>
diff --git a/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html b/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html
index 7c57d2eb..bc01f6b0 100644
--- a/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html
+++ b/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html
@@ -9,11 +9,11 @@
<div class="dataset-heading ">
<div class="span1">
{% if datarequest.get('closed', False) %}
- <div class="label label-closed">
+ <div class="badge label-closed">
{% trans %}Done{% endtrans %}
</div>
{% else %}
- <div class="label label-open">
+ <div class="badge label-open">
{% trans %}Open{% endtrans %}
</div>
{% endif %}
diff --git a/ckanext/odsh/templates/package/read.html b/ckanext/odsh/templates/package/read.html
index e3972bb8..448b05e1 100644
--- a/ckanext/odsh/templates/package/read.html
+++ b/ckanext/odsh/templates/package/read.html
@@ -50,7 +50,7 @@
</div>
{% endif %}
{% if pkg.private %}
- <span class="dataset-private label label-inverse">
+ <span class="dataset-private badge bg-secondary">
<i class="fa fa-lock"></i>
{{ _('Private') }}
</span>
diff --git a/ckanext/odsh/templates/package/snippets/resource_info.html b/ckanext/odsh/templates/package/snippets/resource_info.html
index f3635797..9863ecfb 100644
--- a/ckanext/odsh/templates/package/snippets/resource_info.html
+++ b/ckanext/odsh/templates/package/snippets/resource_info.html
@@ -24,7 +24,7 @@ Example:
</div>
<div class="info-detail">
<div>{{ _('Format') }}:</div>
- <div class="label dataformat-label">{{res.format}}</div>
+ <div class="badge badge-default dataformat-label">{{res.format}}</div>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/ckanext/odsh/templates/package/snippets/resource_item.html b/ckanext/odsh/templates/package/snippets/resource_item.html
index b6f438c0..b75f4974 100644
--- a/ckanext/odsh/templates/package/snippets/resource_item.html
+++ b/ckanext/odsh/templates/package/snippets/resource_item.html
@@ -38,7 +38,7 @@
</div>
{% if res_format %}
<a href="{{ download }}" >
- <div class="dataformat-label resource-dataformat-label label" style='font-size:{{150/(res_format|length)}}px'>{{res_format}}</div>
+ <div class="badge badge-default dataformat-label resource-dataformat-label" style='font-size:{{150/(res_format|length)}}px'>{{res_format}}</div>
</a>
{% endif %}
</div>
diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html
index b00af1d5..aa19f52d 100644
--- a/ckanext/odsh/templates/snippets/package_item.html
+++ b/ckanext/odsh/templates/snippets/package_item.html
@@ -65,7 +65,7 @@ Example:
<span class='label new-dataset-label'>{{ _('NEW') }}</span>
{% endif %}
{% if package.private %}
- <span class="dataset-private label label-inverse">
+ <span class="dataset-private badge bg-secondary">
<i class="fa fa-lock"></i>
{{ _('Private') }}
</span>
@@ -78,9 +78,9 @@ Example:
{% endblock heading_title %}
{% block heading_meta %}
{% if package.get('state', '').startswith('draft') %}
- <span class="label label-info">{{ _('Draft') }}</span>
+ <span class="badge bg-info">{{ _('Draft') }}</span>
{% elif package.get('state', '').startswith('deleted') %}
- <span class="label label-important">{{ _('Deleted') }}</span>
+ <span class="badge bg-danger">{{ _('Deleted') }}</span>
{% endif %}
{{ h.popular('recent views', package.tracking_summary.recent, min=10) if package.tracking_summary }}
{% endblock heading_meta %}
@@ -127,7 +127,7 @@ Example:
{% block resources_inner %}
{% for resource in h.dict_list_reduce(package.resources, 'format') %}
<li>
- <a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" class="label dataformat-label"
+ <a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" class="badge badge-default dataformat-label"
data-format="{{ resource.lower().replace('_srvc','') }}">{{
resource.replace('_SRVC','') }}</a>
</li>
--
GitLab