From 40dcf179a51eb3776485a5fb8dcec8ce52063d9b Mon Sep 17 00:00:00 2001 From: Jesse Vickery Date: Wed, 9 Oct 2024 15:10:44 +0000 Subject: [PATCH 1/2] feat(schema): video formats; - Allow more video formats. - New sprite sheet for more extensions. --- .gitignore | 1 + .../canada/assets/public/canada_public.css | 43 ++++++++++++++---- .../img/sprite-resource-additional-icons.png | Bin 0 -> 44774 bytes ckanext/canada/schemas/presets.yaml | 12 ++++- 4 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 ckanext/canada/public/static/img/sprite-resource-additional-icons.png diff --git a/.gitignore b/.gitignore index f824f2cf8..63bdc41d9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ links/who.ini ckanext/canada/templates/public/snippets/site_message_* ckanext/canada/download/*.jsonl **.mo +*.xcf diff --git a/ckanext/canada/assets/public/canada_public.css b/ckanext/canada/assets/public/canada_public.css index e74b891ab..17a60f9bb 100644 --- a/ckanext/canada/assets/public/canada_public.css +++ b/ckanext/canada/assets/public/canada_public.css @@ -478,16 +478,6 @@ ul.resource-list > li.resource-item > div.canada-resource-list-badges a.validati ul.resource-list > li.resource-item > div.canada-resource-list-badges{ align-self: last baseline; } -ul.resource-list > li.resource-item span.format-label[data-format="pbix"]{ - background-image: url("/data/static/img/power_bi.svg"), url("/static/img/power_bi.svg"); - background-repeat: no-repeat; - background-size: 100% 100%; - background-position: 0 0; - width: 33px; - height: 36px; - transform: none !important; - margin: 0 !important; -} .resource-item .resource-action-links{ display: block !important; position: relative !important; @@ -658,6 +648,39 @@ body ul.nav li.view-item a i.icon::before{ ###################*/ +/*############################ +## Custom Resource Sprites ## +##############################*/ +ul.resource-list > li.resource-item span.format-label[data-format="pbix"]{ + background-image: url("/data/static/img/sprite-resource-additional-icons.png"), url("/static/img/sprite-resource-additional-icons.png"); + background-repeat: no-repeat; + width: 60px; + height: 65px; + background-position: -120px -220px; + transform: scale(0.53); + margin: -14px 0 0 -14px; +} +ul.resource-list > li.resource-item span.format-label[data-format="mp4"], +ul.resource-list > li.resource-item span.format-label[data-format="flv"], +ul.resource-list > li.resource-item span.format-label[data-format="mov"], +ul.resource-list > li.resource-item span.format-label[data-format="avi"], +ul.resource-list > li.resource-item span.format-label[data-format="mkv"], +ul.resource-list > li.resource-item span.format-label[data-format="wmv"]{ + background-image: url("/data/static/img/sprite-resource-additional-icons.png"), url("/static/img/sprite-resource-additional-icons.png"); + background-repeat: no-repeat; + width: 60px; + height: 65px; + background-position: -220px -220px; + transform: scale(0.53); + margin: -14px 0 0 -14px; +} +/*############################ +## END ## +## Custom Resource Sprites ## +## END ## +##############################*/ + + /*############################### ## FontAwesome5 Icon Overrides ## #################################*/ diff --git a/ckanext/canada/public/static/img/sprite-resource-additional-icons.png b/ckanext/canada/public/static/img/sprite-resource-additional-icons.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d71659297c58b1794e6a6b6ba1d1c605e79fba GIT binary patch literal 44774 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 bgyNS%Z+tO8y+0v(gu&0IKNXyJ{Pq6;p@QIU literal 0 HcmV?d00001 diff --git a/ckanext/canada/schemas/presets.yaml b/ckanext/canada/schemas/presets.yaml index 5153635fa..ae635a243 100644 --- a/ckanext/canada/schemas/presets.yaml +++ b/ckanext/canada/schemas/presets.yaml @@ -3358,6 +3358,9 @@ presets: en: Flat raster binary fr: Binaire raster plat replaces: [flat raster binary] + - value: FLV + mimetype: video/x-flv + replaces: ["fla", "f4v", "f4a", "f4b", "f4p"] - value: GDB mimetype: application/x-filegdb label: GeoSoftDatabases @@ -3437,13 +3440,20 @@ presets: - value: MFX mimetype: application/mxf - value: MOV - mimetype: video/mov + mimetype: video/quicktime + replaces: ["movie", "qt"] + - value: MKV + mimetype: video/matroska + replaces: ["mk3d", "mka", "mks"] - value: MPEG mimetype: video/mpeg - value: MPEG-1 mimetype: video/mpeg - value: MP3 mimetype: audio/mpeg + - value: MP4 + mimetype: video/mp4 + replaces: ["m4a", "m4p", "m4b", "m4r", "m4v"] - value: MXD - value: NetCDF mimetype: application/x-netcdf From 477cc1bcfecd1449a97cd9ac4c1e3ef197f5e47a Mon Sep 17 00:00:00 2001 From: Jesse Vickery Date: Wed, 9 Oct 2024 15:14:55 +0000 Subject: [PATCH 2/2] feat(misc): changelog; - Added change log file. --- changes/1521.feature | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changes/1521.feature diff --git a/changes/1521.feature b/changes/1521.feature new file mode 100644 index 000000000..489114e6f --- /dev/null +++ b/changes/1521.feature @@ -0,0 +1,5 @@ +Added additional Resource formats sprite sheet and added supported Resource formats: + +* FLV +* MKV +* MP4