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

HDX-10171 remove metadata tab & add additional info panel #6504

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
+389 −499
Open

HDX-10171 remove metadata tab & add additional info panel #6504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
142e8bc
HDX-10171 remove metadata tab & add additional info panel
ccataalin Dec 18, 2024
84e2dc0
HDX-10171 exclude source from extra fields
ccataalin Dec 19, 2024
5bfa00e
HDX-10171 remove margin-left space
ccataalin Dec 19, 2024
ed079b2
HDX-10171 add less button
ccataalin Dec 19, 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
36 changes: 24 additions & 12 deletions ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/datasets/dataset.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,27 @@
}
/* END Style Resources List*/
/* Style Additional Info */
.additional-info table tr {
height: 38px;
font-family: 'Source Sans Pro', sans-serif;
.additional-info .additional-info-content .dataset-label {
color: #1F2937;
font-family: 'Gotham-Bold', sans-serif;
font-size: 12px;
font-weight: 400;
font-size: 14px;
line-height: 14.4px;
text-transform: uppercase;
}
.additional-info td {
text-align: justify;
word-break: break-word;
.additional-info .additional-info-content .dataset-details {
color: #000;
font-family: 'Source Sans Pro', sans-serif;
font-size: 14px;
line-height: 18px;
margin-top: 0.25rem;
}
.additional-info td.dataset-details pre {
text-wrap: wrap;
.additional-info .additional-info-content .dataset-details .tag-wrapper {
float: none;
display: inline-block;
}
.additional-info th {
max-width: 200px;
width: 190px;
.additional-info .additional-info-content .quick-edit .dataset-details {
padding-right: 0;
}
/* END Style Additional Info */
/* Resource grouping */
Expand All @@ -118,9 +123,16 @@
font-size: 24px;
margin-left: 5px;
}
.wrapper-secondary.col-4 {
border-right: 0;
}
.wrapper-secondary .form-check .form-check-input {
box-shadow: none;
}
.wrapper-primary.col-8 {
border-left: 0;
margin-left: 0;
}
.notification-platform-opt-in-action-menu {
cursor: pointer;
background-color: #007CE1;
Expand Down
10 changes: 8 additions & 2 deletions ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/datasets/dataset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@ $(document).ready(function() {
}
);

$('#show-more-dates, #hide-more-dates').on('click', function(e) {
$('#show-extra-dates, #hide-extra-dates').on('click', function(e) {
e.preventDefault();
$('#show-more-dates, #hide-more-dates').toggleClass('d-none');
$('#show-extra-dates, #hide-extra-dates').toggleClass('d-none');
$('.more-dates').toggleClass('d-none');
});

$('#show-extra-fields, #hide-extra-fields').on('click', function(e) {
e.preventDefault();
$('#show-extra-fields, #hide-extra-fields').toggleClass('d-none');
$('.additional-info-extra-fields').toggleClass('d-none');
});

$('#showDatasetActivity').on('change', function() {
$('.dataset-activity-wrapper').toggleClass('d-none');
});
Expand Down
2 changes: 1 addition & 1 deletion ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/datasets/stats-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ $(document).ready(function(){
if (chartData.length > 0){
setupDatasetDownloads(datasetDwdId, "#dataset-downloads-chart");
} else {
$("#dataset-downloads-chart-no-data").show();
$("#dataset-downloads-chart-no-data").removeClass('d-none');
}
}
});
36 changes: 24 additions & 12 deletions ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/light/dataset/dataset-light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,27 @@
}
/* END Style Resources List*/
/* Style Additional Info */
.additional-info table tr {
height: 38px;
font-family: 'Source Sans Pro', sans-serif;
.additional-info .additional-info-content .dataset-label {
color: #1F2937;
font-family: 'Gotham-Bold', sans-serif;
font-size: 12px;
font-weight: 400;
font-size: 14px;
line-height: 14.4px;
text-transform: uppercase;
}
.additional-info td {
text-align: justify;
word-break: break-word;
.additional-info .additional-info-content .dataset-details {
color: #000;
font-family: 'Source Sans Pro', sans-serif;
font-size: 14px;
line-height: 18px;
margin-top: 0.25rem;
}
.additional-info td.dataset-details pre {
text-wrap: wrap;
.additional-info .additional-info-content .dataset-details .tag-wrapper {
float: none;
display: inline-block;
}
.additional-info th {
max-width: 200px;
width: 190px;
.additional-info .additional-info-content .quick-edit .dataset-details {
padding-right: 0;
}
/* END Style Additional Info */
/* Resource grouping */
Expand All @@ -118,9 +123,16 @@
font-size: 24px;
margin-left: 5px;
}
.wrapper-secondary.col-4 {
border-right: 0;
}
.wrapper-secondary .form-check .form-check-input {
box-shadow: none;
}
.wrapper-primary.col-8 {
border-left: 0;
margin-left: 0;
}
.notification-platform-opt-in-action-menu {
cursor: pointer;
background-color: #007CE1;
Expand Down
10 changes: 8 additions & 2 deletions ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/light/dataset/dataset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@ $(document).ready(function() {
}
});

$('#show-more-dates, #hide-more-dates').on('click', function(e) {
$('#show-extra-dates, #hide-extra-dates').on('click', function(e) {
e.preventDefault();
$('#show-more-dates, #hide-more-dates').toggleClass('d-none');
$('#show-extra-dates, #hide-extra-dates').toggleClass('d-none');
$('.more-dates').toggleClass('d-none');
});

$('#show-extra-fields, #hide-extra-fields').on('click', function(e) {
e.preventDefault();
$('#show-extra-fields, #hide-extra-fields').toggleClass('d-none');
$('.additional-info-extra-fields').toggleClass('d-none');
});
});
4 changes: 2 additions & 2 deletions ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/search_/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ $('document').ready(function(){
$results.hide();
});

$('.show-more-dates, .hide-more-dates').on('click', function(e) {
$('.show-extra-dates, .hide-extra-dates').on('click', function(e) {
e.preventDefault();
var parent = $(this).closest('.dataset-dates');
$('.show-more-dates, .hide-more-dates', parent).toggleClass('d-none');
$('.show-extra-dates, .hide-extra-dates', parent).toggleClass('d-none');
$('.more-dates', parent).toggleClass('d-none');
});
});
Expand Down
1 change: 1 addition & 0 deletions ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/webassets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@ dataset-light-scripts:
- hdx_theme/dataset-light-styles
contents:
- light/dataset/dataset.js
- select2/select2.js

dataset-light-styles:
<<: *common-css
Expand Down
50 changes: 34 additions & 16 deletions ckanext-hdx_theme/ckanext/hdx_theme/hdx-styles/src/common/less/datasets/dataset.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "../base/variables";
@import "../base/mixins";
@import "../bem.blocks/bem_variables";
/**
OLD Dataset CSS
**/
Expand Down Expand Up @@ -96,26 +97,34 @@

/* Style Additional Info */
.additional-info {
table tr {
height: 38px;
font-family: 'Source Sans Pro', sans-serif;
font-weight: 400;
font-size: 14px;
}
.additional-info-content {
.dataset-label {
color: @blue-medium-dark-color;
font-family: @gothamBoldFont;
font-size: 12px;
font-weight: 400;
line-height: 14.4px;
text-transform: uppercase;
}

td {
text-align: justify;
word-break: break-word;
&.dataset-details {
pre {
text-wrap: wrap;
.dataset-details {
color: @black-color;
font-family: 'Source Sans Pro', sans-serif;
font-size: 14px;
line-height: 18px;
margin-top: .25rem;

.tag-wrapper {
float: none;
display: inline-block;
}
}
}

th {
max-width: 200px;
width: 190px;
.quick-edit {
.dataset-details {
padding-right: 0;
}
}
}
}
/* END Style Additional Info */
Expand Down Expand Up @@ -145,12 +154,21 @@
}

.wrapper-secondary {
&.col-4 {
border-right: 0;
}
.form-check {
.form-check-input {
box-shadow: none;
}
}
}
.wrapper-primary {
&.col-8 {
border-left: 0;
margin-left: 0;
}
}

.notification-platform-opt-in-action-menu {
cursor: pointer;
Expand Down
Loading
Loading