-
-
|
-
-
true to hide icon.
@param {string=} alias show and edit the content alias.
+@param {boolean=} aliasLocked Set to true to lock the alias.
@param {boolean=} hideAlias Set to true to hide alias.
@param {string=} description Add a description to the content.
@param {boolean=} hideDescription Set to true to hide description.
@@ -347,6 +348,7 @@ Use this directive to construct a header inside the main editor window.
icon: "=",
hideIcon: "@",
alias: "=",
+ aliasLocked: "<",
hideAlias: "=",
description: "=",
hideDescription: "@",
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
index 1ddd09357a..9114cfb1c1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirm.directive.js
@@ -56,6 +56,7 @@ function confirmDirective() {
onCancel: '=',
caption: '@',
confirmButtonStyle: '@',
+ confirmDisabled: '',
confirmLabelKey: '@'
},
link: function (scope, element, attr, ctrl) {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
index 5e766b7578..94c0318fca 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
@@ -161,6 +161,7 @@ input.umb-table__input {
line-height: 20px;
color: @ui-option-type;
vertical-align: bottom;
+ text-decoration: none;
}
.umb-table-body__checkicon,
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
index 9ddad03b48..7caec3c78e 100644
--- 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
@@ -63,6 +63,10 @@ a.umb-user-details-details__back-link {
.umb-user-details-details__sidebar {
flex: 0 0 @sidebarwidth;
+
+ .umb-button{
+ margin-left:0px;
+ }
}
@media (max-width: 768px) {
@@ -101,6 +105,7 @@ a.umb-user-details-details__back-link {
.umb-user-details-details__information-item {
margin-bottom: 10px;
font-size: 13px;
+ margin-top:10px;
}
.umb-user-details-details__information-item-label {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index da093f72fe..d72e977010 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -169,9 +169,9 @@
ng-change="updateTemplate(node.template)">
-
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
index 384c5ccaf7..d8e4f09b8a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-confirm.html
@@ -14,6 +14,7 @@
action="confirm()"
button-style="{{confirmButtonStyle || 'primary'}}"
state="confirmButtonState"
+ disabled="confirmDisabled === true"
label-key="{{confirmLabelKey || 'general_ok'}}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
index cc3e57bdc4..0ad88b9894 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
@@ -1,14 +1,30 @@
This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section:
-This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section:
+{{::property.name}}
{{::property.name}}
{{::property.name}}
To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.
-
- Click the retry button when
- done.
- More information on editing web.config here.
- Don't worry - no content will be deleted and everything will continue working afterwards! -
- ]]>No further actions needs to be taken. Click Next to proceed.]]>
No further actions needs to be taken. Click Next to proceed.]]>
-
|
-
| - |
-
-
- -
- |
- - |