![](\"imageofcats.jpg\")
world ", "hello world ")]
- // with a img-tag with data-udi id spelled wrong, so don't need stripping
- [TestCase("hello world ", "hello world ")]
public void ParseLocalLinks(string input, string result)
{
var serviceCtxMock = new TestObjects(null).GetServiceContextMock();
@@ -111,7 +104,7 @@ namespace Umbraco.Tests.Web
//setup a quick mock of the WebRouting section
Mock.Of world ";
- var expected = "hello world ";
-
- var result = TemplateUtilities.StripUdiDataAttributes(input);
-
- Assert.AreEqual(expected, result);
- }
}
-}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
index 5fad4b944e..bd7cf964d0 100644
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
@@ -146,7 +146,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
sourceUrl: currentMenuNode.childNodesUrl,
updateDefinition: function() {
throw "'updateDefinition' method is not supported in Umbraco 7, consider upgrading to the new v7 APIs";
- }
+ },
+ expanded: currentMenuNode.expanded === true
};
//defined getters that will throw a not implemented/supported exception
Object.defineProperty(legacyNode, "menu", {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
index 08e0a44c0b..2dc0ebdf93 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
@@ -1,4 +1,17 @@
-(function() {
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTourStep
+@restrict E
+@scope
+
+@description
+Added in Umbraco 7.8. The tour step component is a component that can be used in custom views for tour steps.
+
+@param {callback} onClose The callback which should be performened when the close button of the tour step is clicked
+@param {boolean=} hideClose A boolean indicating if the close button needs to be shown
+
+**/
+(function () {
'use strict';
function TourStepDirective() {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcontent.directive.js
index 52ed358b61..909f87eac5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcontent.directive.js
@@ -1,4 +1,17 @@
-(function() {
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTourStepContent
+@restrict E
+@scope
+
+@description
+Added in Umbraco 7.8. The tour step content component is a component that can be used in custom views for tour steps.
+It's meant to be used in the umb-tour-step directive.
+All markup in the body of the directive will be shown after the content attribute
+
+@param {string} content The content that needs to be shown
+**/
+(function () {
'use strict';
function TourStepContentDirective() {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcounter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcounter.directive.js
index 7e04ef5d00..2477953580 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcounter.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepcounter.directive.js
@@ -1,4 +1,18 @@
-(function() {
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTourStepCounter
+@restrict E
+@scope
+
+@description
+Added in Umbraco 7.8. The tour step counter component is a component that can be used in custom views for tour steps.
+It's meant to be used in the umb-tour-step-footer directive. It will show the progress you have made in a tour eg. step 2/12
+
+
+@param {int} currentStep The current step the tour is on
+@param {int} totalSteps The current step the tour is on
+**/
+(function () {
'use strict';
function TourStepCounterDirective() {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepfooter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepfooter.directive.js
index fedb527972..7cfb498394 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepfooter.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepfooter.directive.js
@@ -1,4 +1,16 @@
-(function() {
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTourStepFooter
+@restrict E
+@scope
+
+@description
+Added in Umbraco 7.8. The tour step footer component is a component that can be used in custom views for tour steps. It's meant to be used in the umb-tour-step directive.
+All markup in the body of the directive will be shown as the footer of the tour step
+
+
+**/
+(function () {
'use strict';
function TourStepFooterDirective() {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepheader.directive.js
index 9d32ad87a4..ec6768928f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstepheader.directive.js
@@ -1,4 +1,16 @@
-(function() {
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbTourStepHeader
+@restrict E
+@scope
+
+@description
+Added in Umbraco 7.8. The tour step header component is a component that can be used in custom views for tour steps. It's meant to be used in the umb-tour-step directive.
+
+
+@param {string} title The title that needs to be shown
+**/
+(function () {
'use strict';
function TourStepHeaderDirective() {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
index 4bc6f08eb9..47d1431e13 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js
@@ -48,7 +48,7 @@ the directive will use {@link umbraco.directives.directive:umbLockedField umbLoc
**/
angular.module("umbraco.directives")
- .directive('umbGenerateAlias', function ($timeout, entityResource) {
+ .directive('umbGenerateAlias', function ($timeout, entityResource, localizationService) {
return {
restrict: 'E',
templateUrl: 'views/components/umb-generate-alias.html',
@@ -67,7 +67,21 @@ angular.module("umbraco.directives")
var updateAlias = false;
scope.locked = true;
- scope.placeholderText = "Enter alias...";
+
+ scope.labels = {
+ idle: "Enter alias...",
+ busy: "Generating alias..."
+ };
+
+ scope.placeholderText = scope.labels.idle;
+
+ localizationService.localize('placeholders_enterAlias').then(function (value) {
+ scope.labels.idle = scope.placeholderText = value;
+ });
+
+ localizationService.localize('placeholders_generatingAlias').then(function (value) {
+ scope.labels.busy = value;
+ });
function generateAlias(value) {
@@ -78,7 +92,7 @@ angular.module("umbraco.directives")
if( value !== undefined && value !== "" && value !== null) {
scope.alias = "";
- scope.placeholderText = "Generating Alias...";
+ scope.placeholderText = scope.labels.busy;
generateAliasTimeout = $timeout(function () {
updateAlias = true;
@@ -92,7 +106,7 @@ angular.module("umbraco.directives")
} else {
updateAlias = true;
scope.alias = "";
- scope.placeholderText = "Enter alias...";
+ scope.placeholderText = scope.labels.idle;
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index b14f8418c5..308ffbf00f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -125,13 +125,19 @@ Use this directive to generate a thumbnail grid of media items.
i--;
}
- if (scope.includeSubFolders !== 'true') {
- if (item.parentId !== parseInt(scope.currentFolderId)) {
- scope.items.splice(i, 1);
- i--;
+
+ // If subfolder search is not enabled remove the media items that's not needed
+ // Make sure that includeSubFolder is not undefined since the directive is used
+ // in contexts where it should not be used. Currently only used when we trigger
+ // a media picker
+ if(scope.includeSubFolders !== undefined){
+ if (scope.includeSubFolders !== 'true') {
+ if (item.parentId !== parseInt(scope.currentFolderId)) {
+ scope.items.splice(i, 1);
+ i--;
+ }
}
}
-
}
@@ -152,7 +158,7 @@ Use this directive to generate a thumbnail grid of media items.
}
if (!item.isFolder) {
-
+
// handle entity
if(item.image) {
item.thumbnail = mediaHelper.resolveFileFromEntity(item, true);
@@ -161,7 +167,7 @@ Use this directive to generate a thumbnail grid of media items.
} else {
item.thumbnail = mediaHelper.resolveFile(item, true);
item.image = mediaHelper.resolveFile(item, false);
-
+
var fileProp = _.find(item.properties, function (v) {
return (v.alias === "umbracoFile");
});
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
index 5d2ac1e8b9..9cf96f8e7a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
@@ -109,11 +109,23 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
return umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostMove"),
- {
- parentId: args.parentId,
- id: args.id
+ {
+ parentId: args.parentId,
+ id: args.id
}, {responseType: 'text'}),
- 'Failed to move media');
+ {
+ error: function(data){
+ var errorMsg = 'Failed to move media';
+
+ if(data.parentId === data.id){
+ errorMsg = 'Media can\'t be moved into itself';
+ }
+
+ return {
+ errorMsg: errorMsg
+ };
+ }
+ });
},
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index cb416e3974..15c738638b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -646,10 +646,10 @@ function navigationService($rootScope, $route, $routeParams, $log, $location, $q
*/
hideDialog: function (showMenu) {
- setMode("default");
-
- if(showMenu){
+ if (showMenu) {
this.showMenu({ skipDefault: true, node: appState.getMenuState("currentNode") });
+ } else {
+ setMode("default");
}
},
/**
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index 1619ca0623..1f99659389 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -126,12 +126,21 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
/** The default error callback used if one is not supplied in the opts */
function defaultError(data, status, headers, config) {
- return {
+
+ var err = {
//NOTE: the default error message here should never be used based on the above docs!
errorMsg: (angular.isString(opts) ? opts : 'An error occurred!'),
data: data,
status: status
};
+
+ // if "opts" is a promise, we set "err.errorMsg" to be that promise
+ if (typeof(opts) == "object" && typeof(opts.then) == "function") {
+ err.errorMsg = opts;
+ }
+
+ return err;
+
}
//create the callbacs based on whats been passed in.
diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less
index ac8279e3ab..3100433a4a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/belle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/belle.less
@@ -66,6 +66,7 @@
// Belle styles
@import "buttons.less";
@import "forms.less";
+@import "legacydialog.less";
@import "modals.less";
@import "panel.less";
@import "sections.less";
@@ -159,6 +160,7 @@
@import "components/umb-mini-editor.less";
@import "components/users/umb-user-cards.less";
+@import "components/users/umb-user-details.less";
@import "components/users/umb-user-group-picker-list.less";
@import "components/users/umb-user-group-preview.less";
@import "components/users/umb-user-preview.less";
diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index b1e9671de3..0b21864127 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -63,9 +63,6 @@
.btn-group>.btn+.dropdown-toggle {
box-shadow: none;
-webkit-box-shadow:none;
-}
-
-.btn-group .btn.dropdown-toggle {
border-left-width: 1px;
border-left-style: solid;
border-color: rgba(0,0,0,0.09);
diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 78c1616bc6..cbb38a23b1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -81,9 +81,9 @@ a, a:hover{
.wait {
display: block;
- height: 280px;
+ height: 100%;
width: 100%;
- background: center center url(../img/loader.gif) no-repeat;
+ background:#fff center center url(../img/loader.gif) no-repeat;
}
/****************************/
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
index cc024ca5bb..2c7f07ef26 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
@@ -159,6 +159,7 @@
margin-bottom: 1px;
border-radius: 0;
border-bottom: 1px solid @gray-9;
+ padding: 10px;
}
.umb-help-list-item:last-child {
@@ -193,6 +194,7 @@
.umb-help-list-item__title {
font-size: 14px;
display: block;
+ margin-left: 26px;
}
.umb-help-list-item__description {
@@ -205,6 +207,7 @@
margin-right: 8px;
color: @gray-4;
font-size: 18px;
+ float: left;
}
.umb-help-list-item__open-icon {
@@ -219,4 +222,4 @@
[data-element*="tour-"].umb-help-list-item:hover .umb-help-list-item__title {
text-decoration:none;
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
index 73f059b4ee..150963cbb2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
@@ -10,6 +10,10 @@
}
}
+.umb-toggle:focus .umb-toggle__toggle{
+ box-shadow: 0 1px 3px fade(@black, 12%), 0 1px 2px fade(@black, 24%);
+}
+
.umb-toggle__handler {
position: absolute;
top: 0;
@@ -30,6 +34,7 @@
background: @gray-8;
border-radius: 90px;
position: relative;
+ transition: box-shadow .3s;
}
.umb-toggle--checked .umb-toggle__toggle {
@@ -43,7 +48,6 @@
/* Labels */
.umb-toggle__label {
- font-size: 12px;
color: @gray-2;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less
index e8b8325183..a302ba71b8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/card.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less
@@ -101,11 +101,13 @@
}
.umb-card-grid li.-four-in-row {
- flex: 0 0 25%;
+ flex: 0 0 25%;
+ max-width: 25%;
}
.umb-card-grid li.-three-in-row {
flex: 0 0 33.33%;
+ max-width:33.33%;
}
.umb-card-grid .umb-card-grid-item {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
index a987c5daa3..c6fdf8a7bf 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less
@@ -3,8 +3,8 @@
flex-flow: row wrap;
.umb-color-box {
- border: none;
- color: white;
+ border: 1px solid @gray-8;
+ color: @white;
cursor: pointer;
padding: 1px;
text-align: center;
@@ -19,7 +19,7 @@
justify-content: center;
&:hover, &:focus {
- box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+ box-shadow: 0 1px 3px fade(@black, 12%), 0 1px 2px fade(@black, 24%);
}
&.umb-color-box--m {
@@ -50,7 +50,7 @@
padding-top: 10px;
.umb-color-box__label {
- background: #fff;
+ background: @white;
font-size: 14px;
display: flex;
flex-flow: column wrap;
@@ -63,7 +63,8 @@
margin-right: -1px;
text-indent: 0;
text-align: left;
- border: 1px solid @gray-8;
+ border-top: 1px solid @gray-8;
+ border-bottom: 1px solid @gray-8;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
overflow: hidden;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
index 21f59a3e2d..52cc7a9aaf 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-multiple-textbox.less
@@ -1,4 +1,17 @@
-.umb-multiple-textbox .textbox-wrapper {
+.umb-multiple-textbox{
+ &__confirm{
+ position: relative;
+
+ &-action{
+ margin: 0;
+ padding: 2px;
+ background: transparent;
+ border: 0 none;
+ }
+ }
+}
+
+.umb-multiple-textbox .textbox-wrapper {
align-items: center;
margin-bottom: 15px;
}
@@ -7,7 +20,7 @@
margin-bottom: 0;
}
-.umb-multiple-textbox .textbox-wrapper i {
+.umb-multiple-textbox .textbox-wrapper i:not(.icon-delete, .icon-check) {
margin-right: 5px;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 514a73407c..5a11403bb3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -1,5 +1,6 @@
.umb-nested-content {
text-align: center;
+ position: relative;
}
.umb-nested-content--not-supported {
@@ -208,11 +209,25 @@
width: 99%;
}
-.usky-grid.umb-nested-content__node-type-picker .cell-tools-menu {
- position: relative;
- transform: translate(-50%, -25%);
-}
+.usky-grid.umb-nested-content__node-type-picker {
+ .cell-tools-menu {
+ position: relative;
+ transform: translate(-50%, -25%);
+ }
+ .elements li {
+ &:hover {
+ i {
+ color: @white !important;
+ }
+ }
+
+ i {
+ // make sure the item icons shown are in the correct color according to their doc type icon instead of the grid editor item color
+ color: unset;
+ }
+ }
+}
// this resolves the layout issue introduced in nested content in 7.12 with the addition of the input for link anchors
// the attribute selector ensures the change only applies to the linkpicker overlay
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-details.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-details.less
new file mode 100644
index 0000000000..837506f312
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-details.less
@@ -0,0 +1,122 @@
+.umb-user-details-avtar {
+ margin-bottom: 20px;
+ padding-bottom: 20px;
+ border-bottom: 1px solid #d8d7d9;
+}
+
+div.umb-user-details-actions > div {
+ margin-bottom: 20px;
+}
+
+.umb-user-details-actions .umb-button {
+ margin-bottom: 20px;
+}
+
+.umb-user-details-view-title {
+ font-size: 20px;
+ font-weight: bold;
+ color: @black;
+ margin-bottom: 30px;
+}
+
+.umb-user-details-view-wrapper {
+ padding: 20px 60px;
+}
+
+@media (max-width: 768px) {
+
+ .umb-user-details-view-wrapper {
+ padding: 0;
+ }
+}
+
+.umb-user-details-section {
+ margin-bottom: 40px;
+}
+.umb-user-details-details {
+ display: flex;
+}
+
+a.umb-user-details-details__back-link {
+ font-weight: bold;
+ color: @black;
+}
+
+.umb-user-details-details__back-link:hover {
+ color: @gray-4;
+ text-decoration: none;
+}
+
+
+@sidebarwidth: 350px; // Width of sidebar. Ugly hack because of old version of Less
+
+.umb-user-details-details__main-content {
+ flex: 1 1 auto;
+ margin-right: 30px;
+ width: calc(~'100%' - ~'@{sidebarwidth}' - ~'30px'); // Make sure that the main content area doesn't gets affected by inline styling
+}
+
+.umb-user-details-details__main-content .umb-node-preview-add {
+ max-width: 100%;
+}
+
+
+.umb-user-details-details__sidebar {
+ flex: 0 0 @sidebarwidth;
+}
+
+@media (max-width: 768px) {
+
+ .umb-user-details-details {
+ flex-direction: column;
+ }
+
+ .umb-user-details-details__main-content {
+ flex: 1 1 auto;
+ width: 100%;
+ margin-bottom: 30px;
+ margin-right: 0;
+ }
+
+ .umb-user-details-details__sidebar {
+ flex: 1 1 auto;
+ width: 100%;
+ }
+}
+
+.umb-user-details-details__section {
+ background: @gray-10;
+ padding: 20px;
+ margin-bottom: 20px;
+ border-radius: 3px;
+ border: 1px solid @gray-8;
+}
+
+.umb-user-details-details__section-title {
+ font-size: 17px;
+ font-weight: bold;
+ color: @black;
+ margin-top: 0;
+ margin-bottom: 15px;
+}
+
+.umb-user-details-details__section-description {
+ font-size: 12px;
+ line-height: 1.6em;
+ margin-bottom: 15px;
+}
+
+.umb-user-details-details__information-item {
+ margin-bottom: 10px;
+ font-size: 13px;
+}
+
+.umb-user-details-details__information-item-label {
+ color: @black;
+ font-weight: bold;
+}
+
+.umb-user-details-details__information-item-content {
+ word-break: break-word;
+}
+
diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 6940987290..e3350b4956 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -580,7 +580,7 @@ div.help {
text-align: center;
text-shadow: 0 1px 0 @white;
background-color: @gray-10;
- border: 1px solid @gray-8;
+ border: 1px solid @purple-l3;
}
.add-on,
.btn,
diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less
index 22e2eb4566..cd32c64782 100644
--- a/src/Umbraco.Web.UI.Client/src/less/hacks.less
+++ b/src/Umbraco.Web.UI.Client/src/less/hacks.less
@@ -202,7 +202,7 @@ pre {
//font-size: @baseFontSize - 1; // 14px to 13px
color: @gray-2;
line-height: @baseLineHeight;
- white-space: pre-line; // 1
+ white-space: pre-wrap; // 1
overflow-x: auto; // 1
background-color: @gray-10;
border: 1px solid @gray-8;
@@ -222,4 +222,4 @@ pre {
background-color: transparent;
border: 0;
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/legacydialog.less b/src/Umbraco.Web.UI.Client/src/less/legacydialog.less
new file mode 100644
index 0000000000..ca920d22c2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/less/legacydialog.less
@@ -0,0 +1,58 @@
+
+.umb-dialog .propertyItemheader {
+ width: 140px !Important;
+}
+
+.umb-dialog .diffDropdown {
+ width: 400px;
+}
+
+.umb-dialog .diffPanel {
+ height: 400px;
+}
+
+
+.umb-dialog .diff {
+ margin-top: 10px;
+ height: 100%;
+ overflow: auto;
+ border-top: 1px solid #ccc;
+ border-top: 1px solid #ccc;
+ padding: 5px;
+}
+
+.umb-dialog .diff table {
+ width: 95%;
+ max-width: 95%;
+ margin: 0 3px;
+}
+
+.umb-dialog .diff table th {
+ padding: 5px;
+ width: 25%;
+ border-bottom: 1px solid #ccc;
+}
+
+.umb-dialog .diff table td {
+ border-bottom: 1px solid #ccc;
+ padding: 3px;
+}
+
+.umb-dialog .diff del {
+ background: rgb(255, 230, 230) none repeat scroll 0%;
+ -moz-background-clip: -moz-initial;
+ -moz-background-origin: -moz-initial;
+ -moz-background-inline-policy: -moz-initial;
+}
+
+.umb-dialog .diff ins {
+ background: rgb(230, 255, 230) none repeat scroll 0%;
+ -moz-background-clip: -moz-initial;
+ -moz-background-origin: -moz-initial;
+ -moz-background-inline-policy: -moz-initial;
+}
+
+.umb-dialog .diff .diffnotice {
+ text-align: center;
+ margin-bottom: 10px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index def6d114ff..912e7d90e2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -52,6 +52,16 @@
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
+
+ &__toggle{
+ margin: 10px 0;
+
+ label{
+ margin-right: 10px;
+ position: relative;
+ top: -2px;
+ }
+ }
}
.upload-button {
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 198885e6be..27a51bc80c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -120,6 +120,13 @@ div.umb-codeeditor .umb-btn-toolbar {
//
// RTE
// --------------------------------------------------
+.umb-rte {
+ position: relative;
+
+ .-loading {
+ position: absolute;
+ }
+}
.mce-tinymce{border: 1px solid @gray-8 !important; border-radius: 0px !important;}
.mce-panel{background: @gray-10 !important; border-color: @gray-8 !important;}
.mce-btn-group, .mce-btn{border: none !important; background: none !important;}
@@ -142,11 +149,14 @@ div.umb-codeeditor .umb-btn-toolbar {
/* pre-value editor */
.control-group.color-picker-preval {
.thumbnail {
- width: 36px;
+ width: 34px;
+ height: 34px;
min-width: auto;
border: none;
cursor: move;
border-radius: 3px;
+ margin-top: auto;
+ margin-bottom: auto;
}
.handle {
@@ -158,19 +168,19 @@ div.umb-codeeditor .umb-btn-toolbar {
div.color-picker-prediv {
display: inline-flex;
align-items: center;
- max-width: 85%;
+ max-width: 100%;
+ flex: 1;
pre {
display: inline-flex;
font-family: monospace;
- margin-right: 10px;
- margin-left: 10px;
+ margin-left: 15px;
+ margin-right: 15px;
white-space: nowrap;
overflow: hidden;
margin-bottom: 0;
vertical-align: middle;
- padding-top: 7px;
- padding-bottom: 7px;
+ padding: 6px 10px;
background: #f7f7f7;
flex: 0 0 auto;
}
@@ -199,11 +209,11 @@ div.umb-codeeditor .umb-btn-toolbar {
label {
border: 1px solid #fff;
- padding: 7px 10px;
+ padding: 6px 10px;
font-family: monospace;
border: 1px solid #dfdfe1;
background: #f7f7f7;
- margin: 0 15px 0 0;
+ margin: 0 15px 0 3px;
border-radius: 3px;
}
}
@@ -310,7 +320,7 @@ div.umb-codeeditor .umb-btn-toolbar {
.umb-mediapicker .umb-sortable-thumbnails li {
flex-direction: column;
- margin: 0 5px 5px 0;
+ margin: 0 0 5px 5px;
padding: 5px;
}
@@ -579,6 +589,16 @@ div.umb-codeeditor .umb-btn-toolbar {
}
}
+ .imagecropper .umb-cropper__container .button-drawer {
+ display: flex;
+ justify-content: flex-end;
+ padding: 10px;
+
+ button {
+ margin-left: 4px;
+ }
+ }
+
.umb-close-cropper {
position: absolute;
top: 3px;
@@ -843,7 +863,20 @@ div.umb-codeeditor .umb-btn-toolbar {
//
// Nested boolean (e.g. list view bulk action permissions)
-// ---------------------=====-----------------------------
+// -------------------------------------------------------
.umb-nested-boolean label {margin-bottom: 8px; float: left; width: 320px;}
.umb-nested-boolean label span {float: left; width: 80%;}
.umb-nested-boolean label input[type='checkbox'] {margin-right: 10px; float: left;}
+
+//
+// Custom styles of property editors in property preview in document type editor
+// -----------------------------------------------------------------------------
+.umb-group-builder__property-preview {
+ .umb-property-editor {
+ .slider {
+ .tooltip {
+ display: none;
+ }
+ }
+ }
+}
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 c965d16c0d..ac529fc215 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
@@ -207,7 +207,7 @@
}
}
- $scope.allowPasswordReset = Umbraco.Sys.ServerVariables.umbracoSettings.allowPasswordReset;
+ $scope.allowPasswordReset = Umbraco.Sys.ServerVariables.umbracoSettings.canSendRequiredEmail && Umbraco.Sys.ServerVariables.umbracoSettings.allowPasswordReset;
$scope.showLogin = function () {
$scope.errorMsg = "";
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 9b563be2df..40f5035d11 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -151,7 +151,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;
@@ -236,7 +236,10 @@ angular.module("umbraco")
$scope.onUploadComplete = function(files) {
$scope.gotoFolder($scope.currentFolder).then(function() {
if (files.length === 1 && $scope.model.selectedImages.length === 0) {
- selectImage($scope.images[$scope.images.length - 1]);
+ var image = $scope.images[$scope.images.length - 1];
+ $scope.target = image;
+ $scope.target.url = mediaHelper.resolveFile(image);
+ selectImage(image);
}
});
};
@@ -305,6 +308,23 @@ angular.module("umbraco")
debounceSearchMedia();
};
+ /**
+ * Toggle the $scope.model.allowAsRoot value to either true or false
+ */
+ $scope.toggle = function(){
+
+ // Make sure to activate the changeSearch function everytime the toggle is clicked
+ $scope.changeSearch();
+
+ // Toggle the showChilds option
+ if($scope.showChilds){
+ $scope.showChilds = false;
+ return;
+ }
+
+ $scope.showChilds = true;
+ }
+
$scope.changePagination = function(pageNumber) {
$scope.loading = true;
$scope.searchOptions.pageNumber = pageNumber;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
index fc62485521..bc5c114bb6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-toggle.html
@@ -1,4 +1,4 @@
-