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

[Taskman #257557] explaination on use of Status buttons : current/ obsolete/superseeded. #70

Merged
merged 2 commits into from
Nov 27, 2023
Merged

[Taskman #257557] explaination on use of Status buttons : current/ obsolete/superseeded. #70

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
3679505
Restructure the layout of the `ComposedOf` block
MichelGabriel Nov 9, 2023
34260ae
Restructure the 'composed of' block on the detail page.
MichelGabriel Oct 25, 2023
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
39 changes: 15 additions & 24 deletions web-ui/src/main/resources/catalog/components/metadataactions/partials/recordsFilters.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
<div data-ng-if="agg">
<div class="row">
<div class="col-md-2">
<h2>{{title}}</h2>
</div>
<div class="col-md-10">
<div data-ng-repeat="filter in filtersToProcess" class="row">
<div class="col-md-3">
<div class="pull-right">{{('facet-' + filter) | facetKeyTranslator}}</div>
</div>
<div class="col-md-9">
<div class="btn-group btn-group-sm" role="group" aria-label="filter">
<button
data-ng-repeat="(key, b) in agg[filter].buckets"
data-ng-click="filterRecordsBy(filter, b.key)"
data-ng-disabled="b.doc_count === children.length"
type="button"
class="btn btn-default"
data-ng-class="{'btn-primary': current === (filter + '-' + b.key)}"
>
{{(b.key | translate) || '&nbsp;'}} ({{b.doc_count}})
</button>
</div>
</div>
</div>
<h2>{{title}}</h2>
<p class="text-muted" translate="">filterHelp</p>
<div data-ng-repeat="filter in filtersToProcess">
<label>{{('facet-' + filter) | facetKeyTranslator}}</label>
<div>
<button
data-ng-repeat="(key, b) in agg[filter].buckets"
data-ng-click="filterRecordsBy(filter, b.key)"
data-ng-disabled="b.doc_count === children.length"
type="button"
class="btn btn-default btn-sm gn-margin-bottom-sm gn-margin-right-sm"
data-ng-class="{'btn-primary': current === (filter + '-' + b.key)}"
>
{{(b.key | translate) || '&nbsp;'}} ({{b.doc_count}})
</button>
</div>
</div>
</div>
3 changes: 2 additions & 1 deletion web-ui/src/main/resources/catalog/locales/en-v4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,5 +432,6 @@
"lastCreatedRecords": "Last created records",
"associationType": "Association type",
"initiativeType": "Initiative type",
"associatedTo": "Associated "
"associatedTo": "Associated ",
"filterHelp": "Please click on one of the buttons below to activate the filter"
}
5 changes: 4 additions & 1 deletion web-ui/src/main/resources/catalog/views/default/less/gn_card_default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,10 @@ table.gn-resultview {
.gn-card {
min-width: 150px;
width: calc(~"(100% / 4) - 20px");
@media (max-width: @screen-sm-min) {
@media (max-width: 1440px) {
width: calc(~"(100% / 3) - 20px");
}
@media (max-width: @screen-lg-min) {
width: calc(~"(100% / 2) - 20px");
}
@media (max-width: @screen-xs) {
Expand Down
56 changes: 31 additions & 25 deletions web-ui/src/main/resources/catalog/views/default/templates/recordView/type-series.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
<div data-gn-data-preview="mdView.current.record"></div>
</div>
</div>
<div class="col-md-12 gn-record">

<div class="row">
<!-- Records filters -->
<div
class="col-md-4 col-sm-12 gn-margin-bottom gn-padding-bottom-lg"
data-ng-if="mdView.current.record.related.uuids"
data-gn-records-filters
data-agg="mdView.current.record.related.children.length > 0
Expand All @@ -39,31 +41,35 @@
data-title="{{'seriesComposedOf' | translate}}"
></div>

<!-- Related records -->
<div
data-ng-if="mdView.current.record.related.uuids"
data-gn-related-with-stats="mdView.current.record.related.children.length > 0
? mdView.current.record.related.children
: mdView.current.record.related.siblings"
data-agg="mdView.current.record.related.children.length > 0
? mdView.current.record.related.aggregations_children
:mdView.current.record.related.aggregations_siblings"
data-type="'blocks'"
data-sort-by="resourceTitle"
data-title="{{'seriesComposedOf' | translate}}"
></div>
<div class="col-md-8 col-sm-12">

<!-- Related records table -->
<div
data-gn-records-table="mdView.current.record.related.children.length > 0
? mdView.current.record.related.children
: mdView.current.record.related.siblings"
data-agg="mdView.current.record.related.children.length > 0
? mdView.current.record.related.aggregations_children
:mdView.current.record.related.aggregations_siblings"
labels="{{::viewConfig.collectionTableConfig.labels}}"
columns="{{::viewConfig.collectionTableConfig.columns}}"
/>

<div
class="gn-margin-bottom"
data-ng-if="mdView.current.record.related.uuids"
data-gn-related-with-stats="mdView.current.record.related.children.length > 0
? mdView.current.record.related.children
: mdView.current.record.related.siblings"
data-agg="mdView.current.record.related.children.length > 0
? mdView.current.record.related.aggregations_children
:mdView.current.record.related.aggregations_siblings"
data-type="'blocks'"
data-sort-by="resourceTitle"
data-title="{{'seriesComposedOf' | translate}}"
></div>

<!-- Related records table -->
<div
data-gn-records-table="mdView.current.record.related.children.length > 0
? mdView.current.record.related.children
: mdView.current.record.related.siblings"
data-agg="mdView.current.record.related.children.length > 0
? mdView.current.record.related.aggregations_children
:mdView.current.record.related.aggregations_siblings"
labels="{{::viewConfig.collectionTableConfig.labels}}"
columns="{{::viewConfig.collectionTableConfig.columns}}"
></div>
</div>
</div>

<div class="row gn-section gn-section-{{mdView.current.record.resourceType[0]}}">
Expand Down
Loading