From 82eb3225d83b6865c4fd7dde8db4eeda3c411e3e Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Tue, 17 Jul 2018 16:28:37 +0100
Subject: [PATCH 1/8] Remove duplicate active attribute

---
 pages/collection/_short_name/data.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/collection/_short_name/data.vue b/pages/collection/_short_name/data.vue
index b07e6a31..dc00abab 100644
--- a/pages/collection/_short_name/data.vue
+++ b/pages/collection/_short_name/data.vue
@@ -64,7 +64,7 @@
         </b-tab>
 
         <!-- Reports tab -->
-        <b-tab title="Reports" no-body active>
+        <b-tab title="Reports" no-body>
           <b-table
             responsive
             striped

From 36624fbd4997614e64527815cfa6b75f753ba455 Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Thu, 19 Jul 2018 15:27:41 +0100
Subject: [PATCH 2/8] Make tags modal text configurable (close #830)

---
 .../collection/_short_name/presenter.vue      | 13 ++++++
 .../_short_name/projects/_id/_presenter.vue   | 44 +++++--------------
 utils/setCollectionDefaults.js                |  4 +-
 3 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/pages/admin/collection/_short_name/presenter.vue b/pages/admin/collection/_short_name/presenter.vue
index ba61b2be..5e4901a5 100644
--- a/pages/admin/collection/_short_name/presenter.vue
+++ b/pages/admin/collection/_short_name/presenter.vue
@@ -40,6 +40,19 @@
           The text to be used for the reject modal, above the options input.
         </div>
       </div>
+      <div class="form-group" slot="bottom">
+        <label class="ml-0">
+          Tags text
+        </label>
+        <markdown-editor
+          v-model="currentCollection.info.presenter_options.tags_text"
+          data-size="sm"
+          :configs="markdownConfig">
+        </markdown-editor>
+        <div class="hint">
+          The text to be used for the tags modal.
+        </div>
+      </div>
     </pybossa-form>
 
   </card-base>
diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue b/pages/collection/_short_name/projects/_id/_presenter.vue
index 2048e216..e91e9bfa 100644
--- a/pages/collection/_short_name/projects/_id/_presenter.vue
+++ b/pages/collection/_short_name/projects/_id/_presenter.vue
@@ -151,40 +151,9 @@
       <b-container
         class="py-2 px-3"
         v-if="currentCollection.info.annotations.tags">
-        <p>
-          The tags added below will help researchers locate items of
-          particular interest by being used to generate keywords that can
-          be searched via the
-          <nuxt-link
-            :to="{
-              name: 'collection-short_name-browse',
-              params: {
-                short_name: currentCollection.short_name
-              }
-            }">
-            Browse
-          </nuxt-link> page.
-        </p>
-        <p>
-          For programmatic research purposes the data will also be available
-          via the API at
-          <a :href="currentCollection.info.annotations.tags" target="_blank">
-            {{ currentCollection.info.annotations.tags }}
-          </a>
-        </p>
-        <p>
-          Tags can be added by anyone but, once confirmed, can only be deleted
-          by administrators. If you have spotted a tag that you think is
-          incorrect or should be removed for any reason please contact
-          <a :href="`mailto:${localConfig.email}`">
-            {{ localConfig.email }}.
-          </a>
-        </p>
-        <p>
-          By default, a new tag will be added for each word. To create tags
-          that comprise multiple words please follow the convention of adding
-          a hyphen between words (e.g. my-long-tag).
-        </p>
+
+        <span v-html="tagsModalText"></span>
+
         <p>
           <h6 class="mb-1">Current tags:</h6>
           <item-tags-list
@@ -375,6 +344,13 @@ export default {
       }
     },
 
+    tagsModalText () {
+      const text = this.currentCollection.info.presenter_options.tags_text
+      if (typeof text !== 'undefined') {
+        return marked(text)
+      }
+    },
+
     rejectOptions () {
       let opts = [{
         value: 'invalid-task',
diff --git a/utils/setCollectionDefaults.js b/utils/setCollectionDefaults.js
index 0027cc88..7b92874e 100644
--- a/utils/setCollectionDefaults.js
+++ b/utils/setCollectionDefaults.js
@@ -15,7 +15,9 @@ export const setCollectionDefaults = function (collection) {
       note_button: 'Add a note',
       submit_button: 'Save',
       share_text: '',
-      extra_tag_link: ''
+      extra_tag_link: '',
+      reject_text: '',
+      tags_text: ''
     },
     content: {
       about: `${collection.name} is part of the ${localConfig.brand} ` +

From 56d373ab60fe3787e791126feb796c5569747da2 Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Thu, 19 Jul 2018 15:43:22 +0100
Subject: [PATCH 3/8] Remove finally blocks (close #831)

---
 pages/collection/_short_name/index.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pages/collection/_short_name/index.vue b/pages/collection/_short_name/index.vue
index a09315f8..c0451891 100644
--- a/pages/collection/_short_name/index.vue
+++ b/pages/collection/_short_name/index.vue
@@ -392,6 +392,7 @@ export default {
         this.forumDiscussions = response.data.filter(discussion => {
           return !discussion.attributes.isSticky
         }).slice(0, 5)
+        this.loadingForumDiscussions = false
       }).catch(err => {
         // This is most likely a CORS issue with the forum endpoint
         if (process.env.NODE_ENV !== 'development') {
@@ -400,11 +401,8 @@ export default {
             message: `Error loading latest forum discussions: ${err.message}`
           })
         }
-        return {
-          forumDiscussions: []
-        }
-      }).finally(() => {
         this.loadingForumDiscussions = false
+        this.forumDiscussions = []
       })
     },
 
@@ -421,19 +419,19 @@ export default {
           item.updated = new Date(item.updated * 1000)
           return item
         }).filter(item => {
+          this.loadingActivityFeed = false
           return (
             item.action_updated === 'UserContribution' &&
             item.category_id === this.collection.id
           )
         }).slice(0, 5)
       }).catch(err => {
+        this.loadingActivityFeed = false
         this.$notifications.flash({
           status: 'error',
           message: 'Failed to load recent activity'
         })
         console.error(err)
-      }).finally(() => {
-        this.loadingActivityFeed = false
       })
     },
 

From 5f49b88e952dfc595be29d0dd07f3892c597e2a5 Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Thu, 19 Jul 2018 19:01:15 +0100
Subject: [PATCH 4/8] Add list of tags to browse page (close #832)

---
 components/cards/Base.vue               |   6 +-
 components/data/SearchTags.vue          |  11 ++
 pages/collection/_short_name/browse.vue | 130 +++++++++++++++++-------
 3 files changed, 111 insertions(+), 36 deletions(-)

diff --git a/components/cards/Base.vue b/components/cards/Base.vue
index c2cf9208..68869b08 100644
--- a/components/cards/Base.vue
+++ b/components/cards/Base.vue
@@ -5,7 +5,7 @@
     :bg-variant="darkMode ? 'dark' : null"
     :text-variant="darkMode ? 'white' : null">
 
-    <template slot="header">
+    <template slot="header" v-if="!noHeader">
       <b-row
         class="mb-0 d-flex align-items-center">
         <b-col>
@@ -62,6 +62,10 @@ export default {
     docs: {
       type: String,
       default: ''
+    },
+    noHeader: {
+      type: Boolean,
+      default: false
     }
   },
 
diff --git a/components/data/SearchTags.vue b/components/data/SearchTags.vue
index 54c3cc1b..a78db3e3 100644
--- a/components/data/SearchTags.vue
+++ b/components/data/SearchTags.vue
@@ -2,6 +2,7 @@
   <multiselect
     v-model="selectedTags"
     track-by="id"
+    ref="multi"
     placeholder="Type to search"
     open-direction="bottom"
     :options="foundTags"
@@ -120,6 +121,16 @@ export default {
       this.$emit('change', tagsClone)
     },
 
+    /**
+     * Select a tag programatically.
+     * @param {Object} tag
+     *   The tag.
+     */
+    externalSelectTag (tag) {
+      this.$refs.multi.value.push(tag)
+      this.selectTag(tag)
+    },
+
     /**
      * Select a tag.
      * @param {Object} tag
diff --git a/pages/collection/_short_name/browse.vue b/pages/collection/_short_name/browse.vue
index 8d08a032..951b5cda 100644
--- a/pages/collection/_short_name/browse.vue
+++ b/pages/collection/_short_name/browse.vue
@@ -6,38 +6,64 @@
       <hr class="mx-0">
     </span>
 
-    <div v-if="hasTagAnnotations">
-      <search-tags
-        :container-iri="currentCollection.info.annotations.tags"
-        @change="updateFilters"
-        class="mb-2">
-      </search-tags>
-
-      <div class="img-grid">
-        <no-ssr>
-          <isotope
-            ref="grid"
-            v-images-loaded:on.progress="setGridLayout"
-            :options="imageGridOptions"
-            :list="uniqueImageData">
-            <img
-              v-for="(item, index) in uniqueImageData"
-              :key="index"
-              :src="item.thumbnail"
-              class="img-grid-item img-fluid my-1"
-              @click="showPreview(item)">
-          </isotope>
-        </no-ssr>
-      </div>
-
-      <infinite-load-annotations
-        ref="infiniteload"
-        v-model="tagAnnotations"
-        :container-iri="currentCollection.info.annotations.tags"
-        no-results="It looks like nothing has been tagged yet!"
-        no-more-results="">
-      </infinite-load-annotations>
-    </div>
+    <search-tags
+      :container-iri="currentCollection.info.annotations.tags"
+      ref="searchtags"
+      slot="controls"
+      @change="updateFilters"
+      class="mb-3">
+    </search-tags>
+
+    <card-base no-header>
+      <b-tabs card v-model="currentTab" @input="onTabsChange">
+        <b-tab title="Tags" no-body active>
+          <b-table
+            responsive
+            striped
+            hover
+            show-empty
+            :dark="darkMode"
+            :items="uniqueTags"
+            :fields="tagTableFields">
+            <template slot="action" slot-scope="row">
+              <b-btn
+                variant="success"
+                size="sm"
+                @click="selectTag(row.item)">
+                View Images
+              </b-btn>
+            </template>
+          </b-table>
+        </b-tab>
+        <b-tab title="Images">
+          <div class="img-grid">
+            <no-ssr>
+              <isotope
+                ref="grid"
+                v-images-loaded:on.progress="setGridLayout"
+                :options="imageGridOptions"
+                :list="uniqueImageData">
+                <img
+                  v-for="(item, index) in uniqueImageData"
+                  :key="index"
+                  :src="item.thumbnail"
+                  class="img-grid-item img-fluid my-1"
+                  @click="showPreview(item)">
+              </isotope>
+            </no-ssr>
+          </div>
+        </b-tab>
+      </b-tabs>
+    </card-base>
+
+    <infinite-load-annotations
+      ref="infiniteload"
+      v-if="hasTagAnnotations"
+      v-model="tagAnnotations"
+      :container-iri="currentCollection.info.annotations.tags"
+      no-results="It looks like nothing has been tagged yet!"
+      no-more-results="">
+    </infinite-load-annotations>
 
     <p class="lead text-center" v-else>
       Sorry, user tags haven't been configured for this collection yet.
@@ -120,6 +146,7 @@
 </template>
 
 <script>
+import uniqBy from 'lodash/uniqBy'
 import marked from 'marked'
 import 'vue-awesome/icons/times'
 import 'vue-awesome/icons/arrow-right'
@@ -128,6 +155,7 @@ import { fetchCollectionByName } from '@/mixins/fetchCollectionByName'
 import InfiniteLoadAnnotations from '@/components/infiniteload/Annotations'
 import ItemTagsList from '@/components/lists/ItemTags'
 import SearchTags from '@/components/data/SearchTags'
+import CardBase from '@/components/cards/Base'
 
 export default {
   layout: 'collection-tabs',
@@ -139,14 +167,25 @@ export default {
       title: 'Browse Tags',
       tagAnnotations: [],
       selectedTags: [],
-      selectedItem: {}
+      selectedItem: {},
+      tagTableFields: {
+        'body.value': {
+          label: 'Name'
+        },
+        action: {
+          label: 'Action',
+          class: 'text-center'
+        }
+      },
+      currentTab: 0
     }
   },
 
   components: {
     InfiniteLoadAnnotations,
     ItemTagsList,
-    SearchTags
+    SearchTags,
+    CardBase
   },
 
   computed: {
@@ -166,6 +205,10 @@ export default {
       return this.currentCollection.info.annotations.hasOwnProperty('tags')
     },
 
+    uniqueTags () {
+      return uniqBy(this.tagAnnotations, 'body.value')
+    },
+
     uniqueImageData () {
       const data = {}
       for (let anno of this.tagAnnotations) {
@@ -263,7 +306,9 @@ export default {
             ? data.related
             : [data.related]
           : []
-      }).finally(() => {
+        this.selectedItem = item
+        this.$refs.previewModal.show()
+      }).catch(() => {
         this.selectedItem = item
         this.$refs.previewModal.show()
       })
@@ -275,9 +320,24 @@ export default {
      *   The selected tags.
      */
     updateFilters (tags) {
+      this.currentTab = 1
       this.selectedTags = tags
+      console.log(this.selectedTags)
       this.$refs.grid.filter('filterByTag')
       this.$refs.infiniteload.load()
+    },
+
+    /**
+     * Add a tag to the search box.
+     * @param {Object} tag
+     *   The tag.
+     */
+    selectTag (tag) {
+      this.$refs.searchtags.externalSelectTag(tag)
+    },
+
+    onTabsChange () {
+      this.setGridLayout()
     }
   },
 

From 3101e86df03edff38e8c50d809a8c684dfe11cf8 Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Thu, 19 Jul 2018 19:03:28 +0100
Subject: [PATCH 5/8] Remove console.log

---
 pages/collection/_short_name/browse.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/collection/_short_name/browse.vue b/pages/collection/_short_name/browse.vue
index 951b5cda..87fd7e32 100644
--- a/pages/collection/_short_name/browse.vue
+++ b/pages/collection/_short_name/browse.vue
@@ -322,7 +322,6 @@ export default {
     updateFilters (tags) {
       this.currentTab = 1
       this.selectedTags = tags
-      console.log(this.selectedTags)
       this.$refs.grid.filter('filterByTag')
       this.$refs.infiniteload.load()
     },

From 84d3dd6c720174a7de123b1868ce6067790940a2 Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Thu, 19 Jul 2018 19:51:39 +0100
Subject: [PATCH 6/8] Add option to force HTTPS for volumes (close #825)

---
 nuxt.config.js                                     | 5 ++++-
 pages/admin/collection/_short_name/volumes/_id.vue | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index 9413244d..683aaf4c 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -159,7 +159,10 @@ const config = {
     browserBaseURL: localConfig.pybossaHost,
     credentials: true,
     retry: true,
-    proxy: true
+    proxy: true,
+    https: localConfig.hasOwnProperty('https')
+      ? localConfig.https
+      : false
   },
   proxy: {
     '/api/': localConfig.pybossaHost,
diff --git a/pages/admin/collection/_short_name/volumes/_id.vue b/pages/admin/collection/_short_name/volumes/_id.vue
index 9cece689..3dd94741 100644
--- a/pages/admin/collection/_short_name/volumes/_id.vue
+++ b/pages/admin/collection/_short_name/volumes/_id.vue
@@ -191,7 +191,13 @@ export default {
             hint: 'A IIIF manifest URI',
             disabled: this.hasProjects,
             required: true,
-            validator: VueFormGenerator.validators.string
+            validator: (value) => {
+              if (!value || !value.length) {
+                return 'This field is required!'
+              } if (localConfig.https && !value.startsWith('https://')) {
+                return 'The HTTPS scheme must be used'
+              }
+            }
           }
         ],
         flickr: [

From 49f3fe11518a274261d04747f6a38186b24e7911 Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Fri, 20 Jul 2018 12:50:33 +0100
Subject: [PATCH 7/8] Change Tag to Add your Tags

---
 pages/collection/_short_name/projects/_id/_presenter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue b/pages/collection/_short_name/projects/_id/_presenter.vue
index e91e9bfa..34bb38c2 100644
--- a/pages/collection/_short_name/projects/_id/_presenter.vue
+++ b/pages/collection/_short_name/projects/_id/_presenter.vue
@@ -138,7 +138,7 @@
       lazy
       v-if="task"
       ref="tags"
-      title="Tags"
+      title="Add your tags"
       size="lg"
       ok-only
       :header-text-variant="darkPresenterModals ? 'white' : null"

From edd49408afcbc65108513ce6f58b7d18804e01ac Mon Sep 17 00:00:00 2001
From: Alexander Mendes <alexanderhmendes@gmail.com>
Date: Fri, 20 Jul 2018 13:03:20 +0100
Subject: [PATCH 8/8] Update browse tags page

---
 components/data/SearchTags.vue          | 5 ++++-
 pages/collection/_short_name/browse.vue | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/data/SearchTags.vue b/components/data/SearchTags.vue
index a78db3e3..598d27dd 100644
--- a/components/data/SearchTags.vue
+++ b/components/data/SearchTags.vue
@@ -137,7 +137,10 @@ export default {
      *   The tag.
      */
     removeTag (tag) {
-      this.$emit('change', this.selectedTags)
+      let tClone = JSON.parse(JSON.stringify(this.selectedTags)).filter(t => {
+        return t.id !== tag.id
+      })
+      this.$emit('change', tClone)
     }
   },
 
diff --git a/pages/collection/_short_name/browse.vue b/pages/collection/_short_name/browse.vue
index 87fd7e32..deb833a9 100644
--- a/pages/collection/_short_name/browse.vue
+++ b/pages/collection/_short_name/browse.vue
@@ -35,7 +35,7 @@
             </template>
           </b-table>
         </b-tab>
-        <b-tab title="Images">
+        <b-tab title="Images" no-body>
           <div class="img-grid">
             <no-ssr>
               <isotope
@@ -349,8 +349,11 @@ export default {
 
 <style lang="scss">
 .img-grid {
+  overflow: auto;
+
   .img-grid-item {
     cursor: pointer;
+    padding: 5px;
     width: 100%;
 
     @include media-breakpoint-up(md) {