Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Video Formats & Additional Sprite Sheet #1521

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Video Formats & Additional Sprite Sheet #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40dcf17
feat(schema): video formats;
JVickery-TBS Oct 9, 2024
477cc1b
feat(misc): changelog;
JVickery-TBS Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ links/who.ini
ckanext/canada/templates/public/snippets/site_message_*
ckanext/canada/download/*.jsonl
**.mo
*.xcf
5 changes: 5 additions & 0 deletions changes/1521.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Added additional Resource formats sprite sheet and added supported Resource formats:

* FLV
* MKV
* MP4
43 changes: 33 additions & 10 deletions ckanext/canada/assets/public/canada_public.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 ##
#################################*/
Expand Down
Binary file added ckanext/canada/public/static/img/sprite-resource-additional-icons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 11 additions & 1 deletion ckanext/canada/schemas/presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading