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

Clean up the legacy doctype editor

Browse Source
This commit is contained in:
perploug
2013-09-12 14:40:30 +02:00
parent 0037283c75
commit 0c8f63487d
4 changed files with 45 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
View File

@@ -56,12 +56,8 @@
<cc2:Pane runat="server">
<cc2:PropertyPanel ID="pp_icon" runat="server" Text="Icon">
<div class="umbIconDropdownList">
<asp:DropDownList ID="ddlIcons" CssClass="guiInputText guiInputStandardSize" runat="server"/>
</div>
</cc2:PropertyPanel>
<cc2:PropertyPanel ID="pp_thumbnail" runat="server" Text="Thumbnail">
<div class="umbThumbnailDropdownList">
<asp:DropDownList ID="ddlThumbnails" CssClass="guiInputText guiInputStandardSize" runat="server"/>
<a href="#">Choose...</a>
<asp:TextBox ID="tb_icon" runat="server" />
</div>
</cc2:PropertyPanel>
<cc2:PropertyPanel ID="pp_description" runat="server" Text="Description">

30
src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Language="C#" MasterPageFile="../MasterPages/UmbracoPage.Master" AutoEventWireup="true" CodeBehind="EditMacro.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.EditMacro" %>
<%@ Page Language="C#" MasterPageFile="../MasterPages/UmbracoDialog.Master" AutoEventWireup="true" CodeBehind="EditMacro.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.EditMacro" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
@@ -24,17 +24,23 @@
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<asp:Panel ID="pl_edit" runat="server" Visible="false">
<cc2:Pane ID="pane_edit" runat="server">
<div class="macro-properties">
<asp:PlaceHolder ID="macroProperties" runat="server" />
</div>
</cc2:Pane>
<p>
<input data-bind="click: updateMacro" type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
<em>or </em>
<a data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
</p>
<cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<input data-bind="click: updateMacro" class="btn btn-primary" type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
</cc2:Pane>
<script type="text/javascript">
(function($) {
@@ -49,18 +55,20 @@
</script>
</asp:Panel>
<asp:Panel ID="pl_insert" runat="server">
<cc2:Pane ID="pane_insert" runat="server">
<cc2:PropertyPanel ID="pp_chooseMacro" runat="server" Text="Choose a macro">
<asp:ListBox Rows="1" ID="umb_macroAlias" runat="server"></asp:ListBox>
</cc2:PropertyPanel>
</cc2:Pane>
<p>
<asp:Button ID="bt_insert" runat="server" Text="ok" OnClick="renderProperties"></asp:Button>
<em>or </em>
<a data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
</p>
<cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<asp:Button ID="bt_insert" runat="server" CssClass="btn btn-primary" Text="ok" OnClick="renderProperties"></asp:Button>
</cc2:Pane>
</asp:Panel>
<div id="renderContent" style="display: none">
<asp:PlaceHolder ID="renderHolder" runat="server"></asp:PlaceHolder>
</div>

1
src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx
View File

@@ -39,6 +39,7 @@
<asp:Content ContentPlaceHolderID="body" runat="server">
<uc1:ContentTypeControlNew ID="ContentTypeControlNew1" runat="server"></uc1:ContentTypeControlNew>
<cc1:Pane ID="tmpPane" runat="server">
<cc1:PropertyPanel Text="Allowed templates" runat="server">
<div class="guiInputStandardSize" style="border: #ccc 1px solid; background: #fff;