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

V8: Add tooltip/title to unselectable items in MNTP (#4964)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-04-30 20:57:28 +02:00
committed by Sebastiaan Janssen
parent f05915ef08
commit 5e8d73cd20
6 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
View File

@@ -419,6 +419,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
value.cssClasses = [];
}
value.cssClasses.push($scope.model.filterCssClass);
value.title = $scope.model.filterTitle;
}
});
}
@@ -437,6 +438,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
value.cssClasses = [];
}
value.cssClasses.push($scope.model.filterCssClass);
value.title = $scope.model.filterTitle;
}
}
});

4
src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
View File

@@ -5,9 +5,9 @@
ng-style="{'visibility': (scope.enablelistviewexpand === 'true' || node.hasChildren && (!node.metaData.isContainer || isDialog)) ? 'visible' : 'hidden'}"
ng-click="load(node)">&nbsp;</ins>
<i class="icon umb-tree-icon sprTree" ng-class="::node.cssClass" title="{{::node.routePath}}" ng-click="select(node, $event)" ng-style="::node.style"></i>
<i class="icon umb-tree-icon sprTree" ng-class="::node.cssClass" title="{{::node.title}}" ng-click="select(node, $event)" ng-style="::node.style"></i>
<span class="umb-tree-item__annotation"></span>
<a class="umb-tree-item__label umb-outline" ng-href="#/{{::node.routePath}}" ng-click="select(node, $event)">{{node.name}}</a>
<a class="umb-tree-item__label umb-outline" ng-href="#/{{::node.routePath}}" ng-click="select(node, $event)" title="{{::node.title}}">{{node.name}}</a>
<!-- NOTE: These are the 'option' elipses -->
<a data-element="tree-item-options" class="umb-options" ng-click="options(node, $event)" ng-if="::node.menuUrl"><i></i><i></i><i></i></a>

7
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
View File

@@ -157,6 +157,13 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
// pre-value config on to the dialog options
angular.extend(dialogOptions, $scope.model.config);
// add the current filter (if any) as title for the filtered out nodes
if ($scope.model.config.filter) {
localizationService.localize("contentPicker_allowedItemTypes", [$scope.model.config.filter]).then(function (data) {
dialogOptions.filterTitle = data;
});
}
//We need to manually handle the filter for members here since the tree displayed is different and only contains
// searchable list views
if (entityType === "Member") {

1
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -996,6 +996,7 @@ Mange hilsner fra Umbraco robotten
<key alias="noColors">Du har ikke konfigureret nogen godkendte farver</key>
</area>
<area alias="contentPicker">
<key alias="allowedItemTypes">Du kan kun vælge følgende type(r) dokumenter: %0%</key>
<key alias="pickedTrashedItem">Du har valgt et dokument som er slettet eller lagt i papirkurven</key>
<key alias="pickedTrashedItems">Du har valgt dokumenter som er slettede eller lagt i papirkurven</key>
</area>

1
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -1247,6 +1247,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noColors">You have not configured any approved colours</key>
</area>
<area alias="contentPicker">
<key alias="allowedItemTypes">You can only select items of type(s): %0%</key>
<key alias="pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</key>
<key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
</area>

1
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -1253,6 +1253,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noColors">You have not configured any approved colors</key>
</area>
<area alias="contentPicker">
<key alias="allowedItemTypes">You can only select items of type(s): %0%</key>
<key alias="pickedTrashedItem">You have picked a content item currently deleted or in the recycle bin</key>
<key alias="pickedTrashedItems">You have picked content items currently deleted or in the recycle bin</key>
</area>