[Fix][s]: merge conflicts resolved

datopian · Oct 13, 2023 · 57b86f9 · 57b86f9
2 parents 780a5ae + 74e9ca4
commit 57b86f9
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 17 deletions.
diff --git a/ckanext/ubdc/assets/css/style.css b/ckanext/ubdc/assets/css/style.css
@@ -5,7 +5,7 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,200,400,600,600,700");
+@import url("../../../base/fonts/stylesheet.css");
 html {
   font-family: sans-serif;
   -ms-text-size-adjust: 100%;
@@ -8586,6 +8586,7 @@ select[data-module=autocomplete] {
   font-size: 12px;
   margin-bottom: 0;
   min-height: 12px;
+  padding-bottom: 6px;
 }
 
 .resource-item .btn-group {
@@ -8595,15 +8596,17 @@ select[data-module=autocomplete] {
 }
 
 .resource-item .resource-button {
-  font-size: 14px;
+  font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
   display: flex;
+  text-transform: capitalize;
 }
 .resource-item .resource-button:hover {
   text-decoration: none;
 }
 .resource-item .resource-button .btn {
+  padding: 6px 8px;
   margin-right: 6px;
 }
 

diff --git a/ckanext/ubdc/public/base/fonts/OpenSans.ttf b/ckanext/ubdc/public/base/fonts/OpenSans.ttf
diff --git a/ckanext/ubdc/public/base/fonts/stylesheet.css b/ckanext/ubdc/public/base/fonts/stylesheet.css
@@ -0,0 +1,7 @@
+/* Open Sans */
+@font-face {
+  font-family: "Open Sans";
+  font-style: normal;
+  src: local("Open Sans Regular"), local("OpenSans-Regular"),
+    url("OpenSans.ttf") format("truetype");
+}
diff --git a/ckanext/ubdc/public/base/scss/_dataset.scss b/ckanext/ubdc/public/base/scss/_dataset.scss
@@ -96,6 +96,7 @@
     font-size: 12px;
     margin-bottom: 0;
     min-height: 12px;
+    padding-bottom: 6px;
 }
 
 .resource-item .btn-group {
@@ -105,14 +106,16 @@
 }
 
 .resource-item  .resource-button {
-    font-size: 14px;
+    font-size: 12px;
     line-height: 1.5;
     border-radius: 3px;
     display: flex;
+    text-transform: capitalize;
     &:hover {
         text-decoration: none;
     }
     .btn {
+        padding: 6px 8px;
         margin-right: 6px;
     }
 }

diff --git a/ckanext/ubdc/public/base/scss/_variables.scss b/ckanext/ubdc/public/base/scss/_variables.scss
@@ -3,7 +3,7 @@ $imagePath: "../../../base/images";
 $spritePath: "#{$imagePath}/sprite-ckan-icons.png";
 $bgPath: "#{$imagePath}/bg.png";
 $FontAwesomePath: "../../../base/vendor/font-awesome/font";
-@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,200,400,600,600,700');
+@import url('../../../base/fonts/stylesheet.css');
 
 // Branding colors
 $brandPrimary: #F37021;

diff --git a/ckanext/ubdc/templates/package/snippets/resource_item.html b/ckanext/ubdc/templates/package/snippets/resource_item.html
@@ -1,7 +1,29 @@
 {% ckan_extends %}
 
+
+{% block resource_item_title %}
+	<a class="heading" href="{{ url }}" title="{{ res.name or res.description }}">
+		{{ h.resource_display_name(res) | truncate(70) }}<span class="format-label" property="dc:format"
+			data-format="{{ res.format.lower() or 'data' }}">{{ h.get_translated(res, 'format') }}</span>
+		{{ h.popular('views', res.tracking_summary.total, min=10) if res.tracking_summary }}
+	</a>
+{% endblock %}
+
 {% block resource_item_explore %}
 {% if res['type'] and res['type'] == 'resource' %}
+<div class="resource-button">
+    <a class="btn btn-primary" href="{{ res.url }}">
+        <i class="fa fa-eye"></i>
+        {{ _('View') }}
+    </a>
+    {% if can_edit %}
+    <a href="{{ h.url_for(pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id) }}" class="btn btn-primary">
+        <i class="fa fa-pencil-square-o"></i>
+        {{ _('Edit') }}
+    </a>
+    {% endif %}
+</div>
+{% else %}
 <div class="resource-button">
     <a class="btn btn-primary" href="{{ url }}">
         {% if not is_activity_archive and res.has_views %}
@@ -29,18 +51,5 @@
     </a>
     {% endif %}
 </div>
-{% else %}
-<div class="resource-button">
-    <a class="btn btn-primary" href="{{ res.url }}">
-        <i class="fa fa-eye"></i>
-        {{ _('View') }}
-    </a>
-    {% if can_edit %}
-    <a href="{{ h.url_for(pkg.type ~ '_resource.edit', id=pkg.name, resource_id=res.id) }}" class="btn btn-primary">
-        <i class="fa fa-pencil-square-o"></i>
-        {{ _('Edit') }}
-    </a>
-    {% endif %}
-</div>
 {% endif %}
 {% endblock %}