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

adding guids to backoffice.

Browse Source
This commit is contained in:
Claus
2017-06-12 12:12:14 +02:00
parent 5eb330b7d7
commit 160518e977
11 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
View File

@@ -255,7 +255,8 @@ Use this directive to construct a header inside the main editor window.
description: "=",
hideDescription: "@",
descriptionLocked: "@",
navigation: "="
navigation: "=",
key: "="
},
link: link
};

6
src/Umbraco.Web.UI.Client/src/less/panel.less
View File

@@ -489,6 +489,12 @@ input.umb-panel-header-description {
line-height: 25px;
}
.umb-panel-header-key {
font-size: 10px;
margin-left: 8px;
color: #adadad;
}
.umb-editor-drawer-content {
display: flex;
align-items: center;

4
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
View File

@@ -47,7 +47,9 @@
ng-if="!hideDescription && !descriptionLocked"
ng-model="$parent.description" />
<div class="umb-panel-header-locked-description" ng-show="descriptionLocked">{{ description }}</div>
<div class="umb-panel-header-locked-description" ng-show="descriptionLocked">{{ description }}</div>
<div class="umb-panel-header-key">{{ key }}</div>
</div>

1
src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
View File

@@ -12,6 +12,7 @@
<umb-editor-header
menu="page.menu"
name="content.name"
key="content.key"
name-locked="page.nameLocked"
hide-icon="true"
hide-description="true"

1
src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
View File

@@ -9,6 +9,7 @@
<umb-editor-header
name="vm.contentType.name"
alias="vm.contentType.alias"
key="vm.contentType.key"
description="vm.contentType.description"
navigation="vm.page.navigation"
icon="vm.contentType.icon">

1
src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
View File

@@ -9,6 +9,7 @@
<umb-editor-header
name="vm.contentType.name"
alias="vm.contentType.alias"
key="vm.contentType.key"
description="vm.contentType.description"
navigation="vm.page.navigation"
icon="vm.contentType.icon">

1
src/Umbraco.Web.UI.Client/src/views/templates/edit.html
View File

@@ -13,6 +13,7 @@
<umb-editor-header
name="vm.template.name"
alias="vm.template.alias"
key="vm.template.key"
hideDescription="true"
description="vm.template.virtualPath"
description-locked="true"

3
src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
View File

@@ -58,6 +58,9 @@
<cc1:PropertyPanel runat="server" Text="Alias">
<asp:TextBox ID="macroAlias" runat="server" CssClass="guiInputText"></asp:TextBox>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Key">
<asp:Label ID="macroKey" runat="server" CssClass="guiLabel"></asp:Label>
</cc1:PropertyPanel>
</cc1:Pane>

7
src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs
View File

@@ -1,11 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
using Umbraco.Core.Models.Validation;
namespace Umbraco.Web.Models.ContentEditing
{
@@ -24,6 +20,9 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "alias")]
public string Alias { get; set; }
[DataMember(Name = "key")]
public Guid Key { get; set; }
[DataMember(Name = "content")]
public string Content { get; set; }

1
src/Umbraco.Web/Models/Mapping/TemplateModelMapper.cs
View File

@@ -15,7 +15,6 @@ namespace Umbraco.Web.Models.Mapping
config.CreateMap<TemplateDisplay, Template>()
.ForMember(x => x.DeletedDate, exp => exp.Ignore())
.ForMember(x => x.Key, exp => exp.Ignore())
.ForMember(x => x.Path, exp => exp.Ignore())
.ForMember(x => x.CreateDate, exp => exp.Ignore())
.ForMember(x => x.UpdateDate, exp => exp.Ignore())

28
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
View File

@@ -88,6 +88,7 @@ namespace umbraco.cms.presentation.developer
{
macroName.Text = macro.Name;
macroAlias.Text = macro.Alias;
macroKey.Text = macro.Key.ToString();
macroXslt.Text = macro.XsltPath;
macroPython.Text = macro.ScriptPath;
cachePeriod.Text = macro.CacheDuration.ToInvariantString();
@@ -209,7 +210,7 @@ namespace umbraco.cms.presentation.developer
}
protected IEnumerable<IParameterEditor> GetMacroParameterEditors()
{
{
// we need to show the depracated ones for backwards compatibility
return ParameterEditorResolver.Current.GetParameterEditors(true);
}
@@ -433,14 +434,23 @@ namespace umbraco.cms.presentation.developer
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox macroAlias;
/// <summary>
/// Pane1_2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.Pane Pane1_2;
/// <summary>
/// macroAlias control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label macroKey;
/// <summary>
/// Pane1_2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.Pane Pane1_2;
/// <summary>
/// macroXslt control.