From 4186a67259681799a54f3295cf2aa1701a2dc51a Mon Sep 17 00:00:00 2001
From: Benjamin Becker <benjamin.becker@dataport.de>
Date: Thu, 15 Apr 2021 13:46:54 +0000
Subject: [PATCH] closes #130: marks dataset in search result if not latest
collection member
---
ckanext/odsh/i18n/ckanext-odsh.pot | 308 +++++++++++-------
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo | Bin 10265 -> 10303 bytes
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po | 5 +-
ckanext/odsh/public/odsh.css | 15 +-
.../odsh/templates/snippets/package_item.html | 7 +-
5 files changed, 204 insertions(+), 131 deletions(-)
diff --git a/ckanext/odsh/i18n/ckanext-odsh.pot b/ckanext/odsh/i18n/ckanext-odsh.pot
index 32e57994..8fbf82b3 100644
--- a/ckanext/odsh/i18n/ckanext-odsh.pot
+++ b/ckanext/odsh/i18n/ckanext-odsh.pot
@@ -1,14 +1,14 @@
# Translations template for ckanext-odsh.
-# Copyright (C) 2019 ORGANIZATION
+# Copyright (C) 2021 ORGANIZATION
# This file is distributed under the same license as the ckanext-odsh project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckanext-odsh 0.0.1\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-10-08 12:09+0000\n"
+"POT-Creation-Date: 2021-04-15 13:23+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,41 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
-#: ckanext/odsh/plugin.py:158 ckanext/odsh/plugin.py:165 ckanext/odsh/plugin.py:171
+#: ckanext/odsh/plugin.py:176 ckanext/odsh/plugin.py:183 ckanext/odsh/plugin.py:189
msgid "Herausgeber"
msgstr ""
-#: ckanext/odsh/plugin.py:159 ckanext/odsh/plugin.py:168 ckanext/odsh/plugin.py:174
+#: ckanext/odsh/plugin.py:177 ckanext/odsh/plugin.py:186 ckanext/odsh/plugin.py:192
msgid "Kategorie"
msgstr ""
-#: ckanext/odsh/plugin.py:160
+#: ckanext/odsh/plugin.py:178
msgid "Informationsgegenstand"
msgstr ""
-#: ckanext/odsh/plugin.py:161
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:223
+#: ckanext/odsh/plugin.py:179
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:225
msgid "Tags"
msgstr ""
-#: ckanext/odsh/plugin.py:166 ckanext/odsh/plugin.py:172
+#: ckanext/odsh/plugin.py:184 ckanext/odsh/plugin.py:190
msgid "Dateiformat"
msgstr ""
-#: ckanext/odsh/plugin.py:167 ckanext/odsh/plugin.py:173
+#: ckanext/odsh/plugin.py:185 ckanext/odsh/plugin.py:191
msgid "Lizenz"
msgstr ""
-#: ckanext/odsh/validation.py:261
+#: ckanext/odsh/validation.py:302
#, python-format
msgid "Tag \"%s\" must be alphanumeric characters or symbols: -_.:()"
msgstr ""
-#: ckanext/odsh/validation.py:312
+#: ckanext/odsh/validation.py:353
msgid "Subject must be a known URI."
msgstr ""
-#: ckanext/odsh/validation.py:334
+#: ckanext/odsh/validation.py:375
msgid "Subject must not be empty."
msgstr ""
@@ -73,12 +73,12 @@ msgid "Upload"
msgstr ""
#: ckanext/odsh/fanstatic/odsh_image-upload.js:75
-#: ckanext/odsh/templates/macros/form.html:342
+#: ckanext/odsh/templates/macros/form.html:357
msgid "Remove"
msgstr ""
#: ckanext/odsh/fanstatic/odsh_image-upload.js:83
-#: ckanext/odsh/templates/macros/form.html:528
+#: ckanext/odsh/templates/macros/form.html:559
msgid "Image"
msgstr ""
@@ -246,8 +246,8 @@ msgstr ""
#: ckanext/odsh/templates/datarequests/snippets/datarequest_form.html:21
#: ckanext/odsh/templates/organization/snippets/organization_form.html:20
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:27
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:32
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:29
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:34
msgid "Description"
msgstr ""
@@ -260,10 +260,9 @@ msgid "Are you sure you want to delete this data request?"
msgstr ""
#: ckanext/odsh/templates/datarequests/snippets/datarequest_form.html:30
-#: ckanext/odsh/templates/organization/snippets/organization_form.html:60
+#: ckanext/odsh/templates/organization/snippets/organization_form.html:51
#: ckanext/odsh/templates/package/edit_view.html:19
-#: ckanext/odsh/templates/package/snippets/package_form.html:32
-#: ckanext/odsh/templates/package/snippets/resource_form.html:96
+#: ckanext/odsh/templates/user/edit_user_form.html:48
msgid "Delete"
msgstr ""
@@ -284,30 +283,30 @@ msgstr ""
msgid "Welcome"
msgstr ""
-#: ckanext/odsh/templates/macros/form.html:374
+#: ckanext/odsh/templates/macros/form.html:405
msgid "Custom"
msgstr ""
-#: ckanext/odsh/templates/macros/form.html:374
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:59
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:94
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:249
+#: ckanext/odsh/templates/macros/form.html:405
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:61
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:96
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:251
msgid "This field is required"
msgstr ""
-#: ckanext/odsh/templates/macros/form.html:510
+#: ckanext/odsh/templates/macros/form.html:541
msgid "Required field"
msgstr ""
-#: ckanext/odsh/templates/macros/form.html:526
+#: ckanext/odsh/templates/macros/form.html:557
msgid "http://example.com/my-image.jpg"
msgstr ""
-#: ckanext/odsh/templates/macros/form.html:527
+#: ckanext/odsh/templates/macros/form.html:558
msgid "Image URL"
msgstr ""
-#: ckanext/odsh/templates/macros/form.html:544
+#: ckanext/odsh/templates/macros/form.html:575
msgid "Clear Upload"
msgstr ""
@@ -316,7 +315,7 @@ msgstr ""
#: ckanext/odsh/templates/organization/index.html:33
#: ckanext/odsh/templates/organization/read_base.html:3
#: ckanext/odsh/templates/organization/read_base.html:6
-#: ckanext/odsh/templates/package/base.html:14
+#: ckanext/odsh/templates/package/base.html:21
msgid "Organizations"
msgstr ""
@@ -368,7 +367,7 @@ msgid "Issued Descending"
msgstr ""
#: ckanext/odsh/templates/organization/read.html:32
-#: ckanext/odsh/templates/snippets/package_item.html:90
+#: ckanext/odsh/templates/snippets/package_item.html:101
#: ckanext/odsh/templates/snippets/search_form.html:20
msgid "Popular"
msgstr ""
@@ -379,17 +378,17 @@ msgid "Search datasets..."
msgstr ""
#: ckanext/odsh/templates/organization/read.html:37
-#: ckanext/odsh/templates/package/base.html:7
-#: ckanext/odsh/templates/package/base.html:17
-#: ckanext/odsh/templates/package/read.html:17
-#: ckanext/odsh/templates/package/read.html:22
+#: ckanext/odsh/templates/package/base.html:14
+#: ckanext/odsh/templates/package/base.html:24
+#: ckanext/odsh/templates/package/read.html:31
+#: ckanext/odsh/templates/package/read.html:39
#: ckanext/odsh/templates/package/search.html:5
-#: ckanext/odsh/templates/snippets/organization.html:59
+#: ckanext/odsh/templates/snippets/organization.html:102
msgid "Documents"
msgstr ""
#: ckanext/odsh/templates/organization/read_base.html:29
-#: ckanext/odsh/templates/snippets/organization.html:47
+#: ckanext/odsh/templates/snippets/organization.html:90
msgid "There is no description for this organization"
msgstr ""
@@ -410,32 +409,27 @@ msgstr ""
msgid "A little information about my organization..."
msgstr ""
-#: ckanext/odsh/templates/organization/snippets/organization_form.html:35
-#: ckanext/odsh/templates/organization/snippets/organization_form.html:48
-msgid "Custom Field"
-msgstr ""
-
-#: ckanext/odsh/templates/organization/snippets/organization_form.html:60
+#: ckanext/odsh/templates/organization/snippets/organization_form.html:51
msgid ""
"Are you sure you want to delete this Organization? This will delete all the "
"public and private datasets belonging to this organization."
msgstr ""
-#: ckanext/odsh/templates/organization/snippets/organization_form.html:63
+#: ckanext/odsh/templates/organization/snippets/organization_form.html:54
msgid "Save Organization"
msgstr ""
#: ckanext/odsh/templates/organization/snippets/organization_item.html:15
-#: ckanext/odsh/templates/snippets/package_item.html:75
+#: ckanext/odsh/templates/snippets/package_item.html:87
msgid "View {organization_name}"
msgstr ""
-#: ckanext/odsh/templates/package/base.html:22
+#: ckanext/odsh/templates/package/base.html:29
msgid "Dokuments"
msgstr ""
-#: ckanext/odsh/templates/package/base.html:23
-#: ckanext/odsh/templates/package/read.html:23
+#: ckanext/odsh/templates/package/base.html:30
+#: ckanext/odsh/templates/package/read.html:40
msgid "Create Dataset"
msgstr ""
@@ -466,7 +460,7 @@ msgstr ""
#: ckanext/odsh/templates/package/edit_view.html:21
#: ckanext/odsh/templates/package/new_view.html:31
-#: ckanext/odsh/templates/package/read.html:81
+#: ckanext/odsh/templates/package/read.html:116
msgid "Preview"
msgstr ""
@@ -513,47 +507,47 @@ msgid ""
msgstr ""
#: ckanext/odsh/templates/package/new_view.html:32
-#: ckanext/odsh/templates/package/snippets/resource_form.html:111
+#: ckanext/odsh/templates/package/snippets/resource_form.html:103
msgid "Add"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:35
-#: ckanext/odsh/templates/snippets/package_item.html:79
+#: ckanext/odsh/templates/package/read.html:52
+#: ckanext/odsh/templates/snippets/package_item.html:91
msgid "Draft"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:38
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:279
-#: ckanext/odsh/templates/snippets/organization.html:25
-#: ckanext/odsh/templates/snippets/package_item.html:81
+#: ckanext/odsh/templates/package/read.html:55
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:281
+#: ckanext/odsh/templates/snippets/organization.html:24
+#: ckanext/odsh/templates/snippets/package_item.html:93
msgid "Deleted"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:44
+#: ckanext/odsh/templates/package/read.html:61
msgid "Manage Dataset"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:51
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:255
-#: ckanext/odsh/templates/snippets/package_item.html:70
+#: ckanext/odsh/templates/package/read.html:68
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:257
+#: ckanext/odsh/templates/snippets/package_item.html:82
msgid "Private"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:62
-msgid "Publisher"
+#: ckanext/odsh/templates/package/read.html:79
+msgid "Detailinformationen"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:101
+#: ckanext/odsh/templates/package/read.html:139
msgid "latest collection member"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:106
-#: ckanext/odsh/templates/package/read.html:111
+#: ckanext/odsh/templates/package/read.html:144
+#: ckanext/odsh/templates/package/read.html:149
msgid "predecessor"
msgstr ""
-#: ckanext/odsh/templates/package/read.html:116
-#: ckanext/odsh/templates/package/read.html:121
+#: ckanext/odsh/templates/package/read.html:154
+#: ckanext/odsh/templates/package/read.html:159
msgid "successor"
msgstr ""
@@ -660,20 +654,20 @@ msgid "Format"
msgstr ""
#: ckanext/odsh/templates/package/resource_read.html:170
-#: ckanext/odsh/templates/package/snippets/info.html:94
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:93
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:99
+#: ckanext/odsh/templates/package/snippets/info.html:98
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:95
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:101
msgid "License"
msgstr ""
#: ckanext/odsh/templates/package/search.html:63
-#: ckanext/odsh/templates/package/snippets/info.html:72
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:142
+#: ckanext/odsh/templates/package/snippets/info.html:75
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:144
msgid "timerange"
msgstr ""
#: ckanext/odsh/templates/package/search.html:78
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:160
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:162
#: ckanext/odsh/templates/snippets/search_form.html:117
msgid "from"
msgstr ""
@@ -693,7 +687,7 @@ msgid "wrong_start_date_for_search"
msgstr ""
#: ckanext/odsh/templates/package/search.html:93
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:174
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:176
#: ckanext/odsh/templates/snippets/search_form.html:144
msgid "to"
msgstr ""
@@ -724,37 +718,37 @@ msgid "View preview"
msgstr ""
#: ckanext/odsh/templates/package/snippets/info.html:27
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:85
-#: ckanext/odsh/templates/snippets/package_item.html:114
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:87
+#: ckanext/odsh/templates/snippets/package_item.html:127
msgid "subject"
msgstr ""
#: ckanext/odsh/templates/package/snippets/info.html:38
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:237
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:239
msgid "language"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/info.html:50
-#: ckanext/odsh/templates/snippets/package_item.html:97
+#: ckanext/odsh/templates/package/snippets/info.html:51
+#: ckanext/odsh/templates/snippets/package_item.html:109
msgid " category: "
msgid_plural " categories: "
msgstr[0] ""
msgstr[1] ""
-#: ckanext/odsh/templates/package/snippets/info.html:82
-#: ckanext/odsh/templates/snippets/package_item.html:115
+#: ckanext/odsh/templates/package/snippets/info.html:86
+#: ckanext/odsh/templates/snippets/package_item.html:128
msgid "issued"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/info.html:87
+#: ckanext/odsh/templates/package/snippets/info.html:91
msgid "modified"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/info.html:110
+#: ckanext/odsh/templates/package/snippets/info.html:114
msgid "share this dataset"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/info.html:125
+#: ckanext/odsh/templates/package/snippets/info.html:129
msgid "send an email"
msgstr ""
@@ -762,52 +756,48 @@ msgstr ""
msgid "Enter title"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:36
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:38
msgid "Enter description"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:58
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:60
msgid "Organization"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:66
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:68
msgid "No organization"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:119
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:121
#: ckanext/odsh/templates/user/snippets/login_form.html:23
msgid "enter name"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:229
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:231
msgid "odsh tags placeholder"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:243
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:245
msgid "Spatial uri"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:248
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:250
msgid "Visibility"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:255
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:257
msgid "Public"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:269
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:271
msgid "State"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:276
+#: ckanext/odsh/templates/package/snippets/package_basic_fields.html:278
msgid "Active"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/package_form.html:31
-msgid "Are you sure you want to delete this dataset?"
-msgstr ""
-
-#: ckanext/odsh/templates/package/snippets/package_form.html:38
+#: ckanext/odsh/templates/package/snippets/package_form.html:32
msgid "Next: Add Data"
msgstr ""
@@ -865,11 +855,7 @@ msgstr ""
msgid "eg. CSV, XML or JSON"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/resource_form.html:95
-msgid "Are you sure you want to delete this resource?"
-msgstr ""
-
-#: ckanext/odsh/templates/package/snippets/resource_form.html:106
+#: ckanext/odsh/templates/package/snippets/resource_form.html:98
msgid "Upload dataset"
msgstr ""
@@ -885,8 +871,8 @@ msgstr ""
msgid "Resource count"
msgstr ""
-#: ckanext/odsh/templates/package/snippets/resource_item.html:24
-#: ckanext/odsh/templates/package/snippets/resource_item.html:41
+#: ckanext/odsh/templates/package/snippets/resource_item.html:28
+#: ckanext/odsh/templates/package/snippets/resource_item.html:45
msgid "download file"
msgstr ""
@@ -964,15 +950,19 @@ msgstr ""
msgid "map"
msgstr ""
-#: ckanext/odsh/templates/snippets/organization.html:44
+#: ckanext/odsh/templates/snippets/organization.html:87
msgid "read more"
msgstr ""
-#: ckanext/odsh/templates/snippets/organization.html:55
+#: ckanext/odsh/templates/snippets/organization.html:98
msgid "Followers"
msgstr ""
-#: ckanext/odsh/templates/snippets/package_item.html:65
+#: ckanext/odsh/templates/snippets/package_item.html:74
+msgid "historical"
+msgstr ""
+
+#: ckanext/odsh/templates/snippets/package_item.html:77
msgid "NEW"
msgstr ""
@@ -998,19 +988,19 @@ msgid "Date Descending"
msgstr ""
#: ckanext/odsh/templates/snippets/search_form.html:16
-msgid "Start Date Descending"
+msgid "Start Date Ascending"
msgstr ""
#: ckanext/odsh/templates/snippets/search_form.html:17
-msgid "Start Date Ascending"
+msgid "Start Date Descending"
msgstr ""
#: ckanext/odsh/templates/snippets/search_form.html:18
-msgid "End Date Descending"
+msgid "End Date Ascending"
msgstr ""
#: ckanext/odsh/templates/snippets/search_form.html:19
-msgid "End Date Ascending"
+msgid "End Date Descending"
msgstr ""
#: ckanext/odsh/templates/snippets/search_form.html:45
@@ -1121,17 +1111,91 @@ msgstr[1] ""
msgid "No organizations found"
msgstr ""
-#: ckanext/odsh/templates/user/login.html:3
-#: ckanext/odsh/templates/user/login.html:6
-#: ckanext/odsh/templates/user/login.html:12
+#: ckanext/odsh/templates/user/edit_user_form.html:9
+msgid "Change details"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:10
+#: ckanext/odsh/templates/user/snippets/login_form.html:22
+msgid "Username"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:12
+msgid "Full name"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:12
+msgid "eg. Joe Bloggs"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:14
+msgid "Email"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:14
+msgid "eg. joe@example.com"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:16
+msgid "About"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:16
+msgid "A little information about yourself"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:19
+msgid "Subscribe to notification emails"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:28
+msgid "Change password"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:31
+msgid "Sysadmin Password"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:31
+msgid "Old Password"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:40
+#: ckanext/odsh/templates/user/snippets/login_form.html:29
+msgid "Password"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:42
+msgid "Confirm Password"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:48
+msgid "Are you sure you want to delete this User?"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:53
+msgid "Are you sure you want to regenerate the API key?"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:53
+msgid "Regenerate API Key"
+msgstr ""
+
+#: ckanext/odsh/templates/user/edit_user_form.html:57
+msgid "Update Profile"
+msgstr ""
+
+#: ckanext/odsh/templates/user/login.html:5
+#: ckanext/odsh/templates/user/login.html:15
+#: ckanext/odsh/templates/user/login.html:21
msgid "Login"
msgstr ""
-#: ckanext/odsh/templates/user/login.html:25
+#: ckanext/odsh/templates/user/login.html:34
msgid "Forgotten your password?"
msgstr ""
-#: ckanext/odsh/templates/user/login.html:28
+#: ckanext/odsh/templates/user/login.html:37
msgid "change password"
msgstr ""
@@ -1148,14 +1212,6 @@ msgstr ""
msgid "You are now logged out."
msgstr ""
-#: ckanext/odsh/templates/user/snippets/login_form.html:22
-msgid "Username"
-msgstr ""
-
-#: ckanext/odsh/templates/user/snippets/login_form.html:29
-msgid "Password"
-msgstr ""
-
#: ckanext/odsh/templates/user/snippets/login_form.html:30
msgid "enter password"
msgstr ""
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo
index e5231b5c445d99ba368944a4870058a2d41ed820..1c4da89d6d4406861348878d27777743c76b16af 100644
GIT binary patch
delta 2855
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
TQt%W%7nE0=oUz$S@j4p-adHXF
delta 2803
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
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 67d07054..7df7151b 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -541,4 +541,7 @@ msgid "Name Ascending"
msgstr "Name: A – Z"
msgid "Name Descending"
-msgstr "Name: Z – A"
\ No newline at end of file
+msgstr "Name: Z – A"
+
+msgid "historical"
+msgstr "historisch"
\ No newline at end of file
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index eff66dca..3530e9c7 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -739,6 +739,10 @@ label.rangesearch.disabled {
border-bottom: none;
}
+.opaque {
+ opacity: 0.6;
+}
+
.preview-image-container {
display: flex;
flex-direction: column;
@@ -2363,8 +2367,7 @@ span.clear {
{
display: inline-block;
box-sizing: border-box;
- height: 20px;
- padding: 3px 10px;
+ padding: 1px 10px;
background-color: #dbdbdb;
border-radius: 3px;
font-size: 12px;
@@ -2608,12 +2611,18 @@ p.package-info-issued {
.new-dataset-label
{
background-color: #d4004b!important;;
- padding: 3px 3px 1px 3px;
+ padding: 2px 3px 2px 3px;
font-size: 14px;
margin-right: 4px;
text-shadow: none;
}
+.historical-dataset-label
+{
+ padding: 2px 3px 2px 3px;
+ text-shadow: none;
+}
+
.comments-heading{
color: black;
font-weight: normal;
diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html
index 90ea7af0..c94fa9a4 100644
--- a/ckanext/odsh/templates/snippets/package_item.html
+++ b/ckanext/odsh/templates/snippets/package_item.html
@@ -30,9 +30,11 @@ Example:
{% set language_of_package = h.tpsh_get_language_of_package(package) %}
{% set language_icon = h.get_language_icon(package) %}
{% set thumbnail = package.get('thumbnail') %}
+{% set collection = h.get_collection(package) %}
+{% set successor_url = collection['successor']['url'] if collection else None %}
{% block package_item %}
-<li class="odsh-dataset-item">
+<li class="odsh-dataset-item {% if successor_url %}opaque{% endif %}">
<div class="preview-image-container">
{% if thumbnail %}
<a href={{ h.url_for(controller='package', action='read', id=package.name) }}>
@@ -68,6 +70,9 @@ Example:
<p>{{ org }}</p>
<h3 class="dataset-heading">
{% block heading_private %}
+ {% if successor_url %}
+ <span class='label historical-dataset-label'>{{ _('historical') }}</span>
+ {% endif %}
{% if package.is_new %}
<span class='label new-dataset-label'>{{ _('NEW') }}</span>
{% endif %}
--
GitLab