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

Bugfix, getting things to run

Browse Source
This commit is contained in:
Stephan
2017-09-27 16:14:11 +02:00
parent be00851b50
commit e7a0d79ea7
21 changed files with 382 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx
View File

@@ -1,10 +1,5 @@
<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Title="Assembly Browser" Codebehind="assemblyBrowser.aspx.cs" AutoEventWireup="True"
Inherits="umbraco.developer.assemblyBrowser" %>
<%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="umbraco" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<asp:Content ContentPlaceHolderID="body" runat="server">
<h4><asp:Label id="AssemblyName" runat="server"></asp:Label></h4>

4
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx
View File

@@ -1,7 +1,7 @@
<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoDialog.Master" AutoEventWireup="true"
CodeBehind="xsltVisualize.aspx.cs" ValidateRequest="false" Inherits="umbraco.presentation.umbraco.developer.Xslt.xsltVisualize" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="umbraco" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
<%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="Umbraco.Web" %>
<asp:Content runat="server" ContentPlaceHolderID="head">

23
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.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.presentation.umbraco.developer.Xslt {
public partial class xsltVisualize {
/// <summary>
/// Pane1 control.
/// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane Pane1;
/// <summary>
/// PropertyPanel1 control.
/// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel1;
/// <summary>
/// xsltSelection control.
/// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden xsltSelection;
/// <summary>
/// contentPicker control.
/// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.controls.ContentPicker contentPicker;
/// <summary>
/// visualizeDo control.
/// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button visualizeDo;
/// <summary>
/// visualizeContainer control.
/// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.Pane visualizeContainer;
/// <summary>
/// visualizePanel control.
/// </summary>
@@ -75,7 +74,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Umbraco.Web._Legacy.Controls.PropertyPanel visualizePanel;
/// <summary>
/// visualizeArea control.
/// </summary>

4
src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
View File

@@ -1,5 +1,5 @@
<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="Umbraco.Web" %>
<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master" ValidateRequest="false"
CodeBehind="EditDictionaryItem.aspx.cs" AutoEventWireup="True" Inherits="umbraco.settings.EditDictionaryItem" %>