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

Legacy dialogs missing conversion, language + partial view

Browse Source
This commit is contained in:
perploug
2014-01-14 14:33:11 +01:00
parent 8a8899397e
commit ba2fa2bff4
6 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
View File

@@ -8,7 +8,7 @@
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Choose a snippet:">
<cc1:PropertyPanel runat="server" Text="Choose a template:">
<asp:ListBox ID="PartialViewTemplate" runat="server" Width="350" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single">
<asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
</asp:ListBox>
@@ -22,5 +22,5 @@
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<asp:Button ID="sbmt" runat="server" CssClass="btn btn-primary" Text="Save" OnClick="SubmitButton_Click"></asp:Button>
<asp:Button ID="sbmt" runat="server" CssClass="btn btn-primary" Text="Create" OnClick="SubmitButton_Click"></asp:Button>
</cc1:Pane>

2
src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
View File

@@ -9,7 +9,7 @@
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Choose a snippet:">
<cc1:PropertyPanel runat="server" Text="Choose a template:">
<asp:ListBox ID="PartialViewTemplate" runat="server" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single" />
</cc1:PropertyPanel>

23
src/Umbraco.Web.UI/umbraco/create/language.ascx
View File

@@ -1,11 +1,18 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="language.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
<input type="hidden" name="nodeType">
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<div style="MARGIN-TOP: 25px"><%=umbraco.ui.Text("choose")%> <%=umbraco.ui.Text("language")%>:<br />
<asp:DropDownList ID="Cultures" runat="server" Width="350px" CssClass="bigInput"></asp:DropDownList>
</div>
<input type="hidden" name="nodeType"/>
<div style="padding-top: 25px;">
<asp:Button id="sbmt" Runat="server" style="MARGIN-TOP: 14px" Width="90" onclick="sbmt_Click"></asp:Button>
&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
</div>
<cc1:Pane runat="server">
<cc1:PropertyPanel runat="server" Text="Name" id="pp1">
<asp:DropDownList ID="Cultures" runat="server" CssClass="bigInput input-large-type input-block-level"></asp:DropDownList>
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="Cultures" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
</cc1:Pane>
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<asp:Button ID="sbmt" CssClass="btn btn-primary" OnClick="sbmt_Click" runat="server" Text='<%#umbraco.ui.Text("create") %>'></asp:Button>
</cc1:Pane>

22
src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx
View File

@@ -1,11 +1,17 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="language.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
<input type="hidden" name="nodeType">
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<div style="MARGIN-TOP: 25px"><%=umbraco.ui.Text("choose")%> <%=umbraco.ui.Text("language")%>:<br />
<asp:DropDownList ID="Cultures" runat="server" Width="350px" CssClass="bigInput"></asp:DropDownList>
</div>
<input type="hidden" name="nodeType"/>
<cc1:Pane runat="server">
<cc1:PropertyPanel runat="server" Text="Name" id="pp1">
<asp:DropDownList ID="Cultures" runat="server" CssClass="bigInput input-large-type input-block-level"></asp:DropDownList>
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="Cultures" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
</cc1:Pane>
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
<asp:Button ID="sbmt" CssClass="btn btn-primary" OnClick="sbmt_Click" runat="server" Text='<%#umbraco.ui.Text("create") %>'></asp:Button>
</cc1:Pane>
<div style="padding-top: 25px;">
<asp:Button id="sbmt" Runat="server" style="MARGIN-TOP: 14px" Width="90" onclick="sbmt_Click"></asp:Button>
&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
</div>

2
src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
View File

@@ -23,7 +23,9 @@ namespace umbraco.cms.presentation.create.controls
{
// get all existing languages
pp1.Text = ui.Text("choose") + " " + ui.Text("language");
sbmt.Text = ui.Text("create");
SortedList sortedCultures = new SortedList();
Cultures.Items.Clear();
Cultures.Items.Add(new ListItem(ui.Text("choose") + "...", ""));

21
src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.designer.cs generated
View File

@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4200
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,6 +12,15 @@ namespace umbraco.cms.presentation.create.controls {
public partial class language {
/// <summary>
/// pp1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.PropertyPanel pp1;
/// <summary>
/// Cultures control.
/// </summary>
@@ -22,6 +30,15 @@ namespace umbraco.cms.presentation.create.controls {
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList Cultures;
/// <summary>
/// RequiredFieldValidator1 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.RequiredFieldValidator RequiredFieldValidator1;
/// <summary>
/// sbmt control.
/// </summary>