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

removes the old language.ascx webforms files

Browse Source
This commit is contained in:
Shannon
2014-01-15 15:36:28 +11:00
parent 3f0569af41
commit cf3de52249
5 changed files with 46 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="language.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
<%@ Control Language="c#" AutoEventWireup="True" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<input type="hidden" name="nodeType"/>

13
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -424,6 +424,9 @@
<Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco.presentation\umbraco\create\Language.ascx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco.presentation\umbraco\create\DLRScripting.ascx.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
@@ -1205,13 +1208,6 @@
<Compile Include="umbraco.presentation\umbraco\create\dialogHandler_temp.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="umbraco.presentation\umbraco\create\language.ascx.cs">
<DependentUpon>language.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco.presentation\umbraco\create\language.ascx.designer.cs">
<DependentUpon>language.ascx</DependentUpon>
</Compile>
<Compile Include="umbraco.presentation\umbraco\create\media.ascx.cs">
<DependentUpon>media.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1926,9 +1922,6 @@
<Content Include="umbraco.presentation\umbraco\create\content.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="umbraco.presentation\umbraco\create\language.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="umbraco.presentation\umbraco\create\media.ascx" />
<Content Include="umbraco.presentation\umbraco\create\member.ascx">
<SubType>ASPXCodeBehind</SubType>

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

@@ -1,17 +0,0 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="language.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<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>

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

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Globalization;
using System.Web;
@@ -16,9 +16,6 @@ namespace umbraco.cms.presentation.create.controls
/// </summary>
public partial class language : UserControl
{
private Language[] m_langs = Language.getAll;
protected void Page_Load(object sender, EventArgs e)
{
// get all existing languages
@@ -31,7 +28,7 @@ namespace umbraco.cms.presentation.create.controls
Cultures.Items.Add(new ListItem(ui.Text("choose") + "...", ""));
foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
{
sortedCultures.Add(ci.DisplayName + "|||" + Guid.NewGuid().ToString(), ci.Name);
sortedCultures.Add(ci.DisplayName + "|||" + Guid.NewGuid().ToString(), ci.Name);
}
IDictionaryEnumerator ide = sortedCultures.GetEnumerator();
@@ -42,37 +39,6 @@ namespace umbraco.cms.presentation.create.controls
}
}
private bool languageExists(string culture)
{
foreach (Language l in m_langs)
{
if (l.CultureAlias == culture)
return true;
}
return false;
}
#region Web Form Designer generated code
protected override void OnInit(EventArgs e)
{
//
// CODEGEN: This call is required by the ASP.NET Web Form Designer.
//
InitializeComponent();
base.OnInit(e);
}
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
}
#endregion
protected void sbmt_Click(object sender, EventArgs e)
{
LegacyDialogHandler.Create(
@@ -82,10 +48,47 @@ namespace umbraco.cms.presentation.create.controls
-1,
Cultures.SelectedValue);
BasePage.Current.ClientTools
.ChildNodeCreated()
.CloseModalWindow();
BasePage.Current.ClientTools
.ChildNodeCreated()
.CloseModalWindow();
}
/// <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>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </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>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button sbmt;
}
}

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

@@ -1,51 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
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>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </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>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button sbmt;
}
}