From e19643bf18c31aad3f5516f78c42b1f735b52465 Mon Sep 17 00:00:00 2001
From: sagarg <info@sagarg.com.np>
Date: Tue, 10 Sep 2019 14:22:09 +0545
Subject: [PATCH] [opendk][s]: consolidate data format - duplicate removed,
 colored format & groups and organisations alphabetically Sorted

---
 themes/opendk/views/collections-home.html     |  2 +-
 .../views/partials/data-search-results.njk    | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/themes/opendk/views/collections-home.html b/themes/opendk/views/collections-home.html
index 50be48e5..3a9862cd 100644
--- a/themes/opendk/views/collections-home.html
+++ b/themes/opendk/views/collections-home.html
@@ -26,7 +26,7 @@ <h1 class="font-semibold text-3xl mb-1">{{ title }}</h1>
   </p>
 
   <ul class="sm:flex flex-wrap sm:-mx-4 mt-gutter">
-    {% for collection in collections %}
+    {% for collection in collections  | sort(attribute='title') %}
     <!-- group -->
     <li class="sm:w-1/2 lg:w-1/3">
       <a class="flex bg-gray-200 p-4 text-primary my-4 sm:mx-4" href="/{{ slug }}/{{ collection.name }}">
diff --git a/themes/opendk/views/partials/data-search-results.njk b/themes/opendk/views/partials/data-search-results.njk
index 7f21719b..0c13d81e 100644
--- a/themes/opendk/views/partials/data-search-results.njk
+++ b/themes/opendk/views/partials/data-search-results.njk
@@ -30,12 +30,31 @@
     </div>
 
     <ul class="mt-2">
+    {% set formats = [] %}{% set colors = {
+      CSV: '#ffca00',
+      XLSX:'#3CBC8D',
+      XLS:'#3CBC8D',
+      JSON:'blue',
+      GeoJSON:'#2CAAF9',
+      WFS:'#08389c',
+      PDF:'#ff1010',
+      SHP:'violet',
+      HTML:'#333',
+      KML:'gray',
+      ODS:'gray'
+    } %}
+ 
       {% for resource in package.resources %}
-      {% if resource.format %}
+      {% if resource.format not in formats %}
+         <span hidden>{{formats.push(resource.format)}}</span>
+        {% endif %} 
+      {% endfor %}
+      {% for format in formats %}
+      {%if format %}
       <li class="inline">
-        <a href="/{{ package.organization.name or 'dataset' }}/{{ package.name }}" data-format="{{ resource.format }}" class="bg-gray-200 text-sm text-gray-500 px-2 py-1">{{ resource.format }}</a>
+        <a href="/{{ package.organization.name or 'dataset' }}/{{ package.name }}" data-format="{{ format }}" class="bg-gray-600 text-sm text-gray-100 px-2 py-1" style="background:{{colors[format]}};" >{{ format }}</a>
       </li>
-      {% endif %}
+      {% endif %} 
       {% endfor %}
     </ul>
   </li>