yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/11.0' into release/11.0

Browse Source
This commit is contained in:
Bjarke Berg
2022-11-29 10:36:13 +01:00
parent 9bed0cde9a b5a3dcb81e
commit abd490f460
4 changed files with 49 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js
View File

@@ -6,10 +6,9 @@
* @description
* The controller for the info view of the datatype editor
*/
function DataTypeInfoController($scope, $routeParams, dataTypeResource, eventsService, $timeout, editorService) {
function DataTypeInfoController($scope, $routeParams, dataTypeResource, $timeout, editorService) {
var vm = this;
var evts = [];
var referencesLoaded = false;
vm.references = {};
@@ -48,7 +47,7 @@ function DataTypeInfoController($scope, $routeParams, dataTypeResource, eventsSe
function open(id, event, type) {
// targeting a new tab/window?
if (event.ctrlKey ||
if (event.ctrlKey ||
event.shiftKey ||
event.metaKey || // apple
(event.button && event.button === 1) // middle click, >IE9 + everyone else
@@ -85,25 +84,7 @@ function DataTypeInfoController($scope, $routeParams, dataTypeResource, eventsSe
}
}
// load data type references when the references tab is activated
evts.push(eventsService.on("app.tabChange", function (event, args) {
$timeout(function () {
if (args.alias === "info") {
loadRelations();
}
});
}));
//ensure to unregister from all events!
$scope.$on('$destroy', function () {
for (var e in evts) {
eventsService.unsubscribe(evts[e]);
}
});
loadRelations();
}
angular.module("umbraco").controller("Umbraco.Editors.DataType.InfoController", DataTypeInfoController);

60
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
View File

@@ -95,18 +95,13 @@ ng-form.ng-invalid-val-server-match-content > .umb-block-grid__block:not(.--acti
&::after {
display: var(--umb-block-grid--block-ui-display, block);
animation: umb-block-grid__block__border-pulse 400ms ease-in-out alternate infinite;
@keyframes umb-block-grid__block__border-pulse {
0% { border-color: rgba(@blueDark, 1); }
100% { border-color: rgba(@blueDark, 0.66); }
}
border-color: @blueDark;
}
}
&.--active {
&::after {
display: block;
border-color: @pinkLight;
animation: none;
}
> .umb-block-grid__block--context {
@@ -223,15 +218,16 @@ ng-form.ng-invalid > .umb-block-grid__block:not(.--active) > .umb-block-grid__bl
.umb-block-grid__block--context {
position: absolute;
top: -21px;
bottom: 100%;
right: -1px;
max-width: 100%;
font-size: 12px;
z-index: 4;
display: var(--umb-block-grid--block-ui-display, flex);
justify-content: end;
/** prevent interaction with inline-create button just beneath the context-bar: */
::after {
&::after {
content: '';
position: absolute;
top: 100%;
@@ -243,34 +239,62 @@ ng-form.ng-invalid > .umb-block-grid__block:not(.--active) > .umb-block-grid__bl
.__context-bar {
padding: 0 9px;
padding-top: 1px;
background-color: #3544B1;
background-color: @blueDark;
color: white;
border-top: rgba(255, 255, 255, .7) 1px solid;
border-left: rgba(255, 255, 255, .7) 1px solid;
border-right: rgba(255, 255, 255, .7) 1px solid;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
display: inline-block;
display: inline-flex;
box-sizing: border-box;
max-width: 100%;
white-space: nowrap;
/* Ensure that the bar is visually connected with the border **/
&::before {
content: '';
position: absolute;
left: 0;
bottom: -1px;
width: 1px;
border-top: 1px solid @blueDark;
box-sizing: border-box;
background: none;
}
&::after {
content: '';
position: absolute;
right: 1px;
bottom: -2px;
height: 2px;
width: 2px;
border-top: 1px solid @blueDark;
border-right: 1px solid @blueDark;
box-sizing: border-box;
background: none;
}
.action {
color: currentColor;
font-size: 12px;
line-height: inherit;
overflow: hidden;
text-overflow: ellipsis;
}
.__divider {
display: inline-block;
margin: 0 3px;
}
.__label {
display: inline-flex;
align-items: center;
padding: 0;
font-weight: 700;
user-select: none;
.icon {
font-size: 22px;
margin-right: 5px;
display: inline-block;
}
overflow: hidden;
text-overflow: ellipsis;
}
}
}

14
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html
View File

@@ -76,18 +76,10 @@
title="blockEditor_focusParentBlock"
ng-click="vm.parentBlock.showBlockUI()"
ng-class="{ '--error': false && vm.valFormManager.isShowingValidation() }"
>
<span>
{{vm.parentBlock.label}}
</span>
<span class="sr-only">
<localize key="blockEditor_focusParentBlock">Focus parent block</localize>
</span>
</button>
ng-bind="vm.parentBlock.label"
></button>
<div class="__divider" ng-if="vm.parentBlock">/</div>
<div class="__label">
<span>{{vm.layoutEntry.$block.label}}</span>
</div>
<div class="__label" title="{{vm.layoutEntry.$block.label}}" ng-bind="vm.layoutEntry.$block.label"></div>
</div>
</div>

9
src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js
View File

@@ -54,14 +54,7 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource,
});
// load references when the 'relations' tab is first activated/switched to
var appTabChange = eventsService.on("app.tabChange", function (event, args) {
if (args.alias === "relations") {
loadRelations();
}
});
$scope.$on('$destroy', function () {
appTabChange();
});
loadRelations();
// Inital page/overview API call of relation type
relationTypeResource.getById($routeParams.id)