hello world
hello world
hello world
hello world
hello world
").after(lnk);
+ }
+ };
+
+ return directive;
+
+ }
+
+ angular.module('umbraco.directives').directive('umbPasswordToggle', PasswordToggleDirective);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
index a84be208ba..16330f5493 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
@@ -2,12 +2,12 @@
* @ngdoc service
* @name umbraco.services.assetsService
*
- * @requires $q
+ * @requires $q
* @requires angularHelper
- *
+ *
* @description
* Promise-based utillity service to lazy-load client-side dependencies inside angular controllers.
- *
+ *
* ##usage
* To use, simply inject the assetsService into any controller that needs it, and make
* sure the umbraco.services module is accesible - which it should be by default.
@@ -18,7 +18,7 @@
* //this code executes when the dependencies are done loading
* });
* });
- *
+ *
*
* You can also load individual files, which gives you greater control over what attibutes are passed to the file, as well as timeout
*
@@ -38,13 +38,14 @@
* //loadcss cannot determine when the css is done loading, so this will trigger instantly
* });
* });
- *
+ *
*/
angular.module('umbraco.services')
.factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope, $http) {
var initAssetsLoaded = false;
- var appendRnd = function (url) {
+
+ function appendRnd (url) {
//if we don't have a global umbraco obj yet, the app is bootstrapping
if (!Umbraco.Sys.ServerVariables.application) {
return url;
@@ -77,7 +78,8 @@ angular.module('umbraco.services')
return this.loadedAssets[path];
}
},
- /**
+
+ /**
Internal method. This is called when the application is loading and the user is already authenticated, or once the user is authenticated.
There's a few assets the need to be loaded for the application to function but these assets require authentication to load.
*/
@@ -108,10 +110,10 @@ angular.module('umbraco.services')
*
* @description
* Injects a file as a stylesheet into the document head
- *
+ *
* @param {String} path path to the css file to load
* @param {Scope} scope optional scope to pass into the loader
- * @param {Object} keyvalue collection of attributes to pass to the stylesheet element
+ * @param {Object} keyvalue collection of attributes to pass to the stylesheet element
* @param {Number} timeout in milliseconds
* @returns {Promise} Promise object which resolves when the file has loaded
*/
@@ -149,10 +151,10 @@ angular.module('umbraco.services')
*
* @description
* Injects a file as a javascript into the document
- *
+ *
* @param {String} path path to the js file to load
* @param {Scope} scope optional scope to pass into the loader
- * @param {Object} keyvalue collection of attributes to pass to the script element
+ * @param {Object} keyvalue collection of attributes to pass to the script element
* @param {Number} timeout in milliseconds
* @returns {Promise} Promise object which resolves when the file has loaded
*/
@@ -192,8 +194,8 @@ angular.module('umbraco.services')
* @methodOf umbraco.services.assetsService
*
* @description
- * Injects a collection of files, this can be ONLY js files
- *
+ * Injects a collection of css and js files
+ *
*
* @param {Array} pathArray string array of paths to the files to load
* @param {Scope} scope optional scope to pass into the loader
@@ -206,61 +208,72 @@ angular.module('umbraco.services')
throw "pathArray must be an array";
}
+ // Check to see if there's anything to load, resolve promise if not
var nonEmpty = _.reject(pathArray, function (item) {
return item === undefined || item === "";
- });
+ });
-
- //don't load anything if there's nothing to load
- if (nonEmpty.length > 0) {
- var promises = [];
- var assets = [];
-
- //compile a list of promises
- //blocking
- _.each(nonEmpty, function (path) {
-
- path = convertVirtualPath(path);
-
- var asset = service._getAssetPromise(path);
- //if not previously loaded, add to list of promises
- if (asset.state !== "loaded") {
- if (asset.state === "new") {
- asset.state = "loading";
- assets.push(asset);
- }
-
- //we need to always push to the promises collection to monitor correct
- //execution
- promises.push(asset.deferred.promise);
- }
- });
-
-
- //gives a central monitoring of all assets to load
- promise = $q.all(promises);
-
- _.each(assets, function (asset) {
- LazyLoad.js(appendRnd(asset.path), function () {
- asset.state = "loaded";
- if (!scope) {
- asset.deferred.resolve(true);
- }
- else {
- angularHelper.safeApply(scope, function () {
- asset.deferred.resolve(true);
- });
- }
- });
- });
- }
- else {
- //return and resolve
+ if (nonEmpty.length === 0) {
var deferred = $q.defer();
promise = deferred.promise;
deferred.resolve(true);
+ return promise;
}
+ //compile a list of promises
+ //blocking
+ var promises = [];
+ var assets = [];
+ _.each(nonEmpty, function (path) {
+ path = convertVirtualPath(path);
+ var asset = service._getAssetPromise(path);
+ //if not previously loaded, add to list of promises
+ if (asset.state !== "loaded") {
+ if (asset.state === "new") {
+ asset.state = "loading";
+ assets.push(asset);
+ }
+
+ //we need to always push to the promises collection to monitor correct
+ //execution
+ promises.push(asset.deferred.promise);
+ }
+ });
+
+ //gives a central monitoring of all assets to load
+ promise = $q.all(promises);
+
+ // Split into css and js asset arrays, and use LazyLoad on each array
+ var cssAssets = _.filter(assets,
+ function (asset) {
+ return asset.path.match(/(\.css$|\.css\?)/ig);
+ });
+ var jsAssets = _.filter(assets,
+ function (asset) {
+ return asset.path.match(/(\.js$|\.js\?)/ig);
+ });
+
+ function assetLoaded(asset) {
+ asset.state = "loaded";
+ if (!scope) {
+ asset.deferred.resolve(true);
+ return;
+ }
+ angularHelper.safeApply(scope,
+ function () {
+ asset.deferred.resolve(true);
+ });
+ }
+
+ if (cssAssets.length > 0) {
+ var cssPaths = _.map(cssAssets, function (asset) { return appendRnd(asset.path) });
+ LazyLoad.css(cssPaths, function() { _.each(cssAssets, assetLoaded); });
+ }
+
+ if (jsAssets.length > 0) {
+ var jsPaths = _.map(jsAssets, function (asset) { return appendRnd(asset.path) });
+ LazyLoad.js(jsPaths, function () { _.each(jsAssets, assetLoaded); });
+ }
return promise;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index e76ffc682c..1eaf285119 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -261,6 +261,9 @@ input[type="submit"].btn {
*padding-top: 1px;
*padding-bottom: 1px;
}
+
+ // Safari defaults to 1px for input. Ref U4-7721.
+ margin: 0px;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less
index d25744a108..47ed97fde2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less
@@ -35,3 +35,10 @@
margin-right: 5px;
color: @gray-7;
}
+
+input.umb-breadcrumbs__add-ancestor {
+ height: 25px;
+ margin-top: -2px;
+ margin-left: 3px;
+ width: 100px;
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
index 3551d9d31a..2e5d1ef77d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -636,9 +636,19 @@
clear: both;
}
-.umb-grid .mce-btn button {
- padding: 8px 6px;
- line-height: inherit;
+.umb-grid .mce-btn {
+ button {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 6px;
+ line-height: inherit;
+ }
+
+ &:not(.mce-menubtn) {
+ button {
+ padding-right: 6px;
+ }
+ }
}
.umb-grid .mce-toolbar {
diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/login.less b/src/Umbraco.Web.UI.Client/src/less/pages/login.less
index 924f9b20bb..2fe214bf07 100644
--- a/src/Umbraco.Web.UI.Client/src/less/pages/login.less
+++ b/src/Umbraco.Web.UI.Client/src/less/pages/login.less
@@ -66,7 +66,7 @@
margin-bottom: auto;
}
-.login-overlay .form input[type="text"],
+.login-overlay .form input[type="text"],
.login-overlay .form input[type="password"],
.login-overlay .form input[type="email"] {
height: 36px;
@@ -114,8 +114,44 @@
line-height: 36px;
}
-.login-overlay .text-error,
-.login-overlay .text-info
+.login-overlay .text-error,
+.login-overlay .text-info
{
font-weight:bold;
-}
+}
+
+.password-toggle {
+ position: relative;
+ display: block;
+ user-select: none;
+
+ input::-ms-clear, input::-ms-reveal {
+ display: none;
+ }
+
+ a {
+ opacity: .5;
+ cursor: pointer;
+ display: inline-block;
+ position: absolute;
+ height: 1px;
+ width: 45px;
+ height: 75%;
+ font-size: 0;
+ background-repeat: no-repeat;
+ background-size: 50%;
+ background-position: center;
+ top: 0;
+ margin-left: -45px;
+ z-index: 1;
+ -webkit-tap-highlight-color: transparent;
+ }
+
+ [type="text"] + a {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M29.6.4C29 0 28 0 27.4.4L21 6.8c-1.4-.5-3-.8-5-.8C9 6 3 10 0 16c1.3 2.6 3 4.8 5.4 6.5l-5 5c-.5.5-.5 1.5 0 2 .3.4.7.5 1 .5s1 0 1.2-.4l27-27C30 2 30 1 29.6.4zM13 10c1.3 0 2.4 1 2.8 2L12 15.8c-1-.4-2-1.5-2-2.8 0-1.7 1.3-3 3-3zm-9.6 6c1.2-2 2.8-3.5 4.7-4.7l.7-.2c-.4 1-.6 2-.6 3 0 1.8.6 3.4 1.6 4.7l-2 2c-1.6-1.2-3-2.7-4-4.4zM24 13.8c0-.8 0-1.7-.4-2.4l-10 10c.7.3 1.6.4 2.4.4 4.4 0 8-3.6 8-8z'/%3E%3Cpath fill='%23444' d='M26 9l-2.2 2.2c2 1.3 3.6 3 4.8 4.8-1.2 2-2.8 3.5-4.7 4.7-2.7 1.5-5.4 2.3-8 2.3-1.4 0-2.6 0-3.8-.4L10 25c2 .6 4 1 6 1 7 0 13-4 16-10-1.4-2.8-3.5-5.2-6-7z'/%3E%3C/svg%3E");
+ }
+
+ [type="password"] + a {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M16 6C9 6 3 10 0 16c3 6 9 10 16 10s13-4 16-10c-3-6-9-10-16-10zm8 5.3c1.8 1.2 3.4 2.8 4.6 4.7-1.2 2-2.8 3.5-4.7 4.7-3 1.5-6 2.3-8 2.3s-6-.8-8-2.3C6 19.5 4 18 3 16c1.5-2 3-3.5 5-4.7l.6-.2C8 12 8 13 8 14c0 4.5 3.5 8 8 8s8-3.5 8-8c0-1-.3-2-.6-2.6l.4.3zM16 13c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3 3 1.3 3 3z'/%3E%3C/svg%3E");
+ }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 8b10b2f91b..ffaa1a6a92 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -109,16 +109,48 @@ ul.color-picker li a {
}
/* pre-value editor */
-
+/*.control-group.color-picker-preval:before {
+ content: "";
+ display: inline-block;
+ vertical-align: middle;
+ height: 100%;
+}*/
+
+/*.control-group.color-picker-preval div.thumbnail {
+ display: inline-block;
+ vertical-align: middle;
+}*/
+.control-group.color-picker-preval div.color-picker-prediv {
+ display: inline-block;
+ width: 60%;
+}
+
.control-group.color-picker-preval pre {
display: inline;
margin-right: 20px;
margin-left: 10px;
+ width: 50%;
+ white-space: nowrap;
+ overflow: hidden;
+ margin-bottom: 0;
+ vertical-align: middle;
}
+.control-group.color-picker-preval btn {
+ //vertical-align: middle;
+}
+
+.control-group.color-picker-preval input[type="text"] {
+ min-width: 40%;
+ width: 40%;
+ display: inline-block;
+ margin-right: 20px;
+ margin-top: 1px;
+}
+
.control-group.color-picker-preval label {
- border:solid @white 1px;
- padding:6px;
+ border: solid @white 1px;
+ padding: 6px;
}
@@ -126,21 +158,21 @@ ul.color-picker li a {
// Media picker
// --------------------------------------------------
.umb-mediapicker .add-link {
- display: inline-block;
- height: 120px;
- width: 120px;
- text-align: center;
- color: @gray-8;
- border: 2px @gray-8 dashed;
- line-height: 120px;
- text-decoration: none;
+ display: flex;
+ justify-content:center;
+ align-items:center;
+ width: 120px;
+ text-align: center;
+ color: @gray-8;
+ border: 2px @gray-8 dashed;
+ text-decoration: none;
- transition: all 150ms ease-in-out;
+ transition: all 150ms ease-in-out;
- &:hover {
- color: @turquoise-d1;
- border-color: @turquoise;
- }
+ &:hover {
+ color: @turquoise-d1;
+ border-color: @turquoise;
+ }
}
.umb-mediapicker .picked-image {
@@ -165,6 +197,10 @@ ul.color-picker li a {
text-decoration: none;
}
+.umb-mediapicker .add-link-square {
+ height: 120px;
+}
+
.umb-thumbnails{
@@ -207,11 +243,10 @@ ul.color-picker li a {
.umb-mediapicker .umb-sortable-thumbnails li {
flex-direction: column;
- margin: 0;
+ margin: 0 5px 0 0;
padding: 5px;
}
-
.umb-sortable-thumbnails li:hover a {
display: flex;
justify-content: center;
@@ -219,16 +254,20 @@ ul.color-picker li a {
}
.umb-sortable-thumbnails li img {
- max-width:100%;
- max-height:100%;
- margin:auto;
- display:block;
- background-image: url(../img/checkered-background.png);
+ max-width:100%;
+ max-height:100%;
+ margin:auto;
+ display:block;
+ background-image: url(../img/checkered-background.png);
}
-.umb-sortable-thumbnails li img.noScale{
- max-width: none !important;
- max-height: none !important;
+.umb-sortable-thumbnails li img.trashed {
+ opacity:0.3;
+}
+
+.umb-sortable-thumbnails li img.noScale {
+ max-width: none !important;
+ max-height: none !important;
}
.umb-sortable-thumbnails .umb-icon-holder {
@@ -254,8 +293,8 @@ ul.color-picker li a {
}
.umb-sortable-thumbnails li:hover .umb-sortable-thumbnails__actions {
- opacity: 1;
- visibility: visible;
+ opacity: 1;
+ visibility: visible;
}
.umb-sortable-thumbnails .umb-sortable-thumbnails__action {
@@ -285,27 +324,27 @@ ul.color-picker li a {
// -------------------------------------------------
.umb-cropper{
- position: relative;
+ position: relative;
}
.umb-cropper img, .umb-cropper-gravity img{
- position: relative;
- max-width: 100%;
- height: auto;
- top: 0;
- left: 0;
+ position: relative;
+ max-width: 100%;
+ height: auto;
+ top: 0;
+ left: 0;
}
.umb-cropper img {
- max-width: none;
+ max-width: none;
}
.umb-cropper .overlay, .umb-cropper-gravity .overlay {
- top: 0;
- left: 0;
- cursor: move;
- z-index: @zindexCropperOverlay;
- position: absolute;
+ top: 0;
+ left: 0;
+ cursor: move;
+ z-index: @zindexCropperOverlay;
+ position: absolute;
}
.umb-cropper .viewport{
@@ -317,43 +356,43 @@ ul.color-picker li a {
}
.umb-cropper-gravity .viewport{
- overflow: hidden;
- position: relative;
- width: 100%;
- height: 100%;
+ overflow: hidden;
+ position: relative;
+ width: 100%;
+ height: 100%;
}
.umb-cropper .viewport:after {
- content: "";
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: @zindexCropperOverlay - 1;
- -moz-opacity: .75;
- opacity: .75;
- filter: alpha(opacity=7);
- -webkit-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
- -moz-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
- box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+ content: "";
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: @zindexCropperOverlay - 1;
+ -moz-opacity: .75;
+ opacity: .75;
+ filter: alpha(opacity=7);
+ -webkit-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+ -moz-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+ box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
}
.umb-cropper-gravity .overlay{
- width: 14px;
- height: 14px;
- text-align: center;
- border-radius: 20px;
- background: @turquoise;
- border: 3px solid @white;
- opacity: 0.8;
+ width: 14px;
+ height: 14px;
+ text-align: center;
+ border-radius: 20px;
+ background: @turquoise;
+ border: 3px solid @white;
+ opacity: 0.8;
}
.umb-cropper-gravity .overlay i {
- font-size: 26px;
- line-height: 26px;
- opacity: 0.8 !important;
+ font-size: 26px;
+ line-height: 26px;
+ opacity: 0.8 !important;
}
.umb-cropper .crop-container {
@@ -361,16 +400,16 @@ ul.color-picker li a {
}
.umb-cropper .crop-slider {
- padding: 10px;
- border-top: 1px solid @gray-10;
- margin-top: 10px;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-wrap: wrap;
- @media (min-width: 769px) {
+ padding: 10px;
+ border-top: 1px solid @gray-10;
+ margin-top: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-wrap: wrap;
+ @media (min-width: 769px) {
padding: 10px 50px 10px 50px;
- }
+ }
}
.umb-cropper .crop-slider i {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
index 18158a5ff2..34dbf90de6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
@@ -16,7 +16,11 @@
maxFileSize: Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB",
acceptedFileTypes: mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes),
uploaded: false
- }
+ }
+ $scope.togglePassword = function () {
+ var elem = $("form[name='loginForm'] input[name='password']");
+ elem.attr("type", (elem.attr("type") === "text" ? "password" : "text"));
+ }
function init() {
// Check if it is a new user
@@ -48,7 +52,7 @@
]).then(function () {
$scope.inviteStep = Number(inviteVal);
-
+
});
}
}
@@ -82,7 +86,7 @@
var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
// set percentage property on file
- $scope.avatarFile.uploadProgress = progressPercentage;
+ $scope.avatarFile.uploadProgress = progressPercentage;
}
}).success(function (data, status, headers, config) {
@@ -149,11 +153,11 @@
//error
formHelper.handleError(err);
-
+
$scope.invitedUserPasswordModel.buttonState = "error";
});
- }
+ }
};
var setFieldFocus = function (form, field) {
@@ -180,7 +184,7 @@
}
function resetInputValidation() {
- $scope.confirmPassword = "";
+ $scope.confirmPassword = "";
$scope.password = "";
$scope.login = "";
if ($scope.loginForm) {
@@ -255,7 +259,7 @@
//TODO: Do validation properly like in the invite password update
- //if the login and password are not empty we need to automatically
+ //if the login and password are not empty we need to automatically
// validate them - this is because if there are validation errors on the server
// then the user has to change both username & password to resubmit which isn't ideal,
// so if they're not empty, we'll just make sure to set them to valid.
@@ -289,7 +293,7 @@
});
//setup a watch for both of the model values changing, if they change
- // while the form is invalid, then revalidate them so that the form can
+ // while the form is invalid, then revalidate them so that the form can
// be submitted again.
$scope.loginForm.username.$viewChangeListeners.push(function () {
if ($scope.loginForm.username.$invalid) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index 61d04d30fb..6505af4de9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -24,8 +24,8 @@
Your new password cannot be blank!
- Minimum {{invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters
-
+ Minimum {{invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters
+
@@ -49,15 +49,15 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
index d31ac911a9..dd25741aeb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
@@ -2,15 +2,17 @@
function ($scope, $timeout, assetsService, angularHelper, $element) {
//NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive.
var defaultColor = "000000";
-
+ var defaultLabel = null;
+
$scope.newColor = defaultColor;
+ $scope.newLavel = defaultLabel;
$scope.hasError = false;
assetsService.load([
//"lib/spectrum/tinycolor.js",
- "lib/spectrum/spectrum.js"
+ "lib/spectrum/spectrum.js"
], $scope).then(function () {
- var elem = $element.find("input");
+ var elem = $element.find("input[name='newColor']");
elem.spectrum({
color: null,
showInitial: false,
@@ -21,7 +23,7 @@
clickoutFiresChange: true,
hide: function (color) {
//show the add butotn
- $element.find(".btn.add").show();
+ $element.find(".btn.add").show();
},
change: function (color) {
angularHelper.safeApply($scope, function () {
@@ -39,21 +41,41 @@
//make an array from the dictionary
var items = [];
for (var i in $scope.model.value) {
- items.push({
- value: $scope.model.value[i],
- id: i
- });
+ var oldValue = $scope.model.value[i];
+ if (oldValue.hasOwnProperty("value")) {
+ items.push({
+ value: oldValue.value,
+ label: oldValue.label,
+ id: i
+ });
+ } else {
+ items.push({
+ value: oldValue,
+ label: oldValue,
+ id: i
+ });
+ }
}
//now make the editor model the array
$scope.model.value = items;
}
+ // ensure labels
+ for (var i = 0; i < $scope.model.value.length; i++) {
+ var item = $scope.model.value[i];
+ item.label = item.hasOwnProperty("label") ? item.label : item.value;
+ }
+
+ function validLabel(label) {
+ return label !== null && typeof label !== "undefined" && label !== "" && label.length && label.length > 0;
+ }
+
$scope.remove = function (item, evt) {
evt.preventDefault();
$scope.model.value = _.reject($scope.model.value, function (x) {
- return x.value === item.value;
+ return x.value === item.value && x.label === item.label;
});
};
@@ -63,15 +85,15 @@
evt.preventDefault();
if ($scope.newColor) {
+ var newLabel = validLabel($scope.newLabel) ? $scope.newLabel : $scope.newColor;
var exists = _.find($scope.model.value, function(item) {
- return item.value.toUpperCase() == $scope.newColor.toUpperCase();
+ return item.value.toUpperCase() === $scope.newColor.toUpperCase() || item.label.toUpperCase() === newLabel.toUpperCase();
});
if (!exists) {
- $scope.model.value.push({ value: $scope.newColor });
- //$scope.newColor = defaultColor;
- // set colorpicker to default color
- //var elem = $element.find("input");
- //elem.spectrum("set", $scope.newColor);
+ $scope.model.value.push({
+ value: $scope.newColor,
+ label: newLabel
+ });
$scope.hasError = false;
return;
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 9b3316ec1a..229ec614de 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -1,7 +1,7 @@
//this controller simply tells the dialogs service to open a mediaPicker window
//with a specified callback, this callback will receive an object with a selection on it
-function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, miniEditorHelper) {
+function contentPickerController($scope, entityResource, editorState, iconHelper, $routeParams, angularHelper, navigationService, $location, miniEditorHelper, localizationService) {
var unsubscribe;
@@ -154,7 +154,6 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
}
}
-
if ($routeParams.section === "settings" && $routeParams.tree === "documentTypes") {
//if the content-picker is being rendered inside the document-type editor, we don't need to process the startnode query
dialogOptions.startNodeId = -1;
@@ -287,8 +286,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
entityResource.getUrl(entity.id, entityType).then(function(data){
// update url
angular.forEach($scope.renderModel, function(item){
- if(item.id === entity.id) {
- item.url = data;
+ if (item.id === entity.id) {
+ if (entity.trashed) {
+ item.url = localizationService.dictionary.general_recycleBin;
+ } else {
+ item.url = data;
+ }
}
});
});
@@ -330,6 +333,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
"icon": item.icon,
"path": item.path,
"url": item.url,
+ "trashed": item.trashed,
"published": (item.metaData && item.metaData.IsPublished === false && entityType === "Document") ? false : true
// only content supports published/unpublished content so we set everything else to published so the UI looks correct
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 75cc74f02d..1755840cc8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -1,5 +1,8 @@
+
+
-
+
Delete
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index bb1da209bf..a282334cb5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -81,6 +81,7 @@ angular.module("umbraco")
var notIncludedRte = [];
var cancelMove = false;
+ var startingArea;
$scope.sortableOptionsCell = {
distance: 10,
@@ -112,9 +113,11 @@ angular.module("umbraco")
},
over: function (event, ui) {
- var allowedEditors = $(event.target).scope().area.allowed;
+ var area = $(event.target).scope().area;
+ var allowedEditors = area.allowed;
- if ($.inArray(ui.item.scope().control.editor.alias, allowedEditors) < 0 && allowedEditors) {
+ if (($.inArray(ui.item.scope().control.editor.alias, allowedEditors) < 0 && allowedEditors) ||
+ (startingArea != area && area.maxItems != '' && area.maxItems > 0 && area.maxItems < area.controls.length + 1)) {
$scope.$apply(function () {
$(event.target).scope().area.dropNotAllowed = true;
@@ -168,6 +171,10 @@ angular.module("umbraco")
start: function (e, ui) {
+ //Get the starting area for reference
+ var area = $(e.target).scope().area;
+ startingArea = area;
+
// fade out control when sorting
ui.item.context.style.display = "block";
ui.item.context.style.opacity = "0.5";
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 4ddca47489..c2513b9760 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -224,7 +224,7 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 8a7b20498d..91777bfc3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
//this controller simply tells the dialogs service to open a mediaPicker window
//with a specified callback, this callback will receive an object with a selection on it
angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerController",
- function ($rootScope, $scope, dialogService, entityResource, mediaResource, mediaHelper, $timeout, userService, $location) {
+ function ($rootScope, $scope, dialogService, entityResource, mediaResource, mediaHelper, $timeout, userService, $location, localizationService) {
//check the pre-values for multi-picker
var multiPicker = $scope.model.config.multiPicker && $scope.model.config.multiPicker !== '0' ? true : false;
@@ -26,17 +26,47 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
// the mediaResource has server side auth configured for which the user must have
// access to the media section, if they don't they'll get auth errors. The entityResource
// acts differently in that it allows access if the user has access to any of the apps that
- // might require it's use. Therefore we need to use the metatData property to get at the thumbnail
+ // might require it's use. Therefore we need to use the metaData property to get at the thumbnail
// value.
- entityResource.getByIds(ids, "Media").then(function (medias) {
+ entityResource.getByIds(ids, "Media").then(function(medias) {
- _.each(medias, function (media, i) {
+ // The service only returns item results for ids that exist (deleted items are silently ignored).
+ // This results in the picked items value to be set to contain only ids of picked items that could actually be found.
+ // Since a referenced item could potentially be restored later on, instead of changing the selected values here based
+ // on whether the items exist during a save event - we should keep "placeholder" items for picked items that currently
+ // could not be fetched. This will preserve references and ensure that the state of an item does not differ depending
+ // on whether it is simply resaved or not.
+ // This is done by remapping the int/guid ids into a new array of items, where we create "Deleted item" placeholders
+ // when there is no match for a selected id. This will ensure that the values being set on save, are the same as before.
+
+ medias = _.map(ids,
+ function(id) {
+ var found = _.find(medias,
+ function(m) {
+ // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
+ // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
+ // compares and be completely sure it works.
+ return m.udi.toString() === id.toString() || m.id.toString() === id.toString();
+ });
+ if (found) {
+ return found;
+ } else {
+ return {
+ name: localizationService.dictionary.mediaPicker_deletedItem,
+ id: $scope.model.config.idType !== "udi" ? id : null,
+ udi: $scope.model.config.idType === "udi" ? id : null,
+ icon: "icon-picture",
+ thumbnail: null,
+ trashed: true
+ };
+ }
+ });
- //only show non-trashed items
- if (media.parentId >= -1) {
-
- if (!media.thumbnail) {
+ _.each(medias,
+ function(media, i) {
+ // if there is no thumbnail, try getting one if the media is not a placeholder item
+ if (!media.thumbnail && media.id && media.metaData) {
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
}
@@ -44,12 +74,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
if ($scope.model.config.idType === "udi") {
$scope.ids.push(media.udi);
- }
- else {
+ } else {
$scope.ids.push(media.id);
}
- }
- });
+ });
$scope.sync();
});
@@ -82,8 +110,8 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
submit: function(model) {
_.each(model.selectedImages, function(media, i) {
-
- if (!media.thumbnail) {
+ // if there is no thumbnail, try getting one if the media is not a placeholder item
+ if (!media.thumbnail && media.id && media.metaData) {
media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
}
@@ -101,10 +129,8 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.mediaPickerOverlay.show = false;
$scope.mediaPickerOverlay = null;
-
}
};
-
};
$scope.sortableOptions = {
@@ -142,5 +168,4 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
//update the display val again if it has changed from the server
setupViewModel();
};
-
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index f3aab992dd..3ef1430cd3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -1,47 +1,47 @@
-
+
-
+
-
+
-
+
@@ -149,8 +149,9 @@
{{ avatarFile.serverErrorMessage }}
@@ -69,7 +69,7 @@
ngf-multiple="false"
ngf-pattern="{{avatarFile.acceptedFileTypes}}"
ngf-max-size="{{ avatarFile.maxFileSize }}">
-
+
-
-
+
+ Toggle
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index a6a2ddcbab..ccb033a57c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -56,6 +56,46 @@ angular.module("umbraco")
$scope.target = dialogOptions.currentTarget;
}
+ function onInit() {
+ if ($scope.startNodeId !== -1) {
+ entityResource.getById($scope.startNodeId, "media")
+ .then(function (ent) {
+ $scope.startNodeId = ent.id;
+ run();
+ });
+ } else {
+ run();
+ }
+ }
+
+ function run() {
+ //default root item
+ if (!$scope.target) {
+ if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
+ entityResource.getById($scope.lastOpenedNode, "media")
+ .then(ensureWithinStartNode, gotoStartNode);
+ } else {
+ gotoStartNode();
+ }
+ } else {
+ //if a target is specified, go look it up - generally this target will just contain ids not the actual full
+ //media object so we need to look it up
+ var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
+ var altText = $scope.target.altText;
+ mediaResource.getById(id)
+ .then(function (node) {
+ $scope.target = node;
+ if (ensureWithinStartNode(node)) {
+ selectImage(node);
+ $scope.target.url = mediaHelper.resolveFile(node);
+ $scope.target.altText = altText;
+ $scope.openDetailsDialog();
+ }
+ },
+ gotoStartNode);
+ }
+ }
+
$scope.upload = function(v) {
angular.element(".umb-file-dropzone-directive .file-select").click();
};
@@ -107,7 +147,7 @@ angular.module("umbraco")
if (folder.id > 0) {
entityResource.getAncestors(folder.id, "media")
- .then(function(anc) {
+ .then(function(anc) {
$scope.path = _.filter(anc,
function(f) {
return f.path.indexOf($scope.startNodeId) !== -1;
@@ -218,32 +258,6 @@ angular.module("umbraco")
$scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
}
- //default root item
- if (!$scope.target) {
- if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
- entityResource.getById($scope.lastOpenedNode, "media")
- .then(ensureWithinStartNode, gotoStartNode);
- } else {
- gotoStartNode();
- }
- } else {
- //if a target is specified, go look it up - generally this target will just contain ids not the actual full
- //media object so we need to look it up
- var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
- var altText = $scope.target.altText;
- mediaResource.getById(id)
- .then(function(node) {
- $scope.target = node;
- if (ensureWithinStartNode(node)) {
- selectImage(node);
- $scope.target.url = mediaHelper.resolveFile(node);
- $scope.target.altText = altText;
- $scope.openDetailsDialog();
- }
- },
- gotoStartNode);
- }
-
$scope.openDetailsDialog = function() {
$scope.mediaPickerDetailsOverlay = {};
@@ -368,4 +382,7 @@ angular.module("umbraco")
}
}
}
+
+ onInit();
+
});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
index 8c726f4a17..73b0915161 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
@@ -48,14 +48,14 @@
-
+
0;
+
+ if ($scope.isConfigured) {
+
+ for (var key in $scope.model.config.items) {
+ if (!$scope.model.config.items[key].hasOwnProperty("value"))
+ $scope.model.config.items[key] = { value: $scope.model.config.items[key], label: $scope.model.config.items[key] };
+ }
+
+ $scope.model.useLabel = isTrue($scope.model.config.useLabel);
+ initActiveColor();
+ }
+
+ $scope.toggleItem = function (color) {
+
+ var currentColor = $scope.model.value.hasOwnProperty("value")
+ ? $scope.model.value.value
+ : $scope.model.value;
+
+ var newColor;
+ if (currentColor === color.value) {
+ // deselect
+ $scope.model.value = $scope.model.useLabel ? { value: "", label: "" } : "";
+ newColor = "";
+ }
+ else {
+ // select
+ $scope.model.value = $scope.model.useLabel ? { value: color.value, label: color.label } : color.value;
+ newColor = color.value;
+ }
+
+ // this is required to re-validate
+ $scope.propertyForm.modelValue.$setViewValue(newColor);
+ };
+
// Method required by the valPropertyValidator directive (returns true if the property editor has at least one color selected)
- $scope.validateMandatory = function () {
+ $scope.validateMandatory = function () {
+ var isValid = !$scope.model.validation.mandatory || (
+ $scope.model.value != null
+ && $scope.model.value != ""
+ && (!$scope.model.value.hasOwnProperty("value") || $scope.model.value.value !== "")
+ );
return {
- isValid: !$scope.model.validation.mandatory || ($scope.model.value != null && $scope.model.value != ""),
+ isValid: isValid,
errorMsg: "Value cannot be empty",
errorKey: "required"
};
}
- $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
+ $scope.isConfigured = $scope.model.config && $scope.model.config.items && _.keys($scope.model.config.items).length > 0;
+
+ // A color is active if it matches the value and label of the model.
+ // If the model doesn't store the label, ignore the label during the comparison.
+ $scope.isActiveColor = function (color) {
+
+ // no value
+ if (!$scope.model.value)
+ return false;
+
+ // Complex color (value and label)?
+ if (!$scope.model.value.hasOwnProperty("value"))
+ return $scope.model.value === color.value;
+
+ return $scope.model.value.value === color.value && $scope.model.value.label === color.label;
+ };
+
+ // Finds the color best matching the model's color,
+ // and sets the model color to that one. This is useful when
+ // either the value or label was changed on the data type.
+ function initActiveColor() {
+
+ // no value
+ if (!$scope.model.value)
+ return;
+
+ // Complex color (value and label)?
+ if (!$scope.model.value.hasOwnProperty("value"))
+ return;
+
+ var modelColor = $scope.model.value.value;
+ var modelLabel = $scope.model.value.label;
+
+ // Check for a full match or partial match.
+ var foundItem = null;
+
+ // Look for a fully matching color.
+ for (var key in $scope.model.config.items) {
+ var item = $scope.model.config.items[key];
+ if (item.value == modelColor && item.label == modelLabel) {
+ foundItem = item;
+ break;
+ }
+ }
+
+ // Look for a color with a matching value.
+ if (!foundItem) {
+ for (var key in $scope.model.config.items) {
+ var item = $scope.model.config.items[key];
+ if (item.value == modelColor) {
+ foundItem = item;
+ break;
+ }
+ }
+ }
+
+ // Look for a color with a matching label.
+ if (!foundItem) {
+ for (var key in $scope.model.config.items) {
+ var item = $scope.model.config.items[key];
+ if (item.label == modelLabel) {
+ foundItem = item;
+ break;
+ }
+ }
+ }
+
+ // If a match was found, set it as the active color.
+ if (foundItem) {
+ $scope.model.value.value = foundItem.value;
+ $scope.model.value.label = foundItem.label;
+ }
+ }
+
+ // figures out if a value is trueish enough
+ function isTrue(bool) {
+ return !!bool && bool !== "0" && angular.lowercase(bool) !== "false";
+ }
}
angular.module("umbraco").controller("Umbraco.PropertyEditors.ColorPickerController", ColorPickerController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index a493fffdd8..46b624adcc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -5,10 +5,10 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
index a772f830c5..2b917e69f8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
@@ -1,12 +1,13 @@
+
+
-
-
{{item.value}}
+ #{{item.value}} - {{item.label}}
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
index 8455571c42..315a7f15f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
@@ -8,6 +8,6 @@
val-server="value" />
Required
- Invalid email
+ Invalid email
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
index 421aaf0d40..381db5a38c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
@@ -48,14 +48,18 @@
- {{currentCell.grid}}
+ {{currentCell.grid}}
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 06bdfe2e99..fa2da2f9e2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -65,7 +65,9 @@
ng-repeat="area in layout.areas | filter:zeroWidthFilter"
ng-style="{width: percentage(area.grid) + '%', 'max-width': '100%'}">
-
+
+
{{area.maxItems}}
+
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
index 702d19a509..65a62f599c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
@@ -76,6 +76,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
icon.isCustom = false;
break;
case "styleselect":
+ case "fontsizeselect":
icon.name = "icon-list";
icon.isCustom = true;
break;
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index da10edda09..a915fc726c 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1027,9 +1027,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
-
-
+ or inherit culture from parent nodes. Will also apply
to the current node, unless a domain below applies too.]]>
<asp:content /> element.]]>
You can add additional languages under the 'languages' in the menu on the left + %0%' below
You can add additional languages under the 'languages' in the menu on the left ]]>