Skip to content

Commit f7d86a8

Browse files
committed
add a warning banner on 'replaced' images linking to the child image(s) that replace it
1 parent 8693d3d commit f7d86a8

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

kahuna/public/js/components/gr-image-usage/gr-image-usage-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<span ng-if="usage.childUsageMetadata" ng-switch="usage.status">
1414
<span ng-switch-when="derivative">Used to create</span>
1515
<span ng-switch-when="replaced">Replaced with</span>
16-
<a href="{{usage.childUsageMetadata.childMediaId}}" rel="noopener" target="_blank">{{usage.childUsageMetadata.childMediaId}}</a>
16+
<a href="{{usage.childUsageMetadata.childMediaId}}">{{usage.childUsageMetadata.childMediaId}}</a>
1717
(added by {{usage.childUsageMetadata.addedBy}}).
1818
</span>
1919

kahuna/public/js/image/controller.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,10 @@ image.controller('ImageCtrl', [
159159
ctrl.optimisedImageUri = optimisedImageUri;
160160
ctrl.lowResImageUri = lowResImageUri;
161161

162+
ctrl.maybeReplacedByMediaIds = image.data.usages.data
163+
.filter(usage => usage.data.status === "replaced")
164+
.map(usage => usage.data.childUsageMetadata.childMediaId);
165+
162166
ctrl.singleImageList = ctrl.image ? new List([ctrl.image]) : new List([]);
163167

164168
editsService.canUserEdit(ctrl.image).then(editable => {

kahuna/public/js/image/view.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@
169169

170170
<div class="image-holder" role="main" aria-label="Image view">
171171
<div class="easel">
172+
<div class="warning" ng-if="ctrl.maybeReplacedByMediaIds.length > 0">
173+
This image has been <strong>replaced</strong> by <span ng-repeat="mediaId in ctrl.maybeReplacedByMediaIds">
174+
<a href="{{mediaId}}">{{mediaId}}</a>&nbsp;
175+
</span>
176+
</div>
172177
<div class="easel__canvas"
173178
ng-if="!ctrl.crop"
174179
draggable="true"

kahuna/public/stylesheets/main.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -884,6 +884,10 @@ textarea.ng-invalid {
884884
.warning--small {
885885
padding: 5px 10px;
886886
}
887+
.warning a{
888+
color: black;
889+
text-decoration: underline;
890+
}
887891

888892
.full-error {
889893
margin-top: 3rem;
@@ -2007,6 +2011,10 @@ FIXME: what to do with touch devices
20072011
vertical-align: middle;
20082012
overflow: hidden;
20092013
}
2014+
.warning + .easel__canvas { /* when an easel__canvas follows a warning banner */
2015+
height: calc(100vh - 134px); /* viewport - (top-bar + warning) */
2016+
margin: 10px;
2017+
}
20102018

20112019
.easel__image-container {
20122020
/*style rules also affect the cropper preview*/

0 commit comments

Comments
 (0)