From 96bbe144bfe2120e4b5ea5553093e468f8d3b5d6 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Wed, 5 Feb 2020 16:47:23 +0100
Subject: [PATCH 01/21] feat: visual improvements on search results, corrected
 layout on about page

---
 web/templates/about.html                   |  2 +-
 web/templates/search/_items/cohorts.html   | 17 +++++++----------
 web/templates/search/_items/contacts.html  | 16 +++++++---------
 web/templates/search/_items/contracts.html | 13 +++++--------
 web/templates/search/_items/datasets.html  | 17 ++++++++---------
 web/templates/search/_items/partners.html  | 21 ++++++++++-----------
 web/templates/search/_items/projects.html  | 15 +++++++--------
 7 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/web/templates/about.html b/web/templates/about.html
index 73d8cd01..11d65078 100644
--- a/web/templates/about.html
+++ b/web/templates/about.html
@@ -8,7 +8,7 @@ <h1 class="display-4">About</h1>
         </div>
     </div>
 
-    <div class="card">
+    <div class="card row">
         <div class="card-body">
             <div class="col">
                 <dd>
diff --git a/web/templates/search/_items/cohorts.html b/web/templates/search/_items/cohorts.html
index c21c7ecd..2e8eff26 100644
--- a/web/templates/search/_items/cohorts.html
+++ b/web/templates/search/_items/cohorts.html
@@ -1,23 +1,23 @@
 {% for cohort in data.cohorts %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{ cohort.title }}
+                    <a href="{% url 'cohort' pk=cohort.pk %}">{{ cohort.title }}</a>
                 </h2>
                 <ul class="card-text">
-                        <li>Owners:  {% for contact in cohort.owners %}
+                        <li><strong>Owners:</strong>  {% for contact in cohort.owners %}
                             <span class="badge badge-pill badge-secondary">{{ contact }}</span>
                         {% empty %}
                             "unknown"
                         {% endfor %}</li>
-                        <li>Institutes: {% for institute in cohort.institutes %}
+                        <li><strong>Institutes:</strong> {% for institute in cohort.institutes %}
                             <span class="badge badge-pill badge-secondary">{{ institute }}</span>
                         {% empty %}
                             "unknown"
                         {% endfor %}</li>
-                        <li>Ethics Confirmation: {% if cohort.ethics_confirmation %}
-                            <i class="material-icons">
+                        <li><strong>Ethics Confirmation:</strong> {% if cohort.ethics_confirmation %}
+                            <i class="material-icons text-success">
                                 check
                             </i>
                         {% else %}
@@ -25,13 +25,10 @@ <h2 class="card-title">
                         {% endif %}
                         </li>
                 </ul>
-                <a href="{% url 'cohort' pk=cohort.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'cohort' pk=cohort.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/contacts.html b/web/templates/search/_items/contacts.html
index 77a7f559..8452b33d 100644
--- a/web/templates/search/_items/contacts.html
+++ b/web/templates/search/_items/contacts.html
@@ -1,29 +1,27 @@
 {% for contact in data.contacts %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{ contact.first_name }} {{ contact.last_name }}
+                    <a href="{% url 'contact' pk=contact.pk %}">{{ contact.first_name }} {{ contact.last_name }}</a>
                 </h2>
                 <ul class="card-text">
-                    <li>Role: <span class="badge badge-pill badge-secondary">{{ contact.type }}</span>
+                    <li>
+                      <strong>Role:</strong> <span class="badge badge-pill badge-secondary">{{ contact.type }}</span>
                     </li>
-                    <li>Affiliation(s):
+                    <li><strong>Affiliation(s):</strong>
                         {% for partner in contact.partners %}
                             <span class="badge badge-pill badge-primary">{{ partner }}</span>
 
                         {% empty %}
-                            "-"
+                            -
                         {% endfor %}
                     </li>
                 </ul>
-                <a href="{% url 'contact' pk=contact.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'contact' pk=contact.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/contracts.html b/web/templates/search/_items/contracts.html
index cae555f4..20bdf51f 100644
--- a/web/templates/search/_items/contracts.html
+++ b/web/templates/search/_items/contracts.html
@@ -1,24 +1,21 @@
 {% for contract in data.contracts %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{ contract.partners | join:", " }}
+                    <a href="{% url 'contract' pk=contract.pk %}">{{ contract.partners | join:", " }}</a>
                 </h2>
                 <ul class="card-text">
-                    <li>Project: <span class="badge badge-pill badge-secondary">{{ contract.project }}</span></li>
+                    <li><strong>Project:</strong> <span class="badge badge-pill badge-secondary">{{ contract.project }}</span></li>
                     {% if  contract.partners_roles %}
-                        <li>Partners roles: {{ contract.partners_roles | join:", " }}</li>
+                        <li><strong>Partners roles: </strong>{{ contract.partners_roles | join:", " }}</li>
                     {% endif %}
 
                 </ul>
-                <a href="{% url 'contract' pk=contract.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'contract' pk=contract.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/datasets.html b/web/templates/search/_items/datasets.html
index c71a80f4..c6231e0a 100644
--- a/web/templates/search/_items/datasets.html
+++ b/web/templates/search/_items/datasets.html
@@ -1,30 +1,29 @@
 {% for dataset in data.datasets %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
-                <h2 class="card-title">{{ dataset.title }}</h2>
+                <h2 class="card-title">
+                  <a href="{% url 'dataset' pk=dataset.pk %}">{{ dataset.title }}</a>
+                </h2>
                 <ul class="card-text">
-                    <li>Published: {{ dataset.is_published | yesno }}</li>
-                    <li>Datatypes:
+                    <li><strong>Published:</strong> {{ dataset.is_published | yesno }}</li>
+                    <li><strong>Datatypes:</strong>
                         {% for datatype in dataset.data_types %}
                             <span class="badge badge-pill badge-secondary">{{ datatype }}</span>
                         {% endfor %}
                     </li>
                     {% if dataset.local_custodians %}
-                        <li>Local custodians:
+                        <li><strong>Local custodians:</strong>
                             {% for local_custodian in dataset.local_custodians %}
                                 <span class="badge badge-pill badge-primary">{{ local_custodian }}</span>
                             {% endfor %}
                         </li>
                     {% endif %}
                 </ul>
-                <a href="{% url 'dataset' pk=dataset.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'dataset' pk=dataset.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/partners.html b/web/templates/search/_items/partners.html
index a94a6e19..0cd25537 100644
--- a/web/templates/search/_items/partners.html
+++ b/web/templates/search/_items/partners.html
@@ -1,28 +1,27 @@
 {% for partner in data.partners %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{ partner.name }} {% if  partner.acronym %}({{ partner.acronym }}){% endif %}
-                    {% if  partner.is_clinical %}
-                  <i class="material-icons">local_hospital</i>
-                    {% endif %}
+                    <a href="{% url 'partner' pk=partner.pk %}">
+                      {{ partner.name }} {% if  partner.acronym %}({{ partner.acronym }}){% endif %}
+                      {% if  partner.is_clinical %}
+                        <i class="material-icons">local_hospital</i>
+                      {% endif %}
+                    </a>
                 </h2>
                 <ul class="card-text">
-                        <li>Geo-Category:
+                        <li><strong>Geo-Category:</strong>
                             <span class="badge badge-pill badge-secondary">{{ partner.geo_category  }}</span>
                         </li>
-                        <li>Sector:
+                        <li><strong>Sector:</strong>
                             <span class="badge badge-pill badge-secondary">{{ partner.sector_category }}</span>
                         </li>
                 </ul>
-                <a href="{% url 'partner' pk=partner.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'partner' pk=partner.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/projects.html b/web/templates/search/_items/projects.html
index 6df7a4be..b5b29c50 100644
--- a/web/templates/search/_items/projects.html
+++ b/web/templates/search/_items/projects.html
@@ -1,22 +1,21 @@
 {% for project in data.projects %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{project.acronym}} <small>{% if project.title %}- {{project.title}}{% endif %}</small>
+                    <a href="{% url 'project' pk=project.pk %}">{{project.acronym}}</a>
+                    {% if project.title %}<small>- {{project.title}}</small>{% endif %}
                 </h2>
                 <ul class="card-text">
                     {% if  project.project_web_page %}<li>Web: {{ project.project_web_page }}</li>{% endif %}
-                    <li>Publications: <span class="badge badge-pill badge-info">{{ project.publications|length }}</span></li>
-
+                    <li>
+                      <strong>Publications:</strong> <span class="badge badge-pill badge-info">{{ project.publications|length }}</span>
+                    </li>
                 </ul>
-                <a href="{% url 'project' pk=project.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'project' pk=project.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-

From a4e002f76293255df0334383c0f752092ebdd8e0 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 11:11:47 +0100
Subject: [PATCH 02/21] feat: more compact editor forms - hiding the block

---
 web/templates/_includes/search_form.html      |  4 ++--
 web/templates/cohorts/cohort_form.html        |  4 ++--
 web/templates/cohorts/cohort_form_edit.html   |  7 ++++---
 web/templates/contacts/contact_form.html      |  4 ++--
 web/templates/contacts/contact_form_edit.html |  7 ++++---
 web/templates/contracts/contract_form.html    |  4 ++--
 .../contracts/contract_form_edit.html         |  7 ++++---
 web/templates/datasets/dataset_form.html      |  4 ++--
 web/templates/datasets/dataset_form_edit.html |  7 ++++---
 web/templates/datasets/dataset_list.html      |  3 ---
 web/templates/partners/partner_form.html      |  4 ++--
 web/templates/partners/partner_form_edit.html |  7 ++++---
 web/templates/projects/project_form.html      |  2 +-
 web/templates/projects/project_form_edit.html |  7 ++++---
 .../publications/publication_form.html        |  4 ++--
 .../publications/publication_form_edit.html   |  5 +++--
 web/templates/search/search_page.html         | 20 ++++++++++---------
 17 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/web/templates/_includes/search_form.html b/web/templates/_includes/search_form.html
index 23e4106b..4cb721cd 100644
--- a/web/templates/_includes/search_form.html
+++ b/web/templates/_includes/search_form.html
@@ -2,7 +2,7 @@
     <h1 class="display-4">Search {{title}}</h1>
 </div>
 <div class="row">
-    <div class="col">
+    <div class="col-lg-12 col-xl-6">
         <form class="form-inline" method="get" action="{% url url %}">
             <div class="form-group">
                 <label for="query" class="bmd-label-floating">Query</label>
@@ -22,4 +22,4 @@ <h1 class="display-4">Search {{title}}</h1>
         </div>
     </div>
     {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/web/templates/cohorts/cohort_form.html b/web/templates/cohorts/cohort_form.html
index a7fdd9d4..07175cc2 100644
--- a/web/templates/cohorts/cohort_form.html
+++ b/web/templates/cohorts/cohort_form.html
@@ -3,7 +3,7 @@
 {% block title %}Cohort - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Cohort{% endblock %}</h1>
     </div>
     <div class="card">
@@ -14,4 +14,4 @@ <h2 class="card-title">{% block card_title %}Add cohort{% endblock %}</h2>
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/cohorts/cohort_form_edit.html b/web/templates/cohorts/cohort_form_edit.html
index 284c99be..0a3eb0e3 100644
--- a/web/templates/cohorts/cohort_form_edit.html
+++ b/web/templates/cohorts/cohort_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'cohorts/cohort_form.html' %}
 
-{% block title %}Cohort - Edit{% endblock %}
-{% block card_title %}Edit cohort{% endblock %}
-{% block content_title %}Cohort "<strong>{{ cohort.title }}</strong>"{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block card_title %}Edit cohort - <strong>{{ cohort.title }}</strong>{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block content_title %}Cohort {{ cohort.title }}{% endblock %}
diff --git a/web/templates/contacts/contact_form.html b/web/templates/contacts/contact_form.html
index c9579dd0..203d78ff 100644
--- a/web/templates/contacts/contact_form.html
+++ b/web/templates/contacts/contact_form.html
@@ -3,7 +3,7 @@
 {% block title %}Contact - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Contacts{% endblock %}</h1>
     </div>
     <div class="card">
@@ -17,4 +17,4 @@ <h2 class="card-title">{% block card_title %}Add a new contact{% endblock %}</h2
     </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/contacts/contact_form_edit.html b/web/templates/contacts/contact_form_edit.html
index 46d7e8ff..197141db 100644
--- a/web/templates/contacts/contact_form_edit.html
+++ b/web/templates/contacts/contact_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'contacts/contact_form.html' %}
 
-{% block title %}Contact - Edit - {{ contact.full_name }}{% endblock %}
-{% block card_title %}Edit contact{% endblock %}
-{% block content_title %}{{ contact.full_name }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit contact - <strong>{{ contact.full_name }}</strong>{% endblock %}
+{% block content_title %}{{ contact.full_name }}{% endblock %}
diff --git a/web/templates/contracts/contract_form.html b/web/templates/contracts/contract_form.html
index 7170f56a..962534e4 100644
--- a/web/templates/contracts/contract_form.html
+++ b/web/templates/contracts/contract_form.html
@@ -3,7 +3,7 @@
 {% block title %}Contract - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Contracts{% endblock %}</h1>
     </div>
     <div class="card">
@@ -14,4 +14,4 @@ <h2 class="card-title">{% block card_title %}Add contract{% endblock %}</h2>
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/contracts/contract_form_edit.html b/web/templates/contracts/contract_form_edit.html
index 232045c2..94b3a3d4 100644
--- a/web/templates/contracts/contract_form_edit.html
+++ b/web/templates/contracts/contract_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'contracts/contract_form.html' %}
 
-{% block title %}Contract - Edit{% endblock %}
-{% block card_title %}Edit contract{% endblock %}
-{% block content_title %}{{ contract }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit - <strong>{{ contract }}</strong>{% endblock %}
+{% block content_title %}{{ contract }}{% endblock %}
diff --git a/web/templates/datasets/dataset_form.html b/web/templates/datasets/dataset_form.html
index fe163f6a..340207bd 100644
--- a/web/templates/datasets/dataset_form.html
+++ b/web/templates/datasets/dataset_form.html
@@ -3,7 +3,7 @@
 {% block title %}Dataset - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Datasets{% endblock %}</h1>
     </div>
     <div class="card">
@@ -16,4 +16,4 @@ <h2 class="card-title">{% block card_title %}Add dataset{% endblock %}</h2>
     </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/datasets/dataset_form_edit.html b/web/templates/datasets/dataset_form_edit.html
index ccb33e2b..a07f73d3 100644
--- a/web/templates/datasets/dataset_form_edit.html
+++ b/web/templates/datasets/dataset_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'datasets/dataset_form.html' %}
 
-{% block title %}Dataset - Edit - {{ dataset.title }}{% endblock %}
-{% block card_title %}Edit dataset - {{ dataset.title }}{% endblock %}
-{% block content_title %}{{ dataset.title }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit dataset - <strong>{{ dataset.title }}</strong>{% endblock %}
+{% block content_title %}{{ dataset.title }}{% endblock %}
diff --git a/web/templates/datasets/dataset_list.html b/web/templates/datasets/dataset_list.html
index b5fcdd7d..b8187750 100644
--- a/web/templates/datasets/dataset_list.html
+++ b/web/templates/datasets/dataset_list.html
@@ -25,6 +25,3 @@ <h2 class="card-title">{{ dataset.title }}</h2>
     {% empty %}
         <p>No results</p>
     {% endfor %}
-
-
-
diff --git a/web/templates/partners/partner_form.html b/web/templates/partners/partner_form.html
index 97684cd0..f9ea350b 100644
--- a/web/templates/partners/partner_form.html
+++ b/web/templates/partners/partner_form.html
@@ -3,7 +3,7 @@
 {% block title %}Partners - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Partners{% endblock %}</h1>
     </div>
     <div class="card">
@@ -16,4 +16,4 @@ <h2 class="card-title">{% block card_title %}Add a new partner{% endblock %}</h2
     </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/partners/partner_form_edit.html b/web/templates/partners/partner_form_edit.html
index 78729611..eecc435e 100644
--- a/web/templates/partners/partner_form_edit.html
+++ b/web/templates/partners/partner_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'partners/partner_form.html' %}
 
-{% block title %}Partner - Edit{% endblock %}
-{% block card_title %}Edit partner{% endblock %}
-{% block content_title %}Partner "<strong>{{ partner.name }}</strong>"{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block card_title %}Edit partner - <strong>{{ partner.name }}</strong>{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block content_title %}Partner{% endblock %}
diff --git a/web/templates/projects/project_form.html b/web/templates/projects/project_form.html
index 64e95d46..9e5e3575 100644
--- a/web/templates/projects/project_form.html
+++ b/web/templates/projects/project_form.html
@@ -4,7 +4,7 @@
 {% block title %}Project - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Projects{% endblock %}</h1>
     </div>
     <div class="card">
diff --git a/web/templates/projects/project_form_edit.html b/web/templates/projects/project_form_edit.html
index dab6f251..e761794f 100644
--- a/web/templates/projects/project_form_edit.html
+++ b/web/templates/projects/project_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'projects/project_form.html' %}
 
-{% block title %}Project - Edit - {{ project.acronym }}{% endblock %}
-{% block card_title %}Edit project{% endblock %}
-{% block content_title %}{{ project.acronym }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit project - <strong>{{ project.acronym }}</strong>{% endblock %}
+{% block content_title %}{{ project.acronym }}{% endblock %}
diff --git a/web/templates/publications/publication_form.html b/web/templates/publications/publication_form.html
index de693c98..8ccf8052 100644
--- a/web/templates/publications/publication_form.html
+++ b/web/templates/publications/publication_form.html
@@ -3,7 +3,7 @@
 {% block title %}Publication - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Publications{% endblock %}</h1>
     </div>
     <div class="card">
@@ -16,4 +16,4 @@ <h2 class="card-title">{% block card_title %}Add a new publication{% endblock %}
         </div>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/publications/publication_form_edit.html b/web/templates/publications/publication_form_edit.html
index c74d722e..e39aba9b 100644
--- a/web/templates/publications/publication_form_edit.html
+++ b/web/templates/publications/publication_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'publications/publication_form.html' %}
 
-{% block title %}Publication - Edit - {{ publication.citation }}{% endblock %}
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
 {% block card_title %}Edit publication{% endblock %}
-{% block content_title %}{{ publication.citation }}{% endblock %}
\ No newline at end of file
+{% block content_title %}{{ publication.citation }}{% endblock %}
diff --git a/web/templates/search/search_page.html b/web/templates/search/search_page.html
index 61f088c9..8e9da4e6 100644
--- a/web/templates/search/search_page.html
+++ b/web/templates/search/search_page.html
@@ -4,29 +4,31 @@
 {% block containerclass %}container-fluid{% endblock %}
 
 
-
 {% block content %}
     <div class="container card bg-light text-dark">
         <div class="card-body">
             <div class="card-title">
-                <h1 class="display-4">{{ title }}</h1>
+                <h1 class="display-4"><i class="material-icons text-secondary">info</i> {{ title }}</h1>
             </div>
             <p>{{ help_text }}</p>
             <p>Use the categories on the left or the search box below to locate {{ title }}.</p>
         </div>
     </div>
 
-    <div class="row justify-content-between">
-
-        <div id="sidebar-left" class="d-flex flex-column m-5 col-3">
+    <div class="container-fluid">
+      <div class="row">
+        <div id="sidebar-left" class="d-none d-md-block mt-5 pl-5 col-xs-12 col-md-5 col-lg-5 col-xl-4 order-2">
+            {% include '_includes/facets_sidebar.html' with facets=facets url=search_url %}
+        </div>
+        <div id="sidebar-responsive-left" class="d-md-none mt-5 pl-5 col-12 order-6">
+            <h1 class="display-4">Filter the results</h1>
             {% include '_includes/facets_sidebar.html' with facets=facets url=search_url %}
         </div>
-        <div class="mt-5 col-8">
+        <div class="mt-5 pr-5 pl-5 col-xs-12 col-md-7 col-lg-7 col-xl-8 order-4">
             {% include '_includes/search_form.html' with title=title query=query url=search_url order_by_fields=order_by_fields %}
             {% include results_template_name with data=data %}
         </div>
-
-
+      </div>
     </div>
 {% endblock %}
 
@@ -35,4 +37,4 @@ <h1 class="display-4">{{ title }}</h1>
     <a class="btn btn-primary bmd-btn-fab float-right" href="{% url add_url %}{% if reset %}?reset=true{% endif %}">
         <i class="material-icons">add</i>
     </a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 30136d074374024a8e2d64f8f895f96cec16d67e Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 12:58:30 +0100
Subject: [PATCH 03/21] feat: responsive button to show filters on low-res

---
 web/templates/search/search_page.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/templates/search/search_page.html b/web/templates/search/search_page.html
index 8e9da4e6..d5703167 100644
--- a/web/templates/search/search_page.html
+++ b/web/templates/search/search_page.html
@@ -37,4 +37,7 @@ <h1 class="display-4">Filter the results</h1>
     <a class="btn btn-primary bmd-btn-fab float-right" href="{% url add_url %}{% if reset %}?reset=true{% endif %}">
         <i class="material-icons">add</i>
     </a>
+    <a class="btn btn-secondary bmd-btn-fab d-md-none float-right" href="#sidebar-responsive-left">
+        <i class="material-icons">sort</i>
+    </a>
 {% endblock %}

From bdae370da4ef414a1c954849a9d8875dac488330 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:09:38 +0100
Subject: [PATCH 04/21] feat: more compact editor forms

---
 core/forms/dataset.py              |  6 +++++-
 core/forms/project.py              |  8 ++++++--
 web/templates/_includes/field.html |  3 +--
 web/templates/_includes/forms.html | 32 ++++++++++++++++++------------
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/core/forms/dataset.py b/core/forms/dataset.py
index 473920fd..549329ab 100644
--- a/core/forms/dataset.py
+++ b/core/forms/dataset.py
@@ -9,6 +9,10 @@ class DatasetForm(forms.ModelForm):
     class Meta:
         model = Dataset
         fields = ['local_custodians', 'title', 'comments']
+        widgets = {
+            'comments': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+        }
+
 
     def __init__(self, *args, **kwargs):
         dataset = None
@@ -70,7 +74,7 @@ def save(self, commit=True):
 class DatasetFormEdit(DatasetForm):
 
     class Meta(DatasetForm.Meta):
-        fields = DatasetForm.Meta.fields +['other_external_id', 'sensitivity']
+        fields = DatasetForm.Meta.fields + ['other_external_id', 'sensitivity']
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/core/forms/project.py b/core/forms/project.py
index a3c73f19..b22709bc 100644
--- a/core/forms/project.py
+++ b/core/forms/project.py
@@ -14,6 +14,12 @@ class Meta:
             # Date pickers
             'start_date': DateInput(attrs={'class': 'datepicker'}),
             'end_date': DateInput(attrs={'class': 'datepicker'}),
+            # Smaller text-areas
+            'description': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'cner_notes': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'erp_notes': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'comments': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'dpia': forms.Textarea(attrs={'rows': 3, 'cols': 40})
         }
         exclude = ['publications', 'contacts']
 
@@ -129,5 +135,3 @@ class Meta:
         heading_help = 'Select the the dataset the project uses.'
 
     dataset = forms.ModelChoiceField(queryset=Dataset.objects.all(), help_text='Select the dataset.')
-
-
diff --git a/web/templates/_includes/field.html b/web/templates/_includes/field.html
index 80d12df5..8a351f48 100644
--- a/web/templates/_includes/field.html
+++ b/web/templates/_includes/field.html
@@ -1,7 +1,6 @@
 {% load widget_tweaks %}
 
-<div class="form-group {% if field.field.required %}required{% endif %}">
-
+<div class="form-group {% if field.field.required %}required{% endif %} col-md-5 mr-3">
     {% if field.field.widget.input_type == 'checkbox' %}
         {% include '_includes/checkbox.html' %}
     {% elif field.field.widget.input_type == 'radio' %}
diff --git a/web/templates/_includes/forms.html b/web/templates/_includes/forms.html
index 0754fd7c..4c043a07 100644
--- a/web/templates/_includes/forms.html
+++ b/web/templates/_includes/forms.html
@@ -8,16 +8,21 @@
         </button>
     </div>
 {% endfor %}
-<form {% if form_id %}id="{{ form_id }}"{% endif %}class="form {% if half %}col-md-6{% else %}col-md-12{% endif %} nice-selects {{ form_class }}"
-      {% if enctype %}enctype="{{ enctype }}"{% endif %} method="post"
-      {% if submit_url %}action="{{ submit_url }}"{% endif %}novalidate>
-    {% csrf_token %}
-    {% for hidden_field in form.hidden_fields %}
-        {{ hidden_field }}
-    {% endfor %}
-    {% for field in form.visible_fields %}
-        {% include '_includes/field.html' with field=field %}
-    {% endfor %}
+<form {% if form_id %}id="{{ form_id }}"{% endif %}
+      class="form nice-selects {{ form_class }}" method="post" novalidate
+      {% if enctype %}enctype="{{ enctype }}"{% endif %}
+      {% if submit_url %}action="{{ submit_url }}"{% endif %}>
+    <div class="row ml-1 mr-1">
+      {% csrf_token %}
+
+      {% for hidden_field in form.hidden_fields %}
+          {{ hidden_field }}
+      {% endfor %}
+
+      {% for field in form.visible_fields %}
+          {% include '_includes/field.html' with field=field %}
+      {% endfor %}
+    </div>
     {% if not hide_submit %}
         {% if wizard and wizard_url_name %}
             <div class="row">
@@ -33,10 +38,11 @@
         {% else %}
             <button type="submit"
                     {% if submit_disabled %}disabled="disabled"{% endif %}
-                    class="btn btn-primary btn-raised">{{ submit_label | default:"Submit" }}</button>
+                    class="btn btn-primary btn-raised btn-block">{{ submit_label | default:"Submit" }}</button>
         {% endif %}
     {% endif %}
     {% if cancel_button %}
-        <a href="{{ cancel_button }}" class="btn btn-secondary btn-raised float-right">Cancel</a>
+        <a href="{{ cancel_button }}" class="btn btn-secondary btn-block btn-raised float-right">Cancel</a>
     {% endif %}
-</form>
\ No newline at end of file
+
+</form>

From c56b912717333a655683bb3f40e302b7de4269a4 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:09:59 +0100
Subject: [PATCH 05/21] feat: larger modal boxes

---
 web/templates/layout.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/templates/layout.html b/web/templates/layout.html
index 84267b43..5043fdaf 100644
--- a/web/templates/layout.html
+++ b/web/templates/layout.html
@@ -53,7 +53,7 @@ <h4>{{ message.tags | title }}</h4>
 {% endblock %}
 <!-- Modal -->
 <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="modalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="modalLabel"></h5>
@@ -90,4 +90,4 @@ <h5 class="modal-title" id="modalLabel"></h5>
 });</script>
 {% block js %}
 {% endblock js %}
-</html>
\ No newline at end of file
+</html>

From f248375baca6477cd6039c8b9e0cd638ff9bf018 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:10:26 +0100
Subject: [PATCH 06/21] feat: thinner cards inside list views

---
 web/templates/search/_items/cohorts.html   | 2 +-
 web/templates/search/_items/contacts.html  | 2 +-
 web/templates/search/_items/contracts.html | 2 +-
 web/templates/search/_items/datasets.html  | 2 +-
 web/templates/search/_items/partners.html  | 2 +-
 web/templates/search/_items/projects.html  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/templates/search/_items/cohorts.html b/web/templates/search/_items/cohorts.html
index 2e8eff26..31cdd14e 100644
--- a/web/templates/search/_items/cohorts.html
+++ b/web/templates/search/_items/cohorts.html
@@ -1,6 +1,6 @@
 {% for cohort in data.cohorts %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'cohort' pk=cohort.pk %}">{{ cohort.title }}</a>
diff --git a/web/templates/search/_items/contacts.html b/web/templates/search/_items/contacts.html
index 8452b33d..09024ec3 100644
--- a/web/templates/search/_items/contacts.html
+++ b/web/templates/search/_items/contacts.html
@@ -1,6 +1,6 @@
 {% for contact in data.contacts %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'contact' pk=contact.pk %}">{{ contact.first_name }} {{ contact.last_name }}</a>
diff --git a/web/templates/search/_items/contracts.html b/web/templates/search/_items/contracts.html
index 20bdf51f..e1e19924 100644
--- a/web/templates/search/_items/contracts.html
+++ b/web/templates/search/_items/contracts.html
@@ -1,6 +1,6 @@
 {% for contract in data.contracts %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'contract' pk=contract.pk %}">{{ contract.partners | join:", " }}</a>
diff --git a/web/templates/search/_items/datasets.html b/web/templates/search/_items/datasets.html
index c6231e0a..3a4b743a 100644
--- a/web/templates/search/_items/datasets.html
+++ b/web/templates/search/_items/datasets.html
@@ -1,6 +1,6 @@
 {% for dataset in data.datasets %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                   <a href="{% url 'dataset' pk=dataset.pk %}">{{ dataset.title }}</a>
diff --git a/web/templates/search/_items/partners.html b/web/templates/search/_items/partners.html
index 0cd25537..f51ee374 100644
--- a/web/templates/search/_items/partners.html
+++ b/web/templates/search/_items/partners.html
@@ -1,6 +1,6 @@
 {% for partner in data.partners %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'partner' pk=partner.pk %}">
diff --git a/web/templates/search/_items/projects.html b/web/templates/search/_items/projects.html
index b5b29c50..31a60356 100644
--- a/web/templates/search/_items/projects.html
+++ b/web/templates/search/_items/projects.html
@@ -1,6 +1,6 @@
 {% for project in data.projects %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'project' pk=project.pk %}">{{project.acronym}}</a>

From f7b7d06ad5057a6f343ca81d03ba1fa48303c143 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:30:21 +0100
Subject: [PATCH 07/21] feat: shorter textareas in modal forms

---
 core/forms/access.py   | 11 +++++++----
 core/forms/cohort.py   |  5 ++++-
 core/forms/contract.py |  5 ++++-
 core/forms/document.py |  8 ++++----
 core/forms/share.py    |  5 +++--
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/core/forms/access.py b/core/forms/access.py
index a07d2e12..7ca05f94 100644
--- a/core/forms/access.py
+++ b/core/forms/access.py
@@ -1,4 +1,4 @@
-from django.forms import ModelForm, DateInput, ChoiceField
+from django.forms import ModelForm, DateInput, ChoiceField, Textarea
 
 from core.models import Access, DataLocation
 
@@ -11,7 +11,9 @@ class Meta:
         widgets = {
             # Date pickers
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
-            'grant_expires_on': DateInput(attrs={'class': 'datepicker'})
+            'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
+            # Textareas
+            'access_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
@@ -40,7 +42,9 @@ class Meta:
         widgets = {
             # Date pickers
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
-            'grant_expires_on': DateInput(attrs={'class': 'datepicker'})
+            'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
+            # Textareas
+            'access_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
 
     field_order = [
@@ -56,4 +60,3 @@ def __init__(self, *args, **kwargs):
         # we don't allow editing dataset
         self.fields.pop('dataset')
         self.fields['defined_on_locations'].choices = [(d.id, d) for d in kwargs['instance'].dataset.data_locations.all()]
-
diff --git a/core/forms/cohort.py b/core/forms/cohort.py
index 97867223..36224b50 100644
--- a/core/forms/cohort.py
+++ b/core/forms/cohort.py
@@ -1,4 +1,4 @@
-from django.forms import ModelForm
+from django.forms import ModelForm, Textarea
 
 from core.forms.input import SelectWithModal
 from core.models import Cohort
@@ -8,6 +8,9 @@ class CohortForm(ModelForm):
     class Meta:
         model = Cohort
         fields = '__all__'
+        widgets = {
+            'comments': Textarea(attrs={'rows': 3, 'cols': 40}),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/core/forms/contract.py b/core/forms/contract.py
index f273aeb9..5ef48c44 100644
--- a/core/forms/contract.py
+++ b/core/forms/contract.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.forms import ModelForm, ModelChoiceField
+from django.forms import ModelForm, ModelChoiceField, Textarea
 from django.utils.text import slugify
 
 from core.forms.input import SelectWithModal
@@ -11,6 +11,9 @@ class Meta:
         model = Contract
         fields = '__all__'
         exclude = ['partners_roles']
+        widgets = {
+            'comments': Textarea(attrs={'rows': 3, 'cols': 40}),
+        }
 
     def __init__(self, *args, **kwargs):
         kwargs['label_suffix'] = ""
diff --git a/core/forms/document.py b/core/forms/document.py
index 00e32b44..59ab91c8 100644
--- a/core/forms/document.py
+++ b/core/forms/document.py
@@ -1,7 +1,8 @@
 from django import forms
+from django.forms import DateInput, Textarea
+
 from core.models import Document
 from core.forms.input import CustomClearableFileInput
-from django.forms import DateInput
 
 
 class DocumentForm(forms.ModelForm):
@@ -13,10 +14,9 @@ class Meta:
             'content': CustomClearableFileInput,
             'content_type': forms.HiddenInput(),
             'object_id': forms.HiddenInput(),
-            'expiry_date': DateInput(attrs={'class': 'datepicker'})
+            'expiry_date': DateInput(attrs={'class': 'datepicker'}),
+            'content_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
-
diff --git a/core/forms/share.py b/core/forms/share.py
index 1b69b55d..d402c8ab 100644
--- a/core/forms/share.py
+++ b/core/forms/share.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.forms import ModelForm, DateInput
+from django.forms import ModelForm, DateInput, Textarea
 
 from core.models import Share, Partner, Contract, PartnerRole
 
@@ -12,7 +12,8 @@ class Meta:
         widgets = {
             # Date pickers
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
-            'grant_expires_on': DateInput(attrs={'class': 'datepicker'})
+            'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
+            'share_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
         help_texts = {
             'contract': ''

From 7be69467e0e6ddd288f9f05cc06826e4ce40a638 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Wed, 5 Feb 2020 16:47:23 +0100
Subject: [PATCH 08/21] feat: visual improvements on search results, corrected
 layout on about page

---
 web/templates/about.html                   |  2 +-
 web/templates/search/_items/cohorts.html   | 17 +++++++----------
 web/templates/search/_items/contacts.html  | 16 +++++++---------
 web/templates/search/_items/contracts.html | 10 +++++-----
 web/templates/search/_items/datasets.html  | 17 ++++++++---------
 web/templates/search/_items/partners.html  | 21 ++++++++++-----------
 web/templates/search/_items/projects.html  | 15 +++++++--------
 7 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/web/templates/about.html b/web/templates/about.html
index 357f93cf..755807e8 100644
--- a/web/templates/about.html
+++ b/web/templates/about.html
@@ -8,7 +8,7 @@ <h1 class="display-4">About</h1>
         </div>
     </div>
 
-    <div class="card">
+    <div class="card row">
         <div class="card-body">
             <div class="col">
                 <dd>
diff --git a/web/templates/search/_items/cohorts.html b/web/templates/search/_items/cohorts.html
index c21c7ecd..2e8eff26 100644
--- a/web/templates/search/_items/cohorts.html
+++ b/web/templates/search/_items/cohorts.html
@@ -1,23 +1,23 @@
 {% for cohort in data.cohorts %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{ cohort.title }}
+                    <a href="{% url 'cohort' pk=cohort.pk %}">{{ cohort.title }}</a>
                 </h2>
                 <ul class="card-text">
-                        <li>Owners:  {% for contact in cohort.owners %}
+                        <li><strong>Owners:</strong>  {% for contact in cohort.owners %}
                             <span class="badge badge-pill badge-secondary">{{ contact }}</span>
                         {% empty %}
                             "unknown"
                         {% endfor %}</li>
-                        <li>Institutes: {% for institute in cohort.institutes %}
+                        <li><strong>Institutes:</strong> {% for institute in cohort.institutes %}
                             <span class="badge badge-pill badge-secondary">{{ institute }}</span>
                         {% empty %}
                             "unknown"
                         {% endfor %}</li>
-                        <li>Ethics Confirmation: {% if cohort.ethics_confirmation %}
-                            <i class="material-icons">
+                        <li><strong>Ethics Confirmation:</strong> {% if cohort.ethics_confirmation %}
+                            <i class="material-icons text-success">
                                 check
                             </i>
                         {% else %}
@@ -25,13 +25,10 @@ <h2 class="card-title">
                         {% endif %}
                         </li>
                 </ul>
-                <a href="{% url 'cohort' pk=cohort.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'cohort' pk=cohort.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/contacts.html b/web/templates/search/_items/contacts.html
index 77a7f559..8452b33d 100644
--- a/web/templates/search/_items/contacts.html
+++ b/web/templates/search/_items/contacts.html
@@ -1,29 +1,27 @@
 {% for contact in data.contacts %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{ contact.first_name }} {{ contact.last_name }}
+                    <a href="{% url 'contact' pk=contact.pk %}">{{ contact.first_name }} {{ contact.last_name }}</a>
                 </h2>
                 <ul class="card-text">
-                    <li>Role: <span class="badge badge-pill badge-secondary">{{ contact.type }}</span>
+                    <li>
+                      <strong>Role:</strong> <span class="badge badge-pill badge-secondary">{{ contact.type }}</span>
                     </li>
-                    <li>Affiliation(s):
+                    <li><strong>Affiliation(s):</strong>
                         {% for partner in contact.partners %}
                             <span class="badge badge-pill badge-primary">{{ partner }}</span>
 
                         {% empty %}
-                            "-"
+                            -
                         {% endfor %}
                     </li>
                 </ul>
-                <a href="{% url 'contact' pk=contact.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'contact' pk=contact.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/contracts.html b/web/templates/search/_items/contracts.html
index 6a680fa5..066c147c 100644
--- a/web/templates/search/_items/contracts.html
+++ b/web/templates/search/_items/contracts.html
@@ -1,18 +1,18 @@
 {% for contract in data.contracts %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-			{{ contract.partners | join:", " }}{% if contract.project %}<small> - "{{ contract.project }}"</small>{% endif %}
+                    <a href="{% url 'contract' pk=contract.pk %}">{{ contract.partners | join:", " }}{% if contract.project %}<small> - "{{ contract.project }}"</small>{% endif %}</a>
                 </h2>
                 <ul class="card-text">
-                    <li>Project: <span class="badge badge-pill badge-secondary">{{ contract.project }}</span></li>
+                    <li><strong>Project:</strong> <span class="badge badge-pill badge-secondary">{{ contract.project }}</span></li>
                     {% if  contract.partners_roles %}
-                        <li>Partners roles: {{ contract.partners_roles | join:", " }}</li>
+                        <li><strong>Partners roles: </strong>{{ contract.partners_roles | join:", " }}</li>
                     {% endif %}
 
                 </ul>
-                <a href="{% url 'contract' pk=contract.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'contract' pk=contract.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
diff --git a/web/templates/search/_items/datasets.html b/web/templates/search/_items/datasets.html
index c71a80f4..c6231e0a 100644
--- a/web/templates/search/_items/datasets.html
+++ b/web/templates/search/_items/datasets.html
@@ -1,30 +1,29 @@
 {% for dataset in data.datasets %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
-                <h2 class="card-title">{{ dataset.title }}</h2>
+                <h2 class="card-title">
+                  <a href="{% url 'dataset' pk=dataset.pk %}">{{ dataset.title }}</a>
+                </h2>
                 <ul class="card-text">
-                    <li>Published: {{ dataset.is_published | yesno }}</li>
-                    <li>Datatypes:
+                    <li><strong>Published:</strong> {{ dataset.is_published | yesno }}</li>
+                    <li><strong>Datatypes:</strong>
                         {% for datatype in dataset.data_types %}
                             <span class="badge badge-pill badge-secondary">{{ datatype }}</span>
                         {% endfor %}
                     </li>
                     {% if dataset.local_custodians %}
-                        <li>Local custodians:
+                        <li><strong>Local custodians:</strong>
                             {% for local_custodian in dataset.local_custodians %}
                                 <span class="badge badge-pill badge-primary">{{ local_custodian }}</span>
                             {% endfor %}
                         </li>
                     {% endif %}
                 </ul>
-                <a href="{% url 'dataset' pk=dataset.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'dataset' pk=dataset.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/partners.html b/web/templates/search/_items/partners.html
index a94a6e19..0cd25537 100644
--- a/web/templates/search/_items/partners.html
+++ b/web/templates/search/_items/partners.html
@@ -1,28 +1,27 @@
 {% for partner in data.partners %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{ partner.name }} {% if  partner.acronym %}({{ partner.acronym }}){% endif %}
-                    {% if  partner.is_clinical %}
-                  <i class="material-icons">local_hospital</i>
-                    {% endif %}
+                    <a href="{% url 'partner' pk=partner.pk %}">
+                      {{ partner.name }} {% if  partner.acronym %}({{ partner.acronym }}){% endif %}
+                      {% if  partner.is_clinical %}
+                        <i class="material-icons">local_hospital</i>
+                      {% endif %}
+                    </a>
                 </h2>
                 <ul class="card-text">
-                        <li>Geo-Category:
+                        <li><strong>Geo-Category:</strong>
                             <span class="badge badge-pill badge-secondary">{{ partner.geo_category  }}</span>
                         </li>
-                        <li>Sector:
+                        <li><strong>Sector:</strong>
                             <span class="badge badge-pill badge-secondary">{{ partner.sector_category }}</span>
                         </li>
                 </ul>
-                <a href="{% url 'partner' pk=partner.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'partner' pk=partner.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-
diff --git a/web/templates/search/_items/projects.html b/web/templates/search/_items/projects.html
index 6df7a4be..b5b29c50 100644
--- a/web/templates/search/_items/projects.html
+++ b/web/templates/search/_items/projects.html
@@ -1,22 +1,21 @@
 {% for project in data.projects %}
     <div class="row">
-        <div class="col-md-9 mb-4 card-item card">
+        <div class="col-md-12 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
-                    {{project.acronym}} <small>{% if project.title %}- {{project.title}}{% endif %}</small>
+                    <a href="{% url 'project' pk=project.pk %}">{{project.acronym}}</a>
+                    {% if project.title %}<small>- {{project.title}}</small>{% endif %}
                 </h2>
                 <ul class="card-text">
                     {% if  project.project_web_page %}<li>Web: {{ project.project_web_page }}</li>{% endif %}
-                    <li>Publications: <span class="badge badge-pill badge-info">{{ project.publications|length }}</span></li>
-
+                    <li>
+                      <strong>Publications:</strong> <span class="badge badge-pill badge-info">{{ project.publications|length }}</span>
+                    </li>
                 </ul>
-                <a href="{% url 'project' pk=project.pk %}" class="btn btn-primary">Details</a>
+                <a href="{% url 'project' pk=project.pk %}" class="btn btn-secondary btn-outline">Details &raquo;</a>
             </div>
         </div>
     </div>
 {% empty %}
     <p>No results</p>
 {% endfor %}
-
-
-

From 6fb65a655963f5c829f0e89057c26b0c73c2885a Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 11:11:47 +0100
Subject: [PATCH 09/21] feat: more compact editor forms - hiding the block

---
 web/templates/_includes/search_form.html      |  4 ++--
 web/templates/cohorts/cohort_form.html        |  4 ++--
 web/templates/cohorts/cohort_form_edit.html   |  7 ++++---
 web/templates/contacts/contact_form.html      |  4 ++--
 web/templates/contacts/contact_form_edit.html |  7 ++++---
 web/templates/contracts/contract_form.html    |  4 ++--
 .../contracts/contract_form_edit.html         |  7 ++++---
 web/templates/datasets/dataset_form.html      |  4 ++--
 web/templates/datasets/dataset_form_edit.html |  7 ++++---
 web/templates/datasets/dataset_list.html      |  3 ---
 web/templates/partners/partner_form.html      |  4 ++--
 web/templates/partners/partner_form_edit.html |  7 ++++---
 web/templates/projects/project_form.html      |  2 +-
 web/templates/projects/project_form_edit.html |  7 ++++---
 .../publications/publication_form.html        |  4 ++--
 .../publications/publication_form_edit.html   |  5 +++--
 web/templates/search/search_page.html         | 20 ++++++++++---------
 17 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/web/templates/_includes/search_form.html b/web/templates/_includes/search_form.html
index d896b761..0225e941 100644
--- a/web/templates/_includes/search_form.html
+++ b/web/templates/_includes/search_form.html
@@ -2,7 +2,7 @@
     <h1 class="display-4">Search {{title}}</h1>
 </div>
 <div class="row">
-    <div class="col">
+    <div class="col-lg-12 col-xl-6">
         <form class="form-inline" method="get" action="{% url url %}">
             <div class="form-group">
                 <label for="query" class="bmd-label-floating">
@@ -24,4 +24,4 @@ <h1 class="display-4">Search {{title}}</h1>
         </div>
     </div>
     {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/web/templates/cohorts/cohort_form.html b/web/templates/cohorts/cohort_form.html
index a7fdd9d4..07175cc2 100644
--- a/web/templates/cohorts/cohort_form.html
+++ b/web/templates/cohorts/cohort_form.html
@@ -3,7 +3,7 @@
 {% block title %}Cohort - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Cohort{% endblock %}</h1>
     </div>
     <div class="card">
@@ -14,4 +14,4 @@ <h2 class="card-title">{% block card_title %}Add cohort{% endblock %}</h2>
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/cohorts/cohort_form_edit.html b/web/templates/cohorts/cohort_form_edit.html
index 284c99be..0a3eb0e3 100644
--- a/web/templates/cohorts/cohort_form_edit.html
+++ b/web/templates/cohorts/cohort_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'cohorts/cohort_form.html' %}
 
-{% block title %}Cohort - Edit{% endblock %}
-{% block card_title %}Edit cohort{% endblock %}
-{% block content_title %}Cohort "<strong>{{ cohort.title }}</strong>"{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block card_title %}Edit cohort - <strong>{{ cohort.title }}</strong>{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block content_title %}Cohort {{ cohort.title }}{% endblock %}
diff --git a/web/templates/contacts/contact_form.html b/web/templates/contacts/contact_form.html
index c9579dd0..203d78ff 100644
--- a/web/templates/contacts/contact_form.html
+++ b/web/templates/contacts/contact_form.html
@@ -3,7 +3,7 @@
 {% block title %}Contact - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Contacts{% endblock %}</h1>
     </div>
     <div class="card">
@@ -17,4 +17,4 @@ <h2 class="card-title">{% block card_title %}Add a new contact{% endblock %}</h2
     </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/contacts/contact_form_edit.html b/web/templates/contacts/contact_form_edit.html
index 46d7e8ff..197141db 100644
--- a/web/templates/contacts/contact_form_edit.html
+++ b/web/templates/contacts/contact_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'contacts/contact_form.html' %}
 
-{% block title %}Contact - Edit - {{ contact.full_name }}{% endblock %}
-{% block card_title %}Edit contact{% endblock %}
-{% block content_title %}{{ contact.full_name }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit contact - <strong>{{ contact.full_name }}</strong>{% endblock %}
+{% block content_title %}{{ contact.full_name }}{% endblock %}
diff --git a/web/templates/contracts/contract_form.html b/web/templates/contracts/contract_form.html
index 7170f56a..962534e4 100644
--- a/web/templates/contracts/contract_form.html
+++ b/web/templates/contracts/contract_form.html
@@ -3,7 +3,7 @@
 {% block title %}Contract - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Contracts{% endblock %}</h1>
     </div>
     <div class="card">
@@ -14,4 +14,4 @@ <h2 class="card-title">{% block card_title %}Add contract{% endblock %}</h2>
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/contracts/contract_form_edit.html b/web/templates/contracts/contract_form_edit.html
index 232045c2..94b3a3d4 100644
--- a/web/templates/contracts/contract_form_edit.html
+++ b/web/templates/contracts/contract_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'contracts/contract_form.html' %}
 
-{% block title %}Contract - Edit{% endblock %}
-{% block card_title %}Edit contract{% endblock %}
-{% block content_title %}{{ contract }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit - <strong>{{ contract }}</strong>{% endblock %}
+{% block content_title %}{{ contract }}{% endblock %}
diff --git a/web/templates/datasets/dataset_form.html b/web/templates/datasets/dataset_form.html
index fe163f6a..340207bd 100644
--- a/web/templates/datasets/dataset_form.html
+++ b/web/templates/datasets/dataset_form.html
@@ -3,7 +3,7 @@
 {% block title %}Dataset - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Datasets{% endblock %}</h1>
     </div>
     <div class="card">
@@ -16,4 +16,4 @@ <h2 class="card-title">{% block card_title %}Add dataset{% endblock %}</h2>
     </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/datasets/dataset_form_edit.html b/web/templates/datasets/dataset_form_edit.html
index ccb33e2b..a07f73d3 100644
--- a/web/templates/datasets/dataset_form_edit.html
+++ b/web/templates/datasets/dataset_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'datasets/dataset_form.html' %}
 
-{% block title %}Dataset - Edit - {{ dataset.title }}{% endblock %}
-{% block card_title %}Edit dataset - {{ dataset.title }}{% endblock %}
-{% block content_title %}{{ dataset.title }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit dataset - <strong>{{ dataset.title }}</strong>{% endblock %}
+{% block content_title %}{{ dataset.title }}{% endblock %}
diff --git a/web/templates/datasets/dataset_list.html b/web/templates/datasets/dataset_list.html
index b5fcdd7d..b8187750 100644
--- a/web/templates/datasets/dataset_list.html
+++ b/web/templates/datasets/dataset_list.html
@@ -25,6 +25,3 @@ <h2 class="card-title">{{ dataset.title }}</h2>
     {% empty %}
         <p>No results</p>
     {% endfor %}
-
-
-
diff --git a/web/templates/partners/partner_form.html b/web/templates/partners/partner_form.html
index 97684cd0..f9ea350b 100644
--- a/web/templates/partners/partner_form.html
+++ b/web/templates/partners/partner_form.html
@@ -3,7 +3,7 @@
 {% block title %}Partners - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Partners{% endblock %}</h1>
     </div>
     <div class="card">
@@ -16,4 +16,4 @@ <h2 class="card-title">{% block card_title %}Add a new partner{% endblock %}</h2
     </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/partners/partner_form_edit.html b/web/templates/partners/partner_form_edit.html
index 78729611..eecc435e 100644
--- a/web/templates/partners/partner_form_edit.html
+++ b/web/templates/partners/partner_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'partners/partner_form.html' %}
 
-{% block title %}Partner - Edit{% endblock %}
-{% block card_title %}Edit partner{% endblock %}
-{% block content_title %}Partner "<strong>{{ partner.name }}</strong>"{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block card_title %}Edit partner - <strong>{{ partner.name }}</strong>{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block content_title %}Partner{% endblock %}
diff --git a/web/templates/projects/project_form.html b/web/templates/projects/project_form.html
index 64e95d46..9e5e3575 100644
--- a/web/templates/projects/project_form.html
+++ b/web/templates/projects/project_form.html
@@ -4,7 +4,7 @@
 {% block title %}Project - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Projects{% endblock %}</h1>
     </div>
     <div class="card">
diff --git a/web/templates/projects/project_form_edit.html b/web/templates/projects/project_form_edit.html
index dab6f251..e761794f 100644
--- a/web/templates/projects/project_form_edit.html
+++ b/web/templates/projects/project_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'projects/project_form.html' %}
 
-{% block title %}Project - Edit - {{ project.acronym }}{% endblock %}
-{% block card_title %}Edit project{% endblock %}
-{% block content_title %}{{ project.acronym }}{% endblock %}
\ No newline at end of file
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
+{% block card_title %}Edit project - <strong>{{ project.acronym }}</strong>{% endblock %}
+{% block content_title %}{{ project.acronym }}{% endblock %}
diff --git a/web/templates/publications/publication_form.html b/web/templates/publications/publication_form.html
index de693c98..8ccf8052 100644
--- a/web/templates/publications/publication_form.html
+++ b/web/templates/publications/publication_form.html
@@ -3,7 +3,7 @@
 {% block title %}Publication - Add{% endblock %}
 
 {% block content %}
-    <div class="jumbotron mt-4">
+    <div class="jumbotron mt-4 {% block jumbotron_class %}{% endblock %}">
         <h1 class="display-4">{% block content_title %}Publications{% endblock %}</h1>
     </div>
     <div class="card">
@@ -16,4 +16,4 @@ <h2 class="card-title">{% block card_title %}Add a new publication{% endblock %}
         </div>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/web/templates/publications/publication_form_edit.html b/web/templates/publications/publication_form_edit.html
index c74d722e..e39aba9b 100644
--- a/web/templates/publications/publication_form_edit.html
+++ b/web/templates/publications/publication_form_edit.html
@@ -1,5 +1,6 @@
 {% extends 'publications/publication_form.html' %}
 
-{% block title %}Publication - Edit - {{ publication.citation }}{% endblock %}
+{% block title %}{% endblock %}
+{% block jumbotron_class %}d-none{% endblock %}
 {% block card_title %}Edit publication{% endblock %}
-{% block content_title %}{{ publication.citation }}{% endblock %}
\ No newline at end of file
+{% block content_title %}{{ publication.citation }}{% endblock %}
diff --git a/web/templates/search/search_page.html b/web/templates/search/search_page.html
index 61f088c9..8e9da4e6 100644
--- a/web/templates/search/search_page.html
+++ b/web/templates/search/search_page.html
@@ -4,29 +4,31 @@
 {% block containerclass %}container-fluid{% endblock %}
 
 
-
 {% block content %}
     <div class="container card bg-light text-dark">
         <div class="card-body">
             <div class="card-title">
-                <h1 class="display-4">{{ title }}</h1>
+                <h1 class="display-4"><i class="material-icons text-secondary">info</i> {{ title }}</h1>
             </div>
             <p>{{ help_text }}</p>
             <p>Use the categories on the left or the search box below to locate {{ title }}.</p>
         </div>
     </div>
 
-    <div class="row justify-content-between">
-
-        <div id="sidebar-left" class="d-flex flex-column m-5 col-3">
+    <div class="container-fluid">
+      <div class="row">
+        <div id="sidebar-left" class="d-none d-md-block mt-5 pl-5 col-xs-12 col-md-5 col-lg-5 col-xl-4 order-2">
+            {% include '_includes/facets_sidebar.html' with facets=facets url=search_url %}
+        </div>
+        <div id="sidebar-responsive-left" class="d-md-none mt-5 pl-5 col-12 order-6">
+            <h1 class="display-4">Filter the results</h1>
             {% include '_includes/facets_sidebar.html' with facets=facets url=search_url %}
         </div>
-        <div class="mt-5 col-8">
+        <div class="mt-5 pr-5 pl-5 col-xs-12 col-md-7 col-lg-7 col-xl-8 order-4">
             {% include '_includes/search_form.html' with title=title query=query url=search_url order_by_fields=order_by_fields %}
             {% include results_template_name with data=data %}
         </div>
-
-
+      </div>
     </div>
 {% endblock %}
 
@@ -35,4 +37,4 @@ <h1 class="display-4">{{ title }}</h1>
     <a class="btn btn-primary bmd-btn-fab float-right" href="{% url add_url %}{% if reset %}?reset=true{% endif %}">
         <i class="material-icons">add</i>
     </a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 14c1d68925bae1058ce06b58d8bf6f0028b04e83 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 12:58:30 +0100
Subject: [PATCH 10/21] feat: responsive button to show filters on low-res

---
 web/templates/search/search_page.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/templates/search/search_page.html b/web/templates/search/search_page.html
index 8e9da4e6..d5703167 100644
--- a/web/templates/search/search_page.html
+++ b/web/templates/search/search_page.html
@@ -37,4 +37,7 @@ <h1 class="display-4">Filter the results</h1>
     <a class="btn btn-primary bmd-btn-fab float-right" href="{% url add_url %}{% if reset %}?reset=true{% endif %}">
         <i class="material-icons">add</i>
     </a>
+    <a class="btn btn-secondary bmd-btn-fab d-md-none float-right" href="#sidebar-responsive-left">
+        <i class="material-icons">sort</i>
+    </a>
 {% endblock %}

From d480386d125208adf7510e12fc1971234ecfb458 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:09:38 +0100
Subject: [PATCH 11/21] feat: more compact editor forms

---
 core/forms/dataset.py              |  6 +++++-
 core/forms/project.py              |  8 ++++++--
 web/templates/_includes/field.html |  3 +--
 web/templates/_includes/forms.html | 32 ++++++++++++++++++------------
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/core/forms/dataset.py b/core/forms/dataset.py
index 473920fd..549329ab 100644
--- a/core/forms/dataset.py
+++ b/core/forms/dataset.py
@@ -9,6 +9,10 @@ class DatasetForm(forms.ModelForm):
     class Meta:
         model = Dataset
         fields = ['local_custodians', 'title', 'comments']
+        widgets = {
+            'comments': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+        }
+
 
     def __init__(self, *args, **kwargs):
         dataset = None
@@ -70,7 +74,7 @@ def save(self, commit=True):
 class DatasetFormEdit(DatasetForm):
 
     class Meta(DatasetForm.Meta):
-        fields = DatasetForm.Meta.fields +['other_external_id', 'sensitivity']
+        fields = DatasetForm.Meta.fields + ['other_external_id', 'sensitivity']
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/core/forms/project.py b/core/forms/project.py
index a3c73f19..b22709bc 100644
--- a/core/forms/project.py
+++ b/core/forms/project.py
@@ -14,6 +14,12 @@ class Meta:
             # Date pickers
             'start_date': DateInput(attrs={'class': 'datepicker'}),
             'end_date': DateInput(attrs={'class': 'datepicker'}),
+            # Smaller text-areas
+            'description': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'cner_notes': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'erp_notes': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'comments': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'dpia': forms.Textarea(attrs={'rows': 3, 'cols': 40})
         }
         exclude = ['publications', 'contacts']
 
@@ -129,5 +135,3 @@ class Meta:
         heading_help = 'Select the the dataset the project uses.'
 
     dataset = forms.ModelChoiceField(queryset=Dataset.objects.all(), help_text='Select the dataset.')
-
-
diff --git a/web/templates/_includes/field.html b/web/templates/_includes/field.html
index 80d12df5..8a351f48 100644
--- a/web/templates/_includes/field.html
+++ b/web/templates/_includes/field.html
@@ -1,7 +1,6 @@
 {% load widget_tweaks %}
 
-<div class="form-group {% if field.field.required %}required{% endif %}">
-
+<div class="form-group {% if field.field.required %}required{% endif %} col-md-5 mr-3">
     {% if field.field.widget.input_type == 'checkbox' %}
         {% include '_includes/checkbox.html' %}
     {% elif field.field.widget.input_type == 'radio' %}
diff --git a/web/templates/_includes/forms.html b/web/templates/_includes/forms.html
index 0754fd7c..4c043a07 100644
--- a/web/templates/_includes/forms.html
+++ b/web/templates/_includes/forms.html
@@ -8,16 +8,21 @@
         </button>
     </div>
 {% endfor %}
-<form {% if form_id %}id="{{ form_id }}"{% endif %}class="form {% if half %}col-md-6{% else %}col-md-12{% endif %} nice-selects {{ form_class }}"
-      {% if enctype %}enctype="{{ enctype }}"{% endif %} method="post"
-      {% if submit_url %}action="{{ submit_url }}"{% endif %}novalidate>
-    {% csrf_token %}
-    {% for hidden_field in form.hidden_fields %}
-        {{ hidden_field }}
-    {% endfor %}
-    {% for field in form.visible_fields %}
-        {% include '_includes/field.html' with field=field %}
-    {% endfor %}
+<form {% if form_id %}id="{{ form_id }}"{% endif %}
+      class="form nice-selects {{ form_class }}" method="post" novalidate
+      {% if enctype %}enctype="{{ enctype }}"{% endif %}
+      {% if submit_url %}action="{{ submit_url }}"{% endif %}>
+    <div class="row ml-1 mr-1">
+      {% csrf_token %}
+
+      {% for hidden_field in form.hidden_fields %}
+          {{ hidden_field }}
+      {% endfor %}
+
+      {% for field in form.visible_fields %}
+          {% include '_includes/field.html' with field=field %}
+      {% endfor %}
+    </div>
     {% if not hide_submit %}
         {% if wizard and wizard_url_name %}
             <div class="row">
@@ -33,10 +38,11 @@
         {% else %}
             <button type="submit"
                     {% if submit_disabled %}disabled="disabled"{% endif %}
-                    class="btn btn-primary btn-raised">{{ submit_label | default:"Submit" }}</button>
+                    class="btn btn-primary btn-raised btn-block">{{ submit_label | default:"Submit" }}</button>
         {% endif %}
     {% endif %}
     {% if cancel_button %}
-        <a href="{{ cancel_button }}" class="btn btn-secondary btn-raised float-right">Cancel</a>
+        <a href="{{ cancel_button }}" class="btn btn-secondary btn-block btn-raised float-right">Cancel</a>
     {% endif %}
-</form>
\ No newline at end of file
+
+</form>

From a6c6a4d45e2d8546f9ed6bcde12cea9671deb238 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:09:59 +0100
Subject: [PATCH 12/21] feat: larger modal boxes

---
 web/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/layout.html b/web/templates/layout.html
index b44e5f81..45dc3b3c 100644
--- a/web/templates/layout.html
+++ b/web/templates/layout.html
@@ -54,7 +54,7 @@ <h4>{{ message.tags | title }}</h4>
 {% endblock %}
 <!-- Modal -->
 <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="modalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="modalLabel"></h5>

From 006cd3d7ac0620db149bc528e3c86998dbbfc405 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:10:26 +0100
Subject: [PATCH 13/21] feat: thinner cards inside list views

---
 web/templates/search/_items/cohorts.html   | 2 +-
 web/templates/search/_items/contacts.html  | 2 +-
 web/templates/search/_items/contracts.html | 2 +-
 web/templates/search/_items/datasets.html  | 2 +-
 web/templates/search/_items/partners.html  | 2 +-
 web/templates/search/_items/projects.html  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/templates/search/_items/cohorts.html b/web/templates/search/_items/cohorts.html
index 2e8eff26..31cdd14e 100644
--- a/web/templates/search/_items/cohorts.html
+++ b/web/templates/search/_items/cohorts.html
@@ -1,6 +1,6 @@
 {% for cohort in data.cohorts %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'cohort' pk=cohort.pk %}">{{ cohort.title }}</a>
diff --git a/web/templates/search/_items/contacts.html b/web/templates/search/_items/contacts.html
index 8452b33d..09024ec3 100644
--- a/web/templates/search/_items/contacts.html
+++ b/web/templates/search/_items/contacts.html
@@ -1,6 +1,6 @@
 {% for contact in data.contacts %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'contact' pk=contact.pk %}">{{ contact.first_name }} {{ contact.last_name }}</a>
diff --git a/web/templates/search/_items/contracts.html b/web/templates/search/_items/contracts.html
index 066c147c..132ce2aa 100644
--- a/web/templates/search/_items/contracts.html
+++ b/web/templates/search/_items/contracts.html
@@ -1,6 +1,6 @@
 {% for contract in data.contracts %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'contract' pk=contract.pk %}">{{ contract.partners | join:", " }}{% if contract.project %}<small> - "{{ contract.project }}"</small>{% endif %}</a>
diff --git a/web/templates/search/_items/datasets.html b/web/templates/search/_items/datasets.html
index c6231e0a..3a4b743a 100644
--- a/web/templates/search/_items/datasets.html
+++ b/web/templates/search/_items/datasets.html
@@ -1,6 +1,6 @@
 {% for dataset in data.datasets %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                   <a href="{% url 'dataset' pk=dataset.pk %}">{{ dataset.title }}</a>
diff --git a/web/templates/search/_items/partners.html b/web/templates/search/_items/partners.html
index 0cd25537..f51ee374 100644
--- a/web/templates/search/_items/partners.html
+++ b/web/templates/search/_items/partners.html
@@ -1,6 +1,6 @@
 {% for partner in data.partners %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'partner' pk=partner.pk %}">
diff --git a/web/templates/search/_items/projects.html b/web/templates/search/_items/projects.html
index b5b29c50..31a60356 100644
--- a/web/templates/search/_items/projects.html
+++ b/web/templates/search/_items/projects.html
@@ -1,6 +1,6 @@
 {% for project in data.projects %}
     <div class="row">
-        <div class="col-md-12 mb-4 card-item card">
+        <div class="col-md-11 mb-4 card-item card">
             <div class="card-body">
                 <h2 class="card-title">
                     <a href="{% url 'project' pk=project.pk %}">{{project.acronym}}</a>

From c6f91c894bef984fe3f001e5b6e70ff53889bbc4 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 6 Feb 2020 14:30:21 +0100
Subject: [PATCH 14/21] feat: shorter textareas in modal forms

---
 core/forms/access.py   | 11 +++++++----
 core/forms/cohort.py   |  5 ++++-
 core/forms/contract.py |  5 ++++-
 core/forms/document.py |  8 ++++----
 core/forms/share.py    |  5 +++--
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/core/forms/access.py b/core/forms/access.py
index a07d2e12..7ca05f94 100644
--- a/core/forms/access.py
+++ b/core/forms/access.py
@@ -1,4 +1,4 @@
-from django.forms import ModelForm, DateInput, ChoiceField
+from django.forms import ModelForm, DateInput, ChoiceField, Textarea
 
 from core.models import Access, DataLocation
 
@@ -11,7 +11,9 @@ class Meta:
         widgets = {
             # Date pickers
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
-            'grant_expires_on': DateInput(attrs={'class': 'datepicker'})
+            'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
+            # Textareas
+            'access_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
@@ -40,7 +42,9 @@ class Meta:
         widgets = {
             # Date pickers
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
-            'grant_expires_on': DateInput(attrs={'class': 'datepicker'})
+            'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
+            # Textareas
+            'access_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
 
     field_order = [
@@ -56,4 +60,3 @@ def __init__(self, *args, **kwargs):
         # we don't allow editing dataset
         self.fields.pop('dataset')
         self.fields['defined_on_locations'].choices = [(d.id, d) for d in kwargs['instance'].dataset.data_locations.all()]
-
diff --git a/core/forms/cohort.py b/core/forms/cohort.py
index 97867223..36224b50 100644
--- a/core/forms/cohort.py
+++ b/core/forms/cohort.py
@@ -1,4 +1,4 @@
-from django.forms import ModelForm
+from django.forms import ModelForm, Textarea
 
 from core.forms.input import SelectWithModal
 from core.models import Cohort
@@ -8,6 +8,9 @@ class CohortForm(ModelForm):
     class Meta:
         model = Cohort
         fields = '__all__'
+        widgets = {
+            'comments': Textarea(attrs={'rows': 3, 'cols': 40}),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/core/forms/contract.py b/core/forms/contract.py
index f273aeb9..5ef48c44 100644
--- a/core/forms/contract.py
+++ b/core/forms/contract.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.forms import ModelForm, ModelChoiceField
+from django.forms import ModelForm, ModelChoiceField, Textarea
 from django.utils.text import slugify
 
 from core.forms.input import SelectWithModal
@@ -11,6 +11,9 @@ class Meta:
         model = Contract
         fields = '__all__'
         exclude = ['partners_roles']
+        widgets = {
+            'comments': Textarea(attrs={'rows': 3, 'cols': 40}),
+        }
 
     def __init__(self, *args, **kwargs):
         kwargs['label_suffix'] = ""
diff --git a/core/forms/document.py b/core/forms/document.py
index 00e32b44..59ab91c8 100644
--- a/core/forms/document.py
+++ b/core/forms/document.py
@@ -1,7 +1,8 @@
 from django import forms
+from django.forms import DateInput, Textarea
+
 from core.models import Document
 from core.forms.input import CustomClearableFileInput
-from django.forms import DateInput
 
 
 class DocumentForm(forms.ModelForm):
@@ -13,10 +14,9 @@ class Meta:
             'content': CustomClearableFileInput,
             'content_type': forms.HiddenInput(),
             'object_id': forms.HiddenInput(),
-            'expiry_date': DateInput(attrs={'class': 'datepicker'})
+            'expiry_date': DateInput(attrs={'class': 'datepicker'}),
+            'content_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
-
diff --git a/core/forms/share.py b/core/forms/share.py
index 1b69b55d..d402c8ab 100644
--- a/core/forms/share.py
+++ b/core/forms/share.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.forms import ModelForm, DateInput
+from django.forms import ModelForm, DateInput, Textarea
 
 from core.models import Share, Partner, Contract, PartnerRole
 
@@ -12,7 +12,8 @@ class Meta:
         widgets = {
             # Date pickers
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
-            'grant_expires_on': DateInput(attrs={'class': 'datepicker'})
+            'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
+            'share_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
         }
         help_texts = {
             'contract': ''

From ea98b3e321892c56bf3860aec77cc4c91cc8d4a6 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 23 Apr 2020 12:41:46 +0200
Subject: [PATCH 15/21] feat: reduce height of textareas even furher

---
 core/forms/access.py   |  4 ++--
 core/forms/cohort.py   |  2 +-
 core/forms/contract.py |  2 +-
 core/forms/dataset.py  |  2 +-
 core/forms/document.py |  2 +-
 core/forms/project.py  | 10 +++++-----
 core/forms/share.py    |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/forms/access.py b/core/forms/access.py
index 7ca05f94..75a183b3 100644
--- a/core/forms/access.py
+++ b/core/forms/access.py
@@ -13,7 +13,7 @@ class Meta:
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
             'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
             # Textareas
-            'access_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
+            'access_notes': Textarea(attrs={'rows': 2, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
@@ -44,7 +44,7 @@ class Meta:
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
             'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
             # Textareas
-            'access_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
+            'access_notes': Textarea(attrs={'rows': 2, 'cols': 40}),
         }
 
     field_order = [
diff --git a/core/forms/cohort.py b/core/forms/cohort.py
index 36224b50..707caac5 100644
--- a/core/forms/cohort.py
+++ b/core/forms/cohort.py
@@ -9,7 +9,7 @@ class Meta:
         model = Cohort
         fields = '__all__'
         widgets = {
-            'comments': Textarea(attrs={'rows': 3, 'cols': 40}),
+            'comments': Textarea(attrs={'rows': 2, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
diff --git a/core/forms/contract.py b/core/forms/contract.py
index 5ef48c44..3a2b41ef 100644
--- a/core/forms/contract.py
+++ b/core/forms/contract.py
@@ -12,7 +12,7 @@ class Meta:
         fields = '__all__'
         exclude = ['partners_roles']
         widgets = {
-            'comments': Textarea(attrs={'rows': 3, 'cols': 40}),
+            'comments': Textarea(attrs={'rows': 2, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
diff --git a/core/forms/dataset.py b/core/forms/dataset.py
index 549329ab..8ad5f843 100644
--- a/core/forms/dataset.py
+++ b/core/forms/dataset.py
@@ -10,7 +10,7 @@ class Meta:
         model = Dataset
         fields = ['local_custodians', 'title', 'comments']
         widgets = {
-            'comments': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
+            'comments': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
         }
 
 
diff --git a/core/forms/document.py b/core/forms/document.py
index 59ab91c8..c772d182 100644
--- a/core/forms/document.py
+++ b/core/forms/document.py
@@ -15,7 +15,7 @@ class Meta:
             'content_type': forms.HiddenInput(),
             'object_id': forms.HiddenInput(),
             'expiry_date': DateInput(attrs={'class': 'datepicker'}),
-            'content_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
+            'content_notes': Textarea(attrs={'rows': 2, 'cols': 40}),
         }
 
     def __init__(self, *args, **kwargs):
diff --git a/core/forms/project.py b/core/forms/project.py
index b22709bc..7a78361e 100644
--- a/core/forms/project.py
+++ b/core/forms/project.py
@@ -15,11 +15,11 @@ class Meta:
             'start_date': DateInput(attrs={'class': 'datepicker'}),
             'end_date': DateInput(attrs={'class': 'datepicker'}),
             # Smaller text-areas
-            'description': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
-            'cner_notes': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
-            'erp_notes': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
-            'comments': forms.Textarea(attrs={'rows': 3, 'cols': 40}),
-            'dpia': forms.Textarea(attrs={'rows': 3, 'cols': 40})
+            'description': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
+            'cner_notes': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
+            'erp_notes': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
+            'comments': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
+            'dpia': forms.Textarea(attrs={'rows': 2, 'cols': 40})
         }
         exclude = ['publications', 'contacts']
 
diff --git a/core/forms/share.py b/core/forms/share.py
index d402c8ab..6aedfcb0 100644
--- a/core/forms/share.py
+++ b/core/forms/share.py
@@ -13,7 +13,7 @@ class Meta:
             # Date pickers
             'granted_on': DateInput(attrs={'class': 'datepicker'}),
             'grant_expires_on': DateInput(attrs={'class': 'datepicker'}),
-            'share_notes': Textarea(attrs={'rows': 3, 'cols': 40}),
+            'share_notes': Textarea(attrs={'rows': 2, 'cols': 40}),
         }
         help_texts = {
             'contract': ''

From bf8c76f665af010732102f6ee80485e1184e7a71 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 23 Apr 2020 12:42:05 +0200
Subject: [PATCH 16/21] feat: remove halving of forms

---
 web/templates/_includes/field.html | 2 +-
 web/templates/_includes/forms.html | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/templates/_includes/field.html b/web/templates/_includes/field.html
index 8a351f48..126fe691 100644
--- a/web/templates/_includes/field.html
+++ b/web/templates/_includes/field.html
@@ -1,6 +1,6 @@
 {% load widget_tweaks %}
 
-<div class="form-group {% if field.field.required %}required{% endif %} col-md-5 mr-3">
+<div class="form-group {% if field.field.required %}required{% endif %}">
     {% if field.field.widget.input_type == 'checkbox' %}
         {% include '_includes/checkbox.html' %}
     {% elif field.field.widget.input_type == 'radio' %}
diff --git a/web/templates/_includes/forms.html b/web/templates/_includes/forms.html
index 4c043a07..1ef0a5e8 100644
--- a/web/templates/_includes/forms.html
+++ b/web/templates/_includes/forms.html
@@ -8,11 +8,13 @@
         </button>
     </div>
 {% endfor %}
+
 <form {% if form_id %}id="{{ form_id }}"{% endif %}
-      class="form nice-selects {{ form_class }}" method="post" novalidate
+      class="form {% if half %}col-md-6{% else %}col-md-12{% endif %} nice-selects {{ form_class }}"
+      method="post" novalidate
       {% if enctype %}enctype="{{ enctype }}"{% endif %}
       {% if submit_url %}action="{{ submit_url }}"{% endif %}>
-    <div class="row ml-1 mr-1">
+      
       {% csrf_token %}
 
       {% for hidden_field in form.hidden_fields %}
@@ -22,7 +24,7 @@
       {% for field in form.visible_fields %}
           {% include '_includes/field.html' with field=field %}
       {% endfor %}
-    </div>
+
     {% if not hide_submit %}
         {% if wizard and wizard_url_name %}
             <div class="row">

From baeec334dfaf8a457891e2a30e43f79b61426ce6 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 23 Apr 2020 13:31:32 +0200
Subject: [PATCH 17/21] feat: smaller padding of boxes in forms

---
 web/static/css/daisy.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/static/css/daisy.scss b/web/static/css/daisy.scss
index d6e273cf..2a746a52 100644
--- a/web/static/css/daisy.scss
+++ b/web/static/css/daisy.scss
@@ -390,3 +390,8 @@ body {
   color: #d9d9d9;
   font-weight: bolder;
 }
+
+/* Reduce padding in forms */
+form.col-md-12.nice-selects > .form-group.bmd-form-group {
+  padding-top: 0.75rem;
+}
\ No newline at end of file

From 259806289d54019f7503a5651716e6b86d42f3e1 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 23 Apr 2020 16:49:14 +0200
Subject: [PATCH 18/21] feat: minor ui tweaks

---
 web/templates/_includes/search_form.html | 49 ++++++++++++++----------
 web/templates/search/search_page.html    |  2 +-
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/web/templates/_includes/search_form.html b/web/templates/_includes/search_form.html
index 0225e941..1a995e0f 100644
--- a/web/templates/_includes/search_form.html
+++ b/web/templates/_includes/search_form.html
@@ -1,27 +1,36 @@
 <div class="row">
-    <h1 class="display-4">Search {{title}}</h1>
+    <h1 class="display-4">
+        Browse {{title}}
+    </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12 col-xl-6">
-        <form class="form-inline" method="get" action="{% url url %}">
-            <div class="form-group">
-                <label for="query" class="bmd-label-floating">
-                    &nbsp;<i class="material-icons">search</i> Query
-                </label>
-                <input type='text' class="form-control border border-top-0 bg-white" name='query' value='{{ query }}'/>
+    <div class="col-md-12 col-lg-11">
+        <div class="row">
+            <div class="col-xl-5 col-lg-12">
+                <form class="form-inline" method="get" action="{% url url %}">
+                    <div class="form-group">
+                        <label for="query" class="bmd-label-floating">
+                            &nbsp;<i class="material-icons">search</i> Query
+                        </label>
+                        <input type='text' class="form-control border border-top-0 bg-white" name='query' value='{{ query }}'/>
+                    </div>
+                    <span class="form-group bmd-form-group"> <!-- needed to match padding for floating labels -->
+                        <button type="submit" class="btn btn-primary">Search</button>
+                    </span>
+                </form>
+            </div>
+    
+            <div class="col-xl-7 col-lg-12 mt-4 mb-2">
+                {% if order_by_fields %}
+                <div class="mr-auto float-right">
+                    <div class="btn-group-sm" role="group">
+                        {% for field in order_by_fields %}
+                            {% orderbylink search_url field %}
+                        {% endfor %}
+                    </div>
+                </div>
+                {% endif %}
             </div>
-            <span class="form-group bmd-form-group"> <!-- needed to match padding for floating labels -->
-            <button type="submit" class="btn btn-primary">Search</button>
-        </span>
-        </form>
-    </div>
-    {% if order_by_fields %}
-    <div class="col mr-auto">
-        <div class="btn-group" role="group">
-            {% for field in order_by_fields %}
-                {% orderbylink search_url field %}
-            {% endfor %}
         </div>
     </div>
-    {% endif %}
 </div>
diff --git a/web/templates/search/search_page.html b/web/templates/search/search_page.html
index d5703167..a05d230d 100644
--- a/web/templates/search/search_page.html
+++ b/web/templates/search/search_page.html
@@ -11,7 +11,7 @@
                 <h1 class="display-4"><i class="material-icons text-secondary">info</i> {{ title }}</h1>
             </div>
             <p>{{ help_text }}</p>
-            <p>Use the categories on the left or the search box below to locate {{ title }}.</p>
+            <p>Use the categories on the left or the search box below to locate {{ title | lower }}. In order to create add a new one, use the button at bottom-right corner .</p>
         </div>
     </div>
 

From f9ae596cc9e29a5295c878ada9e064965cde5d09 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 23 Apr 2020 16:50:13 +0200
Subject: [PATCH 19/21] feat: prevent failures on version detection errors

---
 web/views/context_processors.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/views/context_processors.py b/web/views/context_processors.py
index ce41a9de..b4e6a729 100644
--- a/web/views/context_processors.py
+++ b/web/views/context_processors.py
@@ -1,13 +1,16 @@
 import pkg_resources
 
 def daisy_version(request):
-    daisy_packages = pkg_resources.require("elixir-daisy")
+    try:
+        daisy_packages = pkg_resources.require("elixir-daisy")
 
-    if len(daisy_packages) == 0:
+        if len(daisy_packages) == 0:
+            the_version = "undefined"
+        else:
+            the_version = daisy_packages[0].version
+    except:
         the_version = "undefined"
-    else:
-        the_version = daisy_packages[0].version
-
+    
     return {
         "app_version": the_version
     }

From 8ed1391a08da790f01e119445d016a9726d5a30d Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 23 Apr 2020 21:56:50 +0200
Subject: [PATCH 20/21] fix: normalize table headers in dataset's page

---
 web/templates/datasets/dataset.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/datasets/dataset.html b/web/templates/datasets/dataset.html
index 68cdd480..65bdc302 100644
--- a/web/templates/datasets/dataset.html
+++ b/web/templates/datasets/dataset.html
@@ -105,7 +105,7 @@ <h1>{{ dataset.title }}</h1>
                 <h2 class="card-title">Data declarations</h2>
 
                 {% if dataset.data_declarations.all %}
-                    <div class="table table-responsive">
+                    <div class="table-responsive">
                     <table class="table table-striped">
                         <thead>
                         <tr>

From 0ae0fdb5945555d1fe74e4dde47fcc936a7a0e75 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Fri, 24 Apr 2020 17:25:45 +0200
Subject: [PATCH 21/21] fix: make lay-summary field taller

---
 core/forms/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/forms/project.py b/core/forms/project.py
index 7a78361e..b4cdf5cd 100644
--- a/core/forms/project.py
+++ b/core/forms/project.py
@@ -15,7 +15,7 @@ class Meta:
             'start_date': DateInput(attrs={'class': 'datepicker'}),
             'end_date': DateInput(attrs={'class': 'datepicker'}),
             # Smaller text-areas
-            'description': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
+            'description': forms.Textarea(attrs={'rows': 6, 'cols': 40}),
             'cner_notes': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
             'erp_notes': forms.Textarea(attrs={'rows': 2, 'cols': 40}),
             'comments': forms.Textarea(attrs={'rows': 2, 'cols': 40}),