-
{{ name }}
+
{{ name }}
{{ description }}
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
index ce423225f6..66695ace91 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/intro.html
@@ -12,21 +12,32 @@
-
- What are Content Templates?
- Content Templates are pre-defined content that can be selected when creating a new content node.
+
+
+ What are Content Templates?
+
+
+ Content Templates are pre-defined content that can be selected when creating a new content node.
+
- How do I create a Content Template?
- There are two ways to create a Content Template:
-
- - Right-click a content node and select "Create Content Template" to create a new Content Template.
- - Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.
-
- Once given a name, editors can start using the Content Template as a foundation for their new page.
+
+ How do I create a Content Template?
+
+
+ There are two ways to create a Content Template:
+
+ - Right-click a content node and select "Create Content Template" to create a new Content Template.
+ - Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.
+
+ Once given a name, editors can start using the Content Template as a foundation for their new page.
+
- How do I manage Content Templates
- You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Just expand the Document Type which the
- Content Template is based on and click it to edit or delete it.
+
+ How do I manage Content Templates?
+
+
+ You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Just expand the Document Type which the Content Template is based on and click it to edit or delete it.
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
index e697dc56a5..b35663c3df 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html
@@ -20,10 +20,11 @@
ng-required="model.validation.mandatory"
val-server="value"
class="datepickerinput">
-
-
-
-
+
+
diff --git a/src/Umbraco.Web.UI.Docs/gulpfile.js b/src/Umbraco.Web.UI.Docs/gulpfile.js
index 789e2b7845..a3e596ecad 100644
--- a/src/Umbraco.Web.UI.Docs/gulpfile.js
+++ b/src/Umbraco.Web.UI.Docs/gulpfile.js
@@ -16,7 +16,7 @@ gulp.task('docs', [], function (cb) {
var options = {
html5Mode: false,
startPage: '/api',
- title: "Umbraco Backoffice UI API Documentation",
+ title: "Umbraco 8 Backoffice UI API Documentation",
dest: './api',
styles: ['./umb-docs.css'],
image: "https://our.umbraco.com/assets/images/logo.svg"
@@ -53,4 +53,4 @@ gulp.task('open:docs', function (cb) {
gulp.src(__filename)
.pipe(open(options));
cb();
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Docs/umb-docs.css b/src/Umbraco.Web.UI.Docs/umb-docs.css
index 0f2e3e7f74..b748a0a609 100644
--- a/src/Umbraco.Web.UI.Docs/umb-docs.css
+++ b/src/Umbraco.Web.UI.Docs/umb-docs.css
@@ -4,7 +4,7 @@ html {
}
body {
font-family: 'Segoe UI', Tahoma, Helvetica, sans-serif;
-
+
}
.container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
@@ -33,37 +33,43 @@ body {
font-family: inherit;
}
+.navbar .container{
+ min-height: inherit;
+ display: flex;
+ align-items: center;
+}
+
.navbar .brand {
display: block;
- float: left;
- padding: 10px 20px 10px;
- margin-left: -20px;
- font-size: 20px;
- font-weight: 200;
- color: rgba(0,0,0,.8);
+ color: white;
text-shadow: none;
}
.navbar-fixed-top .navbar-inner {
min-height: 50px;
- background: #a3db78;
+ background: #3544b1;
}
.form-search .well {
- background-color: #f5fbf1;
+ background-color: #f7f7f7;
}
.form-search > ul.nav > li.module {
- background-color: #daf0c9;
+ background-color: #3544b1;
}
-.breadcrumb {
- background-color: #f5fbf1;
+.form-search > ul.nav > li.module a {
+ color: white;
}
-a {
- color: #f36f21;
+.form-search > ul.nav > li.section {
+ background-color: #ccc;
}
+
+.breadcrumb {
+ background-color: #f7f7f7;
+}
+
a:hover {
text-decoration: none;
color: rgba(0,0,0,.8);
@@ -87,9 +93,12 @@ a:hover {
color: #000;
}
+.form-search > ul.nav > li.module > a:hover{
+ color: #fff;
+}
+
.header img {
width: 50px;
- margin-top: 5px;
}
.content .methods code {
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index ecb504ca50..e9f03276b5 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -250,7 +250,7 @@
Dette dokument er udgivet, men dets URL kan ikke dirigeres
Udgiv
Udgivet
-
Udgivet (Afventende ændringer)
+
Udgivet (Ventede ændringer)
Udgivelsesstatus
Udgiv med undersider for at udgive %0% og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]>
Udgiv med undersider for at udgive de valgte sprog og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]>
@@ -429,6 +429,7 @@
Internt link:
Ved lokalt link, indsæt da en "#" foran linket
Åben i nyt vindue?
+
Makroindstillinger
Denne makro har ingen egenskaber du kan redigere
Indsæt tekst
Rediger rettigheder for
@@ -667,6 +668,7 @@
Ikon
Id
Importer
+
Inkludér undermapper i søgning
Søg kun i denne mappe
Info
Indre margen
@@ -1753,6 +1755,12 @@ Mange hilsner fra Umbraco robotten
Åben backoffice søgning
Åben/Luk backoffice hjælp
Åben/Luk dine profil indstillinger
+
Tilføj domæne på %0%
+
Opret ny node under %0%
+
Opsæt offentlig adgang på %0%
+
Opsæt rettigheder på %0%
+
Juster soterings rækkefølgen for %0%
+
Opret indholds skabelon baseret på %0%
Aktivt sprog
Skift sprog til
Opret ny mappe
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index d92d1e8598..d51ffa5851 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -143,6 +143,7 @@
Save and send for approval
Save list view
Schedule
+
Preview
Save and preview
Preview is disabled because there's no template assigned
Choose style
@@ -695,6 +696,7 @@
Icon
Id
Import
+
Include subfolders in search
Search only this folder
Info
Inner margin
@@ -2237,6 +2239,12 @@ To manage your website, simply open the Umbraco back office and start adding con
Open backoffice search
Open/Close backoffice help
Open/Close your profile options
+
Setup Culture and Hostnames for %0%
+
Create new node under %0%
+
Setup Public access on %0%
+
Setup Permissions on %0%
+
Change sort order for %0%
+
Create Content Template based on %0%
Open context menu for
Current language
Switch language to
@@ -2456,4 +2464,21 @@ To manage your website, simply open the Umbraco back office and start adding con
Clipboard
Settings
+
+
What are Content Templates?
+
Content Templates are pre-defined content that can be selected when creating a new content node.
+
How do I create a Content Template?
+
+ There are two ways to create a Content Template:
+
+ - Right-click a content node and select "Create Content Template" to create a new Content Template.
+ - Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.
+
+ Once given a name, editors can start using the Content Template as a foundation for their new page.
+ ]]>
+
+
How do I manage Content Templates?
+
You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.
+
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index a20b6e58a2..dcdd724a1f 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -142,6 +142,7 @@
Send for approval
Save list view
Schedule
+
Preview
Save and preview
Preview is disabled because there's no template assigned
Choose style
@@ -373,7 +374,8 @@
Document Types within the Settings section, by changing the Allow as root option under Permissions.]]>
Media Types Types within the Settings section, by editing the Allowed child node types under Permissions.]]>
The selected media in the tree doesn't allow for any other media to be created below it.
-
Edit permissions for this media type Document Type without a template
+
Edit permissions for this media type
+
Document Type without a template
New folder
New data type
New JavaScript file
@@ -577,6 +579,9 @@
#value or ?key=value
Enter alias...
Generating alias...
+
Create item
+
Edit
+
Name
Create custom list view
@@ -698,6 +703,7 @@
Icon
Id
Import
+
Include subfolders in search
Search only this folder
Info
Inner margin
@@ -2252,6 +2258,12 @@ To manage your website, simply open the Umbraco back office and start adding con
Open backoffice search
Open/Close backoffice help
Open/Close your profile options
+
Setup Culture and Hostnames for %0%
+
Create new node under %0%
+
Setup Public access on %0%
+
Setup Permissions on %0%
+
Change sort order for %0%
+
Create Content Template based on %0%
Open context menu for
Current language
Switch language to
@@ -2471,4 +2483,21 @@ To manage your website, simply open the Umbraco back office and start adding con
Clipboard
Settings
+
+
What are Content Templates?
+
Content Templates are pre-defined content that can be selected when creating a new content node.
+
How do I create a Content Template?
+
+ There are two ways to create a Content Template:
+
+ - Right-click a content node and select "Create Content Template" to create a new Content Template.
+ - Right-click the Content Templates tree in the Settings section and select the Document Type you want to create a Content Template for.
+
+ Once given a name, editors can start using the Content Template as a foundation for their new page.
+ ]]>
+
+
How do I manage Content Templates?
+
You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it.
+
diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs
index 9d4c76eea1..094c6b24ff 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItem.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Web.Actions;
+using System.Threading;
namespace Umbraco.Web.Models.Trees
{
@@ -28,12 +29,15 @@ namespace Umbraco.Web.Models.Trees
Name = name;
}
-
public MenuItem(string alias, ILocalizedTextService textService)
: this()
{
+ var values = textService.GetAllStoredValues(Thread.CurrentThread.CurrentUICulture);
+ values.TryGetValue($"visuallyHiddenTexts/{alias}_description", out var textDescription);
+
Alias = alias;
Name = textService.Localize($"actions/{Alias}");
+ TextDescription = textDescription;
}
///
@@ -74,6 +78,9 @@ namespace Umbraco.Web.Models.Trees
[Required]
public string Alias { get; set; }
+ [DataMember(Name = "textDescription")]
+ public string TextDescription { get; set; }
+
///
/// Ensures a menu separator will exist before this menu item
///
diff --git a/src/Umbraco.Web/Models/Trees/MenuItemList.cs b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
index 1df486ebdf..4aaf0632ab 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItemList.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Threading;
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Web.Actions;
@@ -75,7 +76,7 @@ namespace Umbraco.Web.Models.Trees
}
return null;
}
-
+
internal MenuItem CreateMenuItem(string name, bool hasSeparator = false, bool opensDialog = false)
where T : IAction
{
@@ -96,14 +97,18 @@ namespace Umbraco.Web.Models.Trees
var item = Current.Actions.GetAction();
if (item == null) return null;
+ var values = textService.GetAllStoredValues(Thread.CurrentThread.CurrentUICulture);
+ values.TryGetValue($"visuallyHiddenTexts/{item.Alias}Description", out var textDescription);
+
var menuItem = new MenuItem(item, textService.Localize($"actions/{item.Alias}"))
{
SeparatorBefore = hasSeparator,
- OpensDialog = opensDialog
+ OpensDialog = opensDialog,
+ TextDescription = textDescription,
};
return menuItem;
}
-
+
}
}
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 85ff30487d..663af43643 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -323,7 +323,7 @@ namespace Umbraco.Web.Trees
private void AddActionNode(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool opensDialog = false)
where TAction : IAction
{
- var menuItem = menu.Items.Add(Services.TextService.Localize("actions", _actions.GetAction().Alias), hasSeparator, opensDialog);
+ var menuItem = menu.Items.Add(Services.TextService, hasSeparator, opensDialog);
}
public IEnumerable Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)