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

Fix UI namespaces issues

Browse Source
This commit is contained in:
Stephan
2017-12-01 20:05:52 +01:00
parent aa25990681
commit eea1392ef4
81 changed files with 689 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="delete.aspx.cs" Inherits="umbraco.presentation.actions.delete" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
<style type="text/css">
@@ -9,8 +9,8 @@
<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
<cc1:UmbracoPanel ID="Panel2" runat="server" AutoResize="false" Width="500px" Height="200px" Text="Delete">
<asp:Panel ID="confirm" runat="server">
<cc1:Pane ID="pane_delete" runat="server">
<p><asp:Literal ID="warning" runat="server"></asp:Literal></p>
@@ -19,12 +19,12 @@
<asp:Button ID="deleteButton" runat="server" OnClick="deleteButton_Click" />
</p>
</asp:Panel>
<cc1:Pane ID="deleteMessage" runat="server" Visible="false">
<p><asp:Literal ID="deleted" runat="server"></asp:Literal></p>
</cc1:Pane>
</cc1:UmbracoPanel>
</asp:Content>

21
src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.actions {
public partial class delete {
/// <summary>
/// Panel2 control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel2;
/// <summary>
/// confirm control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel confirm;
/// <summary>
/// pane_delete control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_delete;
/// <summary>
/// warning control.
/// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal warning;
/// <summary>
/// deleteButton control.
/// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button deleteButton;
/// <summary>
/// deleteMessage control.
/// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane deleteMessage;
/// <summary>
/// deleted control.
/// </summary>

14
src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="publish.aspx.cs" Inherits="umbraco.presentation.actions.publish" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<style type="text/css">
@@ -15,16 +15,16 @@
<p>
<asp:Literal ID="warning" runat="server"></asp:Literal>
</p>
</cc1:Pane>
<br />
</cc1:Pane>
<br />
<p>
<asp:Button ID="deleteButton" runat="server" OnClick="deleteButton_Click" />
</p>
</p>
</asp:Panel>
<cc1:Pane ID="deleteMessage" runat="server" Visible="false">
<p><asp:Literal ID="deleted" runat="server"></asp:Literal></p>
</cc1:Pane>
</cc1:Pane>
</cc1:UmbracoPanel>
</asp:Content>

21
src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.actions {
public partial class publish {
/// <summary>
/// Panel2 control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel2;
/// <summary>
/// confirm control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel confirm;
/// <summary>
/// pane_publish control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_publish;
/// <summary>
/// warning control.
/// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal warning;
/// <summary>
/// deleteButton control.
/// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button deleteButton;
/// <summary>
/// deleteMessage control.
/// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.actions {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane deleteMessage;
/// <summary>
/// deleted control.
/// </summary>

30
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="C#" ValidateRequest="false" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master"
Title="Package and export content" CodeBehind="editPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages._Default" %>
<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc2" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
var updateMethod = "";
@@ -35,12 +35,27 @@
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" EnableClientScript="false"
ControlToValidate="packageVersion">*</asp:RequiredFieldValidator>
</cc2:PropertyPanel>
<cc2:PropertyPanel runat="server" ID="pp_icon" Text="Package Icon URL">
<asp:TextBox ID="iconUrl" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
</cc2:PropertyPanel>
<cc2:PropertyPanel runat="server" ID="pp_file" Text="Package file (.zip):">
<asp:Literal ID="packageUmbFile" runat="server" />
</cc2:PropertyPanel>
</cc2:Pane>
<cc2:Pane ID="Pane5" runat="server">
<cc2:PropertyPanel runat="server" ID="pp_umbracoVersion" Text="Umbraco Target Version">
<asp:TextBox ID="umbracoVersion" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
<asp:RequiredFieldValidator ID="RequiredFieldValidator7" runat="server" EnableClientScript="false"
ControlToValidate="umbracoVersion">*</asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="VersionValidator" runat="server" EnableClientScript="false"
ControlToValidate="umbracoVersion" ValidationExpression="^\d+\.\d+\.\d+$">Invalid version number (eg. 7.5.0)</asp:RegularExpressionValidator>
</cc2:PropertyPanel>
</cc2:Pane>
<cc2:Pane ID="Pane1_1" runat="server">
<cc2:PropertyPanel runat="server" ID="pp_author" Text="Author Name">
<cc2:PropertyPanel runat="server" ID="pp_author" Text="Author Name" >
<asp:TextBox ID="packageAuthorName" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
<asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" EnableClientScript="false"
ControlToValidate="packageAuthorName">*</asp:RequiredFieldValidator>
@@ -51,6 +66,7 @@
ControlToValidate="packageAuthorUrl">*</asp:RequiredFieldValidator>
</cc2:PropertyPanel>
</cc2:Pane>
<cc2:Pane ID="Pane1_2" runat="server">
<cc2:PropertyPanel runat="server" ID="pp_licens" Text="License Name:">
<asp:TextBox ID="packageLicenseName" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
@@ -74,7 +90,7 @@
<asp:PlaceHolder ID="content" runat="server"></asp:PlaceHolder>
<br />
<asp:CheckBox ID="packageContentSubdirs" runat="server" />
Include all child nodes
<asp:Label ID="packageContentSubdirsLabel" Text="Include all child nodes" AssociatedControlID="packageContentSubdirs" runat="server" />
</cc2:PropertyPanel>
</cc2:Pane>
<cc2:Pane ID="Pane2_1" runat="server">
@@ -117,7 +133,7 @@
<tr>
<td>
<strong style="color: Red;">Remember:</strong> .xslt and .ascx files for your macros
will be added automatically, but you will still need to add <strong>assemblies</strong>,
will be added automaticly, but you will still need to add <strong>assemblies</strong>,
<strong>images</strong> and <strong>script files</strong> manually to the list below.
</td>
</tr>
@@ -152,6 +168,7 @@
<a href="#" onclick="UmbClientMgr.openModalWindow('developer/packages/directoryBrowser.aspx?target=<%= packageFilePathNew.ClientID %>','Choose a file or a folder', true, 400, 500); return false;"
style="border: none;">
<i class="icon icon-folder"></i>
</a>
</td>
<td class="propertyContent">
<asp:Button ID="createNewFilePath" OnClientClick="addfileJs()" Text="Add" OnClick="addFileToPackage"
@@ -172,7 +189,8 @@
<asp:TextBox ID="packageControlPath" Width="330px" CssClass="guiInputText" runat="server" />
<a href="#" onclick="UmbClientMgr.openModalWindow('developer/packages/directoryBrowser.aspx?target=<%= packageControlPath.ClientID %>','Choose a file or a folder', true, 500, 400); return false;"
style="border: none;">
<img style="border: none;" src="../../images/foldericon.png" /></a>
<i class="icon icon-folder"></i>
</a>
</td>
</tr>
</table>
@@ -186,7 +204,7 @@
during installation and uninstallation.
<br />
All actions are formed as a xml node, containing data for the action to be performed.
<a href="http://our.umbraco.org/wiki/reference/packaging/package-actions
<a href="https://our.umbraco.org/documentation/Reference/Packaging/
" target="_blank">Package actions documentation</a>
</p>
<asp:CustomValidator ID="actionsVal" runat="server" OnServerValidate="validateActions"

203
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.developer.packages {
public partial class _Default {
/// <summary>
/// TabView1 control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.TabView TabView1;
/// <summary>
/// Pane1 control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane1;
/// <summary>
/// pp_name control.
/// </summary>
@@ -38,16 +38,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_name;
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_icon;
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_umbracoVersion;
protected global::System.Web.UI.WebControls.TextBox iconUrl;
protected global::System.Web.UI.WebControls.TextBox umbracoVersion;
protected global::Umbraco.Web._Legacy.Controls.Pane Pane5;
protected global::System.Web.UI.WebControls.RegularExpressionValidator VersionValidator;
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator7;
/// <summary>
/// packageName control.
/// </summary>
@@ -56,7 +47,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageName;
/// <summary>
/// RequiredFieldValidator0 control.
/// </summary>
@@ -65,7 +56,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator0;
/// <summary>
/// pp_url control.
/// </summary>
@@ -74,7 +65,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_url;
/// <summary>
/// packageUrl control.
/// </summary>
@@ -83,7 +74,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageUrl;
/// <summary>
/// RequiredFieldValidator1 control.
/// </summary>
@@ -92,7 +83,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
/// <summary>
/// pp_version control.
/// </summary>
@@ -101,7 +92,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_version;
/// <summary>
/// packageVersion control.
/// </summary>
@@ -110,7 +101,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageVersion;
/// <summary>
/// RequiredFieldValidator2 control.
/// </summary>
@@ -119,7 +110,25 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2;
/// <summary>
/// pp_icon control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_icon;
/// <summary>
/// iconUrl 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.TextBox iconUrl;
/// <summary>
/// pp_file control.
/// </summary>
@@ -128,7 +137,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_file;
/// <summary>
/// packageUmbFile control.
/// </summary>
@@ -137,7 +146,52 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal packageUmbFile;
/// <summary>
/// Pane5 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane5;
/// <summary>
/// pp_umbracoVersion control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_umbracoVersion;
/// <summary>
/// umbracoVersion 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.TextBox umbracoVersion;
/// <summary>
/// RequiredFieldValidator7 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 RequiredFieldValidator7;
/// <summary>
/// VersionValidator 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.RegularExpressionValidator VersionValidator;
/// <summary>
/// Pane1_1 control.
/// </summary>
@@ -146,7 +200,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_1;
/// <summary>
/// pp_author control.
/// </summary>
@@ -155,7 +209,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_author;
/// <summary>
/// packageAuthorName control.
/// </summary>
@@ -164,7 +218,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageAuthorName;
/// <summary>
/// RequiredFieldValidator3 control.
/// </summary>
@@ -173,7 +227,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator3;
/// <summary>
/// pp_author_url control.
/// </summary>
@@ -182,7 +236,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_author_url;
/// <summary>
/// packageAuthorUrl control.
/// </summary>
@@ -191,7 +245,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageAuthorUrl;
/// <summary>
/// RequiredFieldValidator4 control.
/// </summary>
@@ -200,7 +254,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator4;
/// <summary>
/// Pane1_2 control.
/// </summary>
@@ -209,7 +263,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_2;
/// <summary>
/// pp_licens control.
/// </summary>
@@ -218,7 +272,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_licens;
/// <summary>
/// packageLicenseName control.
/// </summary>
@@ -227,7 +281,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageLicenseName;
/// <summary>
/// RequiredFieldValidator5 control.
/// </summary>
@@ -236,7 +290,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator5;
/// <summary>
/// pp_license_url control.
/// </summary>
@@ -245,7 +299,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_license_url;
/// <summary>
/// packageLicenseUrl control.
/// </summary>
@@ -254,7 +308,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageLicenseUrl;
/// <summary>
/// RequiredFieldValidator6 control.
/// </summary>
@@ -263,7 +317,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator6;
/// <summary>
/// Pane1_3 control.
/// </summary>
@@ -272,7 +326,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_3;
/// <summary>
/// pp_readme control.
/// </summary>
@@ -281,7 +335,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_readme;
/// <summary>
/// packageReadme control.
/// </summary>
@@ -290,7 +344,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageReadme;
/// <summary>
/// Pane2 control.
/// </summary>
@@ -299,7 +353,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2;
/// <summary>
/// pp_content control.
/// </summary>
@@ -308,7 +362,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_content;
/// <summary>
/// content control.
/// </summary>
@@ -317,7 +371,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder content;
/// <summary>
/// packageContentSubdirs control.
/// </summary>
@@ -326,7 +380,16 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox packageContentSubdirs;
/// <summary>
/// packageContentSubdirsLabel 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 packageContentSubdirsLabel;
/// <summary>
/// Pane2_1 control.
/// </summary>
@@ -335,7 +398,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_1;
/// <summary>
/// documentTypes control.
/// </summary>
@@ -344,7 +407,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBoxList documentTypes;
/// <summary>
/// Pane2_2 control.
/// </summary>
@@ -353,7 +416,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_2;
/// <summary>
/// templates control.
/// </summary>
@@ -362,7 +425,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBoxList templates;
/// <summary>
/// Pane2_3 control.
/// </summary>
@@ -371,7 +434,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_3;
/// <summary>
/// stylesheets control.
/// </summary>
@@ -380,7 +443,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBoxList stylesheets;
/// <summary>
/// Pane2_4 control.
/// </summary>
@@ -389,7 +452,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_4;
/// <summary>
/// macros control.
/// </summary>
@@ -398,7 +461,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBoxList macros;
/// <summary>
/// Pane2_5 control.
/// </summary>
@@ -407,7 +470,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_5;
/// <summary>
/// languages control.
/// </summary>
@@ -416,7 +479,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBoxList languages;
/// <summary>
/// Pane2_6 control.
/// </summary>
@@ -425,7 +488,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_6;
/// <summary>
/// dictionary control.
/// </summary>
@@ -434,7 +497,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBoxList dictionary;
/// <summary>
/// Pane2_7 control.
/// </summary>
@@ -443,7 +506,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_7;
/// <summary>
/// cbl_datatypes control.
/// </summary>
@@ -452,7 +515,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBoxList cbl_datatypes;
/// <summary>
/// Pane3 control.
/// </summary>
@@ -461,7 +524,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane3;
/// <summary>
/// Pane3_1 control.
/// </summary>
@@ -470,7 +533,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane3_1;
/// <summary>
/// packageFilesRepeater control.
/// </summary>
@@ -479,7 +542,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater packageFilesRepeater;
/// <summary>
/// packageFilePathNew control.
/// </summary>
@@ -488,7 +551,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageFilePathNew;
/// <summary>
/// createNewFilePath control.
/// </summary>
@@ -497,7 +560,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button createNewFilePath;
/// <summary>
/// Pane3_2 control.
/// </summary>
@@ -506,7 +569,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane3_2;
/// <summary>
/// packageControlPath control.
/// </summary>
@@ -515,7 +578,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox packageControlPath;
/// <summary>
/// Pane4 control.
/// </summary>
@@ -524,7 +587,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane4;
/// <summary>
/// actionsVal control.
/// </summary>
@@ -533,7 +596,7 @@ namespace umbraco.presentation.developer.packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CustomValidator actionsVal;
/// <summary>
/// tb_actions control.
/// </summary>

48
src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
View File

@@ -1,16 +1,16 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
<style type="text/css">
table.relations { }
table.relations th { width:auto; }
table.relations th.objectTypeIcon { width:20px; }
table.relations th.directionIcon { width:16px; height:16px; }
table.relations td { background: transparent none no-repeat scroll center center }
/* objectType icons */
table.relations td.ContentItemType {}
table.relations td.ROOT {}
@@ -26,19 +26,19 @@
table.relations td.Stylesheet {}
table.relations td.Member {}
table.relations td.DataType {}
/* direction icons */
table.relations td.parentToChild { background-image: url('/umbraco/developer/RelationTypes/Images/ParentToChild.png'); }
table.relations td.bidirectional { background-image: url('/umbraco/developer/RelationTypes/Images/Bidirectional.png'); }
</style>
</style>
</asp:Content>
<asp:Content ID="bodyContent" ContentPlaceHolderID="body" runat="server">
<umb:TabView runat="server" ID="tabControl" Width="200" />
<umb:Pane ID="idPane" runat="server" Text="">
<umb:PropertyPanel runat="server" id="idPropertyPanel" Text="Id">
@@ -46,18 +46,18 @@
</umb:PropertyPanel>
</umb:Pane>
<umb:Pane ID="nameAliasPane" runat="server" Text="">
<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
<asp:TextBox ID="nameTextBox" runat="server" Columns="40" ></asp:TextBox>
<asp:RequiredFieldValidator ID="nameRequiredFieldValidator" runat="server" ControlToValidate="nameTextBox" ValidationGroup="RelationType" ErrorMessage="Name Required" Display="Dynamic" />
</umb:PropertyPanel>
<umb:PropertyPanel runat="server" id="aliasPropertyPanel" Text="Alias">
<asp:TextBox ID="aliasTextBox" runat="server" Columns="40"></asp:TextBox>
<asp:TextBox ID="aliasTextBox" runat="server" Columns="40"></asp:TextBox>
<asp:RequiredFieldValidator ID="aliasRequiredFieldValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="RelationType" ErrorMessage="Alias Required" Display="Dynamic" />
<asp:CustomValidator ID="aliasCustomValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="RelationType" onservervalidate="AliasCustomValidator_ServerValidate" ErrorMessage="Duplicate Alias" Display="Dynamic" />
@@ -65,12 +65,12 @@
</umb:Pane>
<umb:Pane ID="directionPane" runat="server" Text="">
<umb:PropertyPanel runat="server" id="dualPropertyPanel" Text="Direction">
<asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Horizontal">
<asp:ListItem Enabled="true" Selected="False" Text="Parent to Child" Value="0" />
<asp:ListItem Enabled="true" Selected="False" Text="Parent to Child" Value="0" />
<asp:ListItem Enabled="true" Selected="False" Text="Bidirectional" Value="1"/>
</asp:RadioButtonList>
</umb:PropertyPanel>
@@ -90,7 +90,7 @@
</umb:Pane>
<umb:Pane ID="relationsCountPane" runat="server" Text="">
<umb:PropertyPanel runat="server" id="relationsCountPropertyPanel" Text="Count">
@@ -98,12 +98,12 @@
</umb:PropertyPanel>
</umb:Pane>
<umb:Pane ID="relationsPane" runat="server" Text="">
<umb:PropertyPanel runat="server" id="relationsPropertyPanel" Text="Relations">
<asp:Repeater ID="relationsRepeater" runat="server">
<HeaderTemplate>
<table class="relations">
@@ -116,7 +116,7 @@
<th>Child</th>
<th>Created</th>
<th>Comment</th>
</tr>
</tr>
</thead>
<tbody>
</HeaderTemplate>
@@ -128,15 +128,15 @@
<td class="<%= this.ChildObjectType %>">&nbsp;</td>
<td><%# DataBinder.Eval(Container.DataItem, "ChildText") %></td>
<td><%# DataBinder.Eval(Container.DataItem, "DateTime") %></td>
<td><%# DataBinder.Eval(Container.DataItem, "Comment") %></td>
<td><%# DataBinder.Eval(Container.DataItem, "Comment") %></td>
</tr>
</ItemTemplate>
</ItemTemplate>
<FooterTemplate>
</tbody>
</table>
</FooterTemplate>
</asp:Repeater>
</umb:PropertyPanel>

62
src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.cms.presentation.developer.RelationTypes
{
public partial class EditRelationType
{
namespace umbraco.cms.presentation.developer.RelationTypes {
public partial class EditRelationType {
/// <summary>
/// tabControl control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.TabView tabControl;
/// <summary>
/// idPane control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane idPane;
/// <summary>
/// idPropertyPanel control.
/// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel idPropertyPanel;
/// <summary>
/// idLiteral control.
/// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal idLiteral;
/// <summary>
/// nameAliasPane control.
/// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane nameAliasPane;
/// <summary>
/// nameProperyPanel control.
/// </summary>
@@ -65,7 +65,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel nameProperyPanel;
/// <summary>
/// nameTextBox control.
/// </summary>
@@ -74,7 +74,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox nameTextBox;
/// <summary>
/// nameRequiredFieldValidator control.
/// </summary>
@@ -83,7 +83,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator nameRequiredFieldValidator;
/// <summary>
/// aliasPropertyPanel control.
/// </summary>
@@ -92,7 +92,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel aliasPropertyPanel;
/// <summary>
/// aliasTextBox control.
/// </summary>
@@ -101,7 +101,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox aliasTextBox;
/// <summary>
/// aliasRequiredFieldValidator control.
/// </summary>
@@ -110,7 +110,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator aliasRequiredFieldValidator;
/// <summary>
/// aliasCustomValidator control.
/// </summary>
@@ -119,7 +119,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CustomValidator aliasCustomValidator;
/// <summary>
/// directionPane control.
/// </summary>
@@ -128,7 +128,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane directionPane;
/// <summary>
/// dualPropertyPanel control.
/// </summary>
@@ -137,7 +137,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel dualPropertyPanel;
/// <summary>
/// dualRadioButtonList control.
/// </summary>
@@ -146,7 +146,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RadioButtonList dualRadioButtonList;
/// <summary>
/// objectTypePane control.
/// </summary>
@@ -155,7 +155,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane objectTypePane;
/// <summary>
/// parentPropertyPanel control.
/// </summary>
@@ -164,7 +164,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel parentPropertyPanel;
/// <summary>
/// parentLiteral control.
/// </summary>
@@ -173,7 +173,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal parentLiteral;
/// <summary>
/// childPropertyPanel control.
/// </summary>
@@ -182,7 +182,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel childPropertyPanel;
/// <summary>
/// childLiteral control.
/// </summary>
@@ -191,7 +191,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal childLiteral;
/// <summary>
/// relationsCountPane control.
/// </summary>
@@ -200,7 +200,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane relationsCountPane;
/// <summary>
/// relationsCountPropertyPanel control.
/// </summary>
@@ -209,7 +209,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel relationsCountPropertyPanel;
/// <summary>
/// relationsCountLiteral control.
/// </summary>
@@ -218,7 +218,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal relationsCountLiteral;
/// <summary>
/// relationsPane control.
/// </summary>
@@ -227,7 +227,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane relationsPane;
/// <summary>
/// relationsPropertyPanel control.
/// </summary>
@@ -236,7 +236,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel relationsPropertyPanel;
/// <summary>
/// relationsRepeater control.
/// </summary>

12
src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx
View File

@@ -1,17 +1,17 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%>
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="bodyContent" ContentPlaceHolderID="body" runat="server">
<umb:Pane ID="nameAliasPane" runat="server" Text="">
<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
<asp:TextBox ID="descriptionTextBox" runat="server" Columns="40" AutoCompleteType="Disabled" style="width:200px;" />
<asp:RequiredFieldValidator ID="descriptionRequiredFieldValidator" runat="server" ControlToValidate="descriptionTextBox" ValidationGroup="NewRelationType" ErrorMessage="Name Required" Display="Dynamic" />
</umb:PropertyPanel>
<umb:PropertyPanel runat="server" id="aliasPropertyPanel" Text="Alias">
<asp:TextBox ID="aliasTextBox" runat="server" Columns="40" AutoCompleteType="Disabled" style="width:200px;" />
<asp:RequiredFieldValidator ID="aliasRequiredFieldValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="NewRelationType" ErrorMessage="Alias Required" Display="Dynamic" />
@@ -23,7 +23,7 @@
<umb:PropertyPanel runat="server" id="PropertyPanel1" Text="Direction">
<asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Horizontal">
<asp:ListItem Enabled="true" Selected="True" Text="Parent to Child" Value="0"/>
<asp:ListItem Enabled="true" Selected="True" Text="Parent to Child" Value="0"/>
<asp:ListItem Enabled="true" Selected="False" Text="Bidirectional" Value="1"/>
</asp:RadioButtonList>
</umb:PropertyPanel>
@@ -42,7 +42,7 @@
</umb:PropertyPanel>
</umb:Pane>
<div style="margin-top:15px">
<asp:Button ID="addButton" runat="server" Text="Create" onclick="AddButton_Click" CausesValidation="true" ValidationGroup="NewRelationType" />
<em>or</em>

44
src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.cms.presentation.developer.RelationTypes
{
public partial class NewRelationType
{
namespace umbraco.cms.presentation.developer.RelationTypes {
public partial class NewRelationType {
/// <summary>
/// nameAliasPane control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane nameAliasPane;
/// <summary>
/// nameProperyPanel control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel nameProperyPanel;
/// <summary>
/// descriptionTextBox control.
/// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox descriptionTextBox;
/// <summary>
/// descriptionRequiredFieldValidator control.
/// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator descriptionRequiredFieldValidator;
/// <summary>
/// aliasPropertyPanel control.
/// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel aliasPropertyPanel;
/// <summary>
/// aliasTextBox control.
/// </summary>
@@ -65,7 +65,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox aliasTextBox;
/// <summary>
/// aliasRequiredFieldValidator control.
/// </summary>
@@ -74,7 +74,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator aliasRequiredFieldValidator;
/// <summary>
/// aliasCustomValidator control.
/// </summary>
@@ -83,7 +83,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CustomValidator aliasCustomValidator;
/// <summary>
/// directionPane control.
/// </summary>
@@ -92,7 +92,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane directionPane;
/// <summary>
/// PropertyPanel1 control.
/// </summary>
@@ -101,7 +101,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel1;
/// <summary>
/// dualRadioButtonList control.
/// </summary>
@@ -110,7 +110,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RadioButtonList dualRadioButtonList;
/// <summary>
/// objectTypePane control.
/// </summary>
@@ -119,7 +119,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane objectTypePane;
/// <summary>
/// PropertyPanel2 control.
/// </summary>
@@ -128,7 +128,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel2;
/// <summary>
/// parentDropDownList control.
/// </summary>
@@ -137,7 +137,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList parentDropDownList;
/// <summary>
/// PropertyPanel3 control.
/// </summary>
@@ -146,7 +146,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel3;
/// <summary>
/// childDropDownList control.
/// </summary>
@@ -155,7 +155,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList childDropDownList;
/// <summary>
/// addButton control.
/// </summary>

8
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="c#" Codebehind="xsltChooseExtension.aspx.cs" MasterPageFile="../../masterpages/umbracoDialog.Master" AutoEventWireup="True"
Inherits="umbraco.developer.xsltChooseExtension" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function returnResult() {
@@ -24,7 +24,7 @@ div.code{padding: 7px 0px 7px 0px; font-family: Consolas,courier;}
div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font-family: Consolas,courier;}
</style>
</asp:Content>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<cc1:Pane runat="server" Text="Choose xslt extension">
@@ -39,6 +39,6 @@ div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font
<p>
<asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= Services.TextService.Localize("or") %></em> <a href="xsltInsertValueOf.aspx"><%= Services.TextService.Localize("cancel") %></a>
</p>
</p>
</asp:Content>

15
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.developer {
public partial class xsltChooseExtension {
/// <summary>
/// assemblies control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.developer {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList assemblies;
/// <summary>
/// methods control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.developer {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList methods;
/// <summary>
/// PlaceHolderParamters control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.developer {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolderParamters;
/// <summary>
/// bt_insert control.
/// </summary>

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Codebehind="xsltInsertValueOf.aspx.cs" AutoEventWireup="True" Inherits="umbraco.developer.xsltInsertValueOf" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">

15
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <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>
//------------------------------------------------------------------------------
namespace umbraco.developer {
public partial class xsltInsertValueOf {
/// <summary>
/// JsInclude1 control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.developer {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
/// <summary>
/// valueOf control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.developer {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox valueOf;
/// <summary>
/// preValues control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.developer {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList preValues;
/// <summary>
/// disableOutputEscaping control.
/// </summary>

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
View File

@@ -2,7 +2,7 @@
<%@ Import Namespace="Umbraco.Web" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<umb:JsInclude runat="server" FilePath="Dialogs/AssignDomain2.js" PathNameAlias="UmbracoClient" />

18
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.dialogs {
public partial class AssignDomain2 {
/// <summary>
/// data control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal data;
/// <summary>
/// feedback control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Feedback feedback;
/// <summary>
/// pane_language control.
/// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_language;
/// <summary>
/// prop_language control.
/// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel prop_language;
/// <summary>
/// pane_domains control.
/// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_domains;
/// <summary>
/// p_buttons control.
/// </summary>

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="Preview.aspx.cs" Inherits="umbraco.presentation.dialogs.Preview" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">

19
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.dialogs {
public partial class Preview {
/// <summary>
/// feedback1 control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Feedback feedback1;
/// <summary>
/// pane_form control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_form;
/// <summary>
/// PropertyPanel1 control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel1;
/// <summary>
/// docLit control.
/// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal docLit;
/// <summary>
/// PropertyPanel2 control.
/// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel2;
/// <summary>
/// changeSetUrl control.
/// </summary>

6
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="insertMasterpageContent.aspx.cs" Inherits="umbraco.presentation.umbraco.dialogs.insertMasterpageContent" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
@@ -13,7 +13,7 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
<cc1:Pane ID="pane_insert" runat="server">
<cc1:PropertyPanel runat="server">
<p>
@@ -24,7 +24,7 @@
<asp:DropDownList ID="dd_detectedAlias" Width="350px" CssClass="bigInput input-block-level" runat="server" />
</cc1:PropertyPanel>
</cc1:Pane>
<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=Services.TextService.Localize("general/cancel")%></a>
<input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />

12
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.umbraco.dialogs {
public partial class insertMasterpageContent {
/// <summary>
/// pane_insert control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_insert;
/// <summary>
/// pp_placeholder control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_placeholder;
/// <summary>
/// dd_detectedAlias control.
/// </summary>

6
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
View File

@@ -1,18 +1,18 @@
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="notifications.aspx.cs" AutoEventWireup="True"
Inherits="umbraco.dialogs.notifications" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="body" runat="server">
<div class="umb-dialog-body form-horizontal">
<cc1:Pane ID="pane_form" runat="server">
</cc1:Pane>
</div>
<div runat="server" ID="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
<asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
</div>
</asp:Content>

12
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.dialogs {
public partial class notifications {
/// <summary>
/// pane_form control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_form;
/// <summary>
/// pl_buttons control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl pl_buttons;
/// <summary>
/// Button1 control.
/// </summary>

18
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="c#" Codebehind="republish.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.cms.presentation.republish" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
@@ -14,26 +14,26 @@
<asp:Content ContentPlaceHolderID="body" runat="server">
<asp:Panel ID="p_republish" runat="server">
<div class="propertyDiv">
<div class="propertyDiv">
<p><%= Services.TextService.Localize("defaultdialogs/siterepublishHelp")%> </p>
</div>
<div id="buttons">
<asp:Button ID="bt_go" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
<em><%= Services.TextService.Localize("or") %></em>
<em><%= Services.TextService.Localize("or") %></em>
<a href="#" onclick="UmbClientMgr.closeModalWindow();"><%=Services.TextService.Localize("cancel")%></a>
</div>
</div>
<div id="progress" style="visibility: hidden;">
<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
</div>
</asp:Panel>
<asp:Panel ID="p_done" Visible="false" runat="server">
<div class="success">
<p><%= Services.TextService.Localize("defaultdialogs/siterepublished")%></p>
</div>
<input type="button" class="guiInputButton" onclick="UmbClientMgr.closeModalWindow();" value="Ok" />
</asp:Panel>

15
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <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>
//------------------------------------------------------------------------------
namespace umbraco.cms.presentation {
public partial class republish {
/// <summary>
/// p_republish control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.cms.presentation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel p_republish;
/// <summary>
/// bt_go control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.cms.presentation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button bt_go;
/// <summary>
/// progbar control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.cms.presentation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.ProgressBar progbar;
/// <summary>
/// p_done control.
/// </summary>

4
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="c#" CodeBehind="rollBack.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
@@ -95,5 +95,5 @@
<div runat="server" id="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
<asp:Button ID="Button1" runat="server" Visible="false" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
</div>
</div>
</asp:Content>

36
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.dialogs {
public partial class rollBack {
/// <summary>
/// JsInclude1 control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
/// <summary>
/// feedBackMsg control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Feedback feedBackMsg;
/// <summary>
/// pp_selectVersion control.
/// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pp_selectVersion;
/// <summary>
/// pp_currentVersion control.
/// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_currentVersion;
/// <summary>
/// currentVersionTitle control.
/// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal currentVersionTitle;
/// <summary>
/// currentVersionMeta control.
/// </summary>
@@ -65,7 +65,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal currentVersionMeta;
/// <summary>
/// pp_rollBackTo control.
/// </summary>
@@ -74,7 +74,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_rollBackTo;
/// <summary>
/// allVersions control.
/// </summary>
@@ -83,7 +83,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList allVersions;
/// <summary>
/// pp_view control.
/// </summary>
@@ -92,7 +92,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_view;
/// <summary>
/// rbl_mode control.
/// </summary>
@@ -101,7 +101,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RadioButtonList rbl_mode;
/// <summary>
/// diffPanel control.
/// </summary>
@@ -110,7 +110,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel diffPanel;
/// <summary>
/// lt_notice control.
/// </summary>
@@ -119,7 +119,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal lt_notice;
/// <summary>
/// propertiesCompare control.
/// </summary>
@@ -128,7 +128,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal propertiesCompare;
/// <summary>
/// pl_buttons control.
/// </summary>
@@ -137,7 +137,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl pl_buttons;
/// <summary>
/// Button1 control.
/// </summary>

4
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true"
CodeBehind="search.aspx.cs" Inherits="umbraco.presentation.dialogs.search" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ID="header1" ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function openItem(id) {
@@ -33,7 +33,7 @@
<cc1:Pane ID="Wizard" runat="server">
<h3>Search</h3>
<p>
<asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox>
<asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox>
<asp:Button ID="searchButton" runat="server" Text="Search" onclick="search_Click" /><br />
</p>
<asp:Panel ID="nothingFound" runat="server" Visible="false">

16
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.dialogs {
public partial class search {
/// <summary>
/// Wizard control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Wizard;
/// <summary>
/// keyword control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox keyword;
/// <summary>
/// searchButton control.
/// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button searchButton;
/// <summary>
/// nothingFound control.
/// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.presentation.dialogs {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel nothingFound;
/// <summary>
/// searchResult control.
/// </summary>

3
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Codebehind="sendToTranslation.aspx.cs" Inherits="umbraco.presentation.dialogs.sendToTranslation" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
<style type="text/css">
@@ -34,4 +34,3 @@
</p>
</asp:Panel>
</asp:Content>

64
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.designer.cs generated
View File

@@ -3,19 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System.Web.UI.WebControls;
namespace umbraco.presentation.dialogs
{
namespace umbraco.presentation.dialogs {
public partial class sendToTranslation {
/// <summary>
/// feedback control.
/// </summary>
@@ -23,8 +19,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Umbraco.Web._Legacy.Controls.Feedback feedback;
protected global::Umbraco.Web._Legacy.Controls.Feedback feedback;
/// <summary>
/// pane_form control.
/// </summary>
@@ -32,8 +28,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Umbraco.Web._Legacy.Controls.Pane pane_form;
protected global::Umbraco.Web._Legacy.Controls.Pane pane_form;
/// <summary>
/// pp_translator control.
/// </summary>
@@ -41,8 +37,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_translator;
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_translator;
/// <summary>
/// translator control.
/// </summary>
@@ -50,8 +46,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected DropDownList translator;
protected global::System.Web.UI.WebControls.DropDownList translator;
/// <summary>
/// pp_language control.
/// </summary>
@@ -59,8 +55,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_language;
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_language;
/// <summary>
/// language control.
/// </summary>
@@ -68,8 +64,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected DropDownList language;
protected global::System.Web.UI.WebControls.DropDownList language;
/// <summary>
/// defaultLanguage control.
/// </summary>
@@ -77,8 +73,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Literal defaultLanguage;
protected global::System.Web.UI.WebControls.Literal defaultLanguage;
/// <summary>
/// pp_includeSubs control.
/// </summary>
@@ -86,8 +82,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_includeSubs;
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_includeSubs;
/// <summary>
/// includeSubpages control.
/// </summary>
@@ -95,8 +91,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected CheckBox includeSubpages;
protected global::System.Web.UI.WebControls.CheckBox includeSubpages;
/// <summary>
/// pp_comment control.
/// </summary>
@@ -104,8 +100,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_comment;
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_comment;
/// <summary>
/// comment control.
/// </summary>
@@ -113,8 +109,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected TextBox comment;
protected global::System.Web.UI.WebControls.TextBox comment;
/// <summary>
/// pl_buttons control.
/// </summary>
@@ -122,8 +118,8 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Panel pl_buttons;
protected global::System.Web.UI.WebControls.Panel pl_buttons;
/// <summary>
/// doTranslation control.
/// </summary>
@@ -131,6 +127,6 @@ namespace umbraco.presentation.dialogs
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected Button doTranslation;
protected global::System.Web.UI.WebControls.Button doTranslation;
}
}

8
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master"Codebehind="viewAuditTrail.aspx.cs" AutoEventWireup="True"
Inherits="umbraco.presentation.umbraco.dialogs.viewAuditTrail" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
<style type="text/css">
@@ -66,6 +66,6 @@
</asp:Content>

2
src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" Codebehind="DictionaryItemList.aspx.cs"
Inherits="umbraco.presentation.settings.DictionaryItemList" MasterPageFile="../masterpages/umbracoPage.Master" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="body" runat="server">

12
src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.settings {
public partial class DictionaryItemList {
/// <summary>
/// Panel1 control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.settings {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel1;
/// <summary>
/// pane1 control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.settings {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane1;
/// <summary>
/// lt_table control.
/// </summary>

2
src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="c#" CodeBehind="editLanguage.aspx.cs" AutoEventWireup="True" MasterPageFile="../masterpages/umbracoPage.Master"
Inherits="umbraco.settings.editLanguage" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="body" runat="server">
<cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true">
<cc1:Pane ID="Pane7" runat="server">

14
src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.designer.cs generated
View File

@@ -3,15 +3,15 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.settings {
public partial class editLanguage {
/// <summary>
/// Panel1 control.
/// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.settings {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel1;
/// <summary>
/// Pane7 control.
/// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.settings {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane7;
/// <summary>
/// pp_language control.
/// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.settings {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_language;
/// <summary>
/// Cultures control.
/// </summary>

22
src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx
View File

@@ -1,40 +1,40 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="default.aspx.cs" Inherits="umbraco.presentation.translation._default" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<style type="text/css">
.fieldsTable tr{
border-color: #D9D7D7 !Important;
}
}
</style>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<cc1:UmbracoPanel ID="Panel2" runat="server">
<cc1:Feedback ID="feedback" runat="server" />
<cc1:Pane ID="pane_uploadFile" runat="server" Text="Upload translation file">
<p>
When you have completed the translation. Upload the edited XML file here. The related translation tasks will automatically be closed when a file is uploaded.
</p>
<cc1:PropertyPanel runat="server">
<input type="file" runat="server" id="translationFile" size="30" /> &nbsp; <asp:Button ID="uploadFile" runat="server" Text="Upload file" OnClick="uploadFile_Click" />
</cc1:PropertyPanel>
</cc1:Pane>
<cc1:Pane ID="pane_tasks" runat="server" Text="Your tasks">
<p>
<asp:Literal ID="lt_tasksHelp" runat="server"></asp:Literal>
</p>
<p>
<a href="xml.aspx?task=all" target="_blank"><%= Services.TextService.Localize("translation/downloadAllAsXml") %></a>
&nbsp; &nbsp;
<a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>
</p>
<a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>
</p>
<asp:GridView GridLines="Horizontal" ID="taskList" runat="server" CssClass="fieldsTable" BorderStyle="None" Width="100%"
CellPadding="5" AutoGenerateColumns="false">
<Columns>
@@ -50,6 +50,6 @@
</Columns>
</asp:GridView>
</cc1:Pane>
</cc1:UmbracoPanel>
</asp:Content>

23
src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.translation {
public partial class _default {
/// <summary>
/// Panel2 control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel2;
/// <summary>
/// feedback control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Feedback feedback;
/// <summary>
/// pane_uploadFile control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_uploadFile;
/// <summary>
/// translationFile control.
/// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputFile translationFile;
/// <summary>
/// uploadFile control.
/// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button uploadFile;
/// <summary>
/// pane_tasks control.
/// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_tasks;
/// <summary>
/// lt_tasksHelp control.
/// </summary>
@@ -75,7 +74,7 @@ namespace umbraco.presentation.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal lt_tasksHelp;
/// <summary>
/// taskList control.
/// </summary>

4
src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="details.aspx.cs" Inherits="umbraco.presentation.umbraco.translation.details" %>
<%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="ui" Namespace="Umbraco.Web._Legacy.Controls" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
@@ -7,7 +7,7 @@
<style type="text/css">
.fieldsTable tr{
border-color: #D9D7D7 !Important;
}
}
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">

33
src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.designer.cs generated
View File

@@ -1,18 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.umbraco.translation {
public partial class details {
/// <summary>
/// panel1 control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel panel1;
/// <summary>
/// pane_details control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_details;
/// <summary>
/// pp_date control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_date;
/// <summary>
/// pp_owner control.
/// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_owner;
/// <summary>
/// pp_totalWords control.
/// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_totalWords;
/// <summary>
/// pp_comment control.
/// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_comment;
/// <summary>
/// pane_tasks control.
/// </summary>
@@ -75,7 +74,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_tasks;
/// <summary>
/// pp_xml control.
/// </summary>
@@ -84,7 +83,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_xml;
/// <summary>
/// pp_upload control.
/// </summary>
@@ -93,7 +92,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_upload;
/// <summary>
/// pp_closeTask control.
/// </summary>
@@ -102,7 +101,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_closeTask;
/// <summary>
/// bt_close control.
/// </summary>
@@ -111,7 +110,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button bt_close;
/// <summary>
/// pane_fields control.
/// </summary>
@@ -120,7 +119,7 @@ namespace umbraco.presentation.umbraco.translation {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane pane_fields;
/// <summary>
/// dg_fields control.
/// </summary>

9
src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx
View File

@@ -1,5 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="preview.aspx.cs" Inherits="umbraco.presentation.translation.preview" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="body" runat="server">
@@ -12,18 +11,18 @@
<td colspan="2">
<div class="notice">
<p>
<strong>Please notice</strong> that due to templating and unpublished content, the 2 pages can have differences in layout.
<strong>Please notice</strong> that due to templating and unpublished content, the 2 pages can have differences in layout.
</p>
</div>
</td>
</tr>
<tr>
<td style="border-right: 1px solid #ccc; padding-right: 15px;">
<iframe src="<%= translatedUrl %>" frameborder="0" style="border: none"></iframe>
</td>
<td style="padding-left: 15px;">
<iframe src="<%= originalUrl %>" frameborder="0" style="border: none"></iframe>
</td>
</tr>
@@ -35,7 +34,7 @@
var docWidth = jQuery(document).width();
jQuery("iframe").height(docHeight - 140).width((docWidth / 2) - 31);
});
});
</script>
</asp:Content>

7
src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.designer.cs generated
View File

@@ -1,16 +1,15 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.translation {
public partial class preview {
}
}