Add WebCms

2016-11-07 12:56:17 -05:00
parent dfe92218f4
commit 15911f33c0
2750 changed files with 365672 additions and 133 deletions
@@ -0,0 +1,47 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+<script type="text/javascript">
+    function doSubmit() { document.Form1["ok"].click(); }
+	var functionsFrame = this;
+	var tabFrame = this;
+	var isDialog = true;
+	var submitOnEnter = true;
+	</script>
+
+
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+    
+    <cc1:Feedback ID="FeedBackMessage" runat="server" />
+    
+    <cc1:Pane runat="server" ID="pane_addnew">
+      <cc1:PropertyPanel runat="server" ID="prop_domain" Text="Domain">
+         <asp:TextBox ID="DomainName" runat="server" Width="252px"></asp:TextBox>
+         <asp:RequiredFieldValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator" runat="server" Display="Dynamic" />
+         <asp:RegularExpressionValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator2" runat="server" Display="Dynamic" /> 
+         <br /><small><%= umbraco.ui.Text("assignDomain", "domainHelp") %></small>
+      </cc1:PropertyPanel>
+      
+      <cc1:PropertyPanel ID="prop_lang" runat="server" Text="language">
+        <asp:DropDownList ID="Languages" runat="server" />
+        <asp:RequiredFieldValidator ControlToValidate="Languages" ErrorMessage="*" ID="LanguageValidator" runat="server" Display="Dynamic" />
+      </cc1:PropertyPanel>
+      
+      <cc1:PropertyPanel runat="server" Text=" ">
+        <asp:Button ID="ok" runat="server" OnClick="SaveDomain"></asp:Button> 
+      </cc1:PropertyPanel>
+    </cc1:Pane>
+    
+    <cc1:Pane ID="pane_edit" runat="server">
+      <cc1:PropertyPanel runat="server">
+                <asp:Literal ID="allDomains" runat="server" />
+      </cc1:PropertyPanel> 
+    </cc1:Pane>
+    
+    <p>
+      <a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a>
+    </p>
+</asp:Content>
@@ -0,0 +1,79 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="AssignDomain2.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain2" %>
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+<umb:JsInclude runat="server" FilePath="Dialogs/AssignDomain2.js" PathNameAlias="UmbracoClient" />
+<umb:JsInclude runat="server" FilePath="PunyCode/punycode.min.js" PathNameAlias="UmbracoClient" />
+<umb:JsInclude runat="server" FilePath="Application/JQuery/jquery.validate.min.js" PathNameAlias="UmbracoClient" />
+<umb:CssInclude runat="server" FilePath="Dialogs/AssignDomain2.css" PathNameAlias="UmbracoClient" />
+<script type="text/javascript">
+    (function ($) {
+        $(document).ready(function () {
+            var dialog = new Umbraco.Dialogs.AssignDomain2({
+                nodeId: <%=GetNodeId()%>,
+                restServiceLocation: '<%=GetRestServicePath() %>',
+                invalidDomain: '<%=umbraco.ui.Text("assignDomain", "invalidDomain") %>',
+                duplicateDomain: '<%=umbraco.ui.Text("assignDomain", "duplicateDomain") %>',
+                <asp:Literal runat="server" ID="data" />
+            });
+        dialog.init();
+    });
+    })(jQuery);
+</script>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+    
+    <div class="umb-dialog-body">
+
+    <cc1:Feedback ID="feedback" runat="server" />    
+    <div id="komask"></div>
+    
+         <cc1:Pane runat="server" ID="pane_language">
+            <cc1:PropertyPanel runat="server" ID="prop_language">
+                <select class="umb-editor umb-dropdown" name="language" data-bind="options: languages, optionsText: 'Code', optionsValue: 'Id', value: language, optionsCaption: '<%=umbraco.ui.Text("assignDomain", "inherit") %>    '"></select>
+             <!--   <small class="help-inline"><%=umbraco.ui.Text("assignDomain", "setLanguageHelp") %></small>-->
+            </cc1:PropertyPanel>
+        </cc1:Pane>
+    
+
+        <cc1:Pane runat="server" ID="pane_domains">
+            <small class="help-inline"><%=umbraco.ui.Text("assignDomain", "domainHelp") %></small>
+            <cc1:PropertyPanel runat="server">
+                <table class="table domains" data-bind="visible: domains().length > 0">
+                    <thead>
+                        <tr>
+                            <th><%=umbraco.ui.Text("assignDomain", "domain") %></th>
+                            <th><%=umbraco.ui.Text("assignDomain", "language") %></th>
+                            <th />
+                        </tr>
+                    </thead>
+                    <tbody data-bind="foreach: domains">
+                        <tr>
+                            <td valign="top"><input class="domain duplicate" data-bind="value: Name, uniqueName: true"  /><input type="hidden" value="" data-bind="uniqueName: true"/></td>
+                            <td valign="top"><select class="language" data-bind="options: $parent.languages, optionsText: 'Code', optionsValue: 'Id', value: Lang, uniqueName: true"></select></td>
+                            <td valign="top"><a href="#" class="btn btn-danger" data-bind="click: $parent.removeDomain"><i class="icon icon-trash"></i></a></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </cc1:PropertyPanel>
+            
+            <cc1:PropertyPanel runat="server">
+                <button class="btn" data-bind="click: addDomain"><%=umbraco.ui.Text("assignDomain", "addNew") %></button>        
+            </cc1:PropertyPanel>
+
+               
+        </cc1:Pane>
+
+        </div>
+
+
+
+        <div runat="server" ID="p_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+             <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>  
+             <button class="btn btn-primary" id="btnSave"><%=umbraco.ui.Text("buttons", "save") %></button>
+        </div>
+
+</asp:Content>
@@ -0,0 +1,121 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master"Codebehind="ChangeDocType.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.ChangeDocType" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+
+  <style type="text/css">
+    #propertyMapping thead tr th{border-bottom:1px solid #ccc; padding: 4px; padding-right: 25px;
+                                background-image: url(<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.UmbracoClient) %>/tableSorting/img/bg.gif);     
+                                cursor: pointer; 
+                                font-weight: bold; 
+                                background-repeat: no-repeat; 
+                                background-position: center right; 
+                               }
+    
+    #propertyMapping tbody tr td{border-bottom:1px solid #efefef}
+    #propertyMapping td{padding: 4px; ;}  
+    body.umbracoDialog { overflow: auto; }
+    .umb-dialog .umb-control-group .umb-el-wrap { overflow: hidden; }
+    .umb-dialog .umb-control-group .umb-el-wrap label { float: left; width: 140px; font-weight: bold; }
+    .umb-dialog .umb-control-group .umb-el-wrap label:after { content:":"; }
+    .umb-dialog .umb-control-group .umb-el-wrap .controls-row { float: left; width: 280px; padding-top: 8px; }
+    .umb-dialog .umb-control-group .umb-el-wrap .controls-row select { width: auto; }
+    </style>
+
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+
+    <cc1:Pane runat="server" ID="ChangeDocTypePane">
+        <p class="help">
+            <%= umbraco.ui.Text("changeDocType", "changeDocTypeInstruction") %>            
+        </p>
+
+        <cc1:PropertyPanel ID="ContentNamePropertyPanel" runat="server">
+            <asp:Label ID="ContentNameLabel" runat="server" />
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="CurrentTypePropertyPanel" runat="server">
+            <asp:Label ID="CurrentTypeLabel" runat="server" />
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="NewTypePropertyPanel" runat="server">
+            <asp:DropDownList ID="NewDocumentTypeList" runat="server" AutoPostBack="true" OnSelectedIndexChanged="NewDocumentTypeList_SelectedIndexChanged" />
+            <asp:RequiredFieldValidator ControlToValidate="NewDocumentTypeList" ErrorMessage="*" ID="NewDocumentTypeValidator" runat="server" Display="Dynamic" />          
+            <br /><small><%=umbraco.ui.Text("changeDocType", "validDocTypesNote") %></small>
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="NewTemplatePropertyPanel" runat="server">
+            <asp:DropDownList ID="NewTemplateList" runat="server" />
+        </cc1:PropertyPanel>
+
+        <asp:PlaceHolder ID="NotAvailablePlaceholder" runat="server" Visible="false">        
+            <div class="propertyItem notice" style="padding-top: 10px">     
+                <p><%=umbraco.ui.Text("changeDocType", "docTypeCannotBeChanged") %></p>
+            </div>
+        </asp:PlaceHolder>
+    </cc1:Pane>
+
+    <cc1:Pane runat="server" ID="ChangeDocTypePropertyMappingPane">
+
+        <p class="help">
+            <%= umbraco.ui.Text("changeDocType", "changeDocTypeInstruction2") %>            
+        </p>
+
+        <asp:Repeater ID="PropertyMappingRepeater" runat="server">
+            <HeaderTemplate>
+                <table id="propertyMapping">
+                    <thead>
+                        <tr>
+                            <th><%= umbraco.ui.Text("changeDocType", "currentProperty") %></th>
+                            <th><%= umbraco.ui.Text("changeDocType", "mapToProperty") %></th>
+                        </tr>
+                    </thead>
+            </HeaderTemplate>
+            <ItemTemplate>
+                <tr>
+                    <td>
+                        <%# DataBinder.Eval(Container, "DataItem.Name") %>
+                        <asp:HiddenField ID="Alias" runat="server" Value='<%#DataBinder.Eval(Container, "DataItem.Alias")%>' />
+                        <asp:HiddenField ID="Name" runat="server" Value='<%#DataBinder.Eval(Container, "DataItem.Name")%>' />
+                        <asp:HiddenField ID="PropertyEditorAlias" runat="server" Value='<%#DataBinder.Eval(Container, "DataItem.PropertyEditorAlias")%>' />
+                    </td>
+                    <td><asp:DropDownList id="DestinationProperty" runat="server" /></td>
+                </tr>
+            </ItemTemplate>
+            <FooterTemplate>
+                </table>
+            </FooterTemplate>
+        </asp:Repeater>
+    </cc1:Pane>
+
+    <asp:PlaceHolder ID="SuccessPlaceholder" runat="server" Visible="false">
+        <p><%=umbraco.ui.Text("changeDocType", "docTypeChanged") %></p>
+        <p>        
+            <asp:Literal ID="SuccessMessage" runat="server" />
+            <asp:Literal ID="PropertiesMappedMessage" runat="server" />
+            <asp:Literal ID="ContentPublishedMessage" runat="server" />
+            <br /><br />
+            <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("defaultdialogs", "closeThisWindow") %></a>  
+        </p>
+    </asp:PlaceHolder>
+
+    <asp:PlaceHolder ID="ValidationPlaceholder" runat="server" Visible="false">
+        <br />
+        <div class="notice" style="padding: 10px">        
+            <asp:Literal id="ValidationError" runat="server" />
+        </div>
+    </asp:PlaceHolder>
+
+    <div class="btn-toolbar umb-btn-toolbar">
+        <asp:PlaceHolder ID="SaveAndCancelPlaceholder" runat="server">
+            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+            <asp:PlaceHolder ID="SavePlaceholder" runat="server">        
+                <asp:Button ID="ValidateAndSave" runat="server" CssClass="btn btn-primary" Text="Create" OnClick="ValidateAndSave_Click"></asp:Button>
+            </asp:PlaceHolder>
+        </asp:Placeholder>
+    </div>
+     
+</asp:Content>
+  
@@ -0,0 +1,77 @@
+<%@ Page Language="C#" MasterPageFile="../MasterPages/UmbracoDialog.Master" AutoEventWireup="true" CodeBehind="EditMacro.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.EditMacro" %>
+
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+<%@ Import Namespace="Umbraco.Core.Configuration" %>
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Import Namespace="Umbraco.Core" %>
+<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<asp:Content ContentPlaceHolderID="head" runat="server">
+
+    <umb:CssInclude runat="server" FilePath="Dialogs/EditMacro.css" PathNameAlias="UmbracoClient" />
+    <umb:JsInclude runat="server" FilePath="Dialogs/EditMacro.js" PathNameAlias="UmbracoClient" />
+
+    <script type="text/javascript">
+        (function($) {
+            $(document).ready(function () {
+                Umbraco.Dialogs.EditMacro.getInstance().init({
+                    useAspNetMasterPages: <%=UmbracoConfig.For.UmbracoSettings().Templates.UseAspNetMasterPages.ToString().ToLower() %>,
+                    codeEditorElementId: "<%=Request.CleanForXss("objectId") %>",
+                    renderingEngine: "<%=Request.GetItemAsString("renderingEngine", "Mvc")%>",
+                    macroAlias: '<%= _macroAlias %>'
+                });
+            });
+        })(jQuery);        
+    </script>
+
+</asp:Content>
+<asp:Content ContentPlaceHolderID="body" runat="server">
+
+    
+    <asp:Panel ID="pl_edit" runat="server" Visible="false">
+        
+            
+        <cc2:Pane ID="pane_edit" runat="server">
+            <div class="macro-properties">
+                <asp:PlaceHolder ID="macroProperties" runat="server" />
+            </div>
+        </cc2:Pane>
+
+
+         <cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
+             <a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+             <input data-bind="click: updateMacro" class="btn btn-primary" type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
+        </cc2:Pane>
+
+        
+        <script type="text/javascript">
+            (function($) {
+                //when this panel loads, check if there are any macro properties, if not then load the macro content into the editor and close the modal
+                $(document).ready(function() {
+                    var countOfProperties = <%=CountOfMacroProperties %>;
+                    if (countOfProperties == 0) {
+                        Umbraco.Dialogs.EditMacro.getInstance().updateMacro();
+                    }
+                });
+            })(jQuery);
+        </script>
+
+    </asp:Panel>
+
+    <asp:Panel ID="pl_insert" runat="server">
+        <cc2:Pane ID="pane_insert" runat="server">
+            <cc2:PropertyPanel ID="pp_chooseMacro" runat="server" Text="Choose a macro">
+                <asp:ListBox Rows="1" ID="umb_macroAlias" runat="server"></asp:ListBox>
+            </cc2:PropertyPanel>
+        </cc2:Pane>
+        
+        <cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
+            <a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+             <asp:Button ID="bt_insert" runat="server" CssClass="btn btn-primary" Text="ok" OnClick="renderProperties"></asp:Button>
+        </cc2:Pane>
+    </asp:Panel>
+    
+    <div id="renderContent" style="display: none">
+        <asp:PlaceHolder ID="renderHolder" runat="server"></asp:PlaceHolder>
+    </div>
+</asp:Content>
@@ -0,0 +1,19 @@
+<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" Inherits="umbraco.presentation.dialogs.Preview" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">
+
+<cc1:Feedback ID="feedback1" runat="server" />
+
+<cc1:Pane ID="pane_form" runat="server">
+<cc1:PropertyPanel ID="PropertyPanel1" runat="server" Name="Document">
+<asp:Literal ID="docLit" runat="server"></asp:Literal>
+</cc1:PropertyPanel>
+<cc1:PropertyPanel ID="PropertyPanel2" runat="server" Name="Change Set">
+<asp:Literal ID="changeSetUrl" runat="server"></asp:Literal>
+</cc1:PropertyPanel>
+</cc1:Pane>
+
+
+
+ </asp:Content>
@@ -0,0 +1,57 @@
+<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="RegexWs.aspx.cs" Inherits="umbraco.presentation.dialogs.RegexWs" %>
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+	<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot"/>
+	
+	<cc1:Pane id="pane1" runat="server">
+	  <cc1:PropertyPanel ID="pp_search" Text="Search" runat="server">
+		  <asp:TextBox ID="searchField" style="width: 250px;" runat="server" /> <asp:Button ID="bt_search" runat="server" Text="search" OnClick="findRegex" />
+				<p>
+				<small><%= umbraco.ui.Text("defaultdialogs", "regexSearchHelp")%> </small>
+				</p>
+	  </cc1:PropertyPanel>
+	  
+	  <cc1:PropertyPanel runat="server">
+		  <asp:Panel ID="regexPanel" Visible="false" runat="server">
+		  <div class="diff">
+			<asp:Repeater id="results" runat="server" OnItemDataBound="onRegexBind">
+			  <ItemTemplate>
+				<div class="match">
+				  <h3><asp:Literal ID="header" runat="server" /></h3>
+					<p>
+					  <asp:Literal ID="desc" runat="server" />
+					</p>
+					<p>
+					  <pre><asp:Literal ID="regex" runat="server" /></pre>
+					</p>
+				</div>
+			  </ItemTemplate>
+			</asp:Repeater>
+		  </div>      
+		  </asp:Panel>
+	  </cc1:PropertyPanel>
+	</cc1:Pane>
+      
+
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+  <script type="text/javascript">
+	  function chooseRegex(regex) {
+		var target = top.right.document.getElementById('<%= Request.CleanForXss("target") %>');
+		target.value = regex;
+		UmbClientMgr.closeModalWindow(); 
+	}
+  </script>
+    
+  <style type="text/css">
+ 	.diff{height: 357px; width: 98%; overflow: auto; font-family: verdana; font-size: 11px;}
+	.diff pre{display: block; width: 80%; background: #EFEFF5; margin: 10px; margin-left: 0px; padding: 10px; overflow: hidden;}
+	.match{border-bottom: 1px solid #ccc; padding: 5px; margin-left: 10px; margin-bottom: 10px;}
+	.match h3{font-size: 14px; padding-left: 0px; margin-left: 0px;}  
+	</style>
+</asp:Content>
+    
@@ -0,0 +1,13 @@
+<%@ Page language="c#" Codebehind="SendPublish.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.SendPublish" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>umbraco - <%=umbraco.ui.Text("editContentSendToPublish")%></title>
+		<link href="../css/umbracoGui.css" type="text/css" rel="stylesheet"/>
+	</head>
+	<body style="padding: 10px;">
+		<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=umbraco.ui.Text("editContentSendToPublishText")%></h3>
+		<br/>
+		<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=umbraco.ui.Text("closewindow")%></a>
+	</body>
+</html>
@@ -0,0 +1,33 @@
+<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="about.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.about" %>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+      
+      
+      <div style="padding-right: 5px; padding-left: 5px; padding-bottom: 0px; padding-top: 10px;  text-align: center;">
+        
+        <img src="../images/umbracoSplash.png" />
+          
+        <p style="padding-right: 5px; padding-left: 5px; padding-bottom: 0px; margin: 0px; padding-top: 5px">
+          Umbraco v<asp:Literal ID="version" runat="server"></asp:Literal><br />
+          <br />
+          Copyright © 2001 - 
+          <asp:Literal ID="thisYear" runat="server"></asp:Literal>
+          Umbraco / Niels Hartvig<br />
+          Developed by the <a href="http://our.umbraco.org/wiki/about/core-team" target="_blank">Umbraco Core
+              Team</a><br />
+          <br />
+          
+          Umbraco is licensed under <a href="http://umbraco.org/license"
+            target="_blank">the open source license MIT</a><br />
+          <br />
+          Visit <a href="http://umbraco.org" target="_blank">umbraco.org</a>
+          for more information.<br />
+          <br />
+          Dedicated to Gry, August, Villum and Oliver!<br />
+        </p>
+      </div>
+</asp:Content>
+   
@@ -0,0 +1,67 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" 
+    AutoEventWireup="True" Inherits="umbraco.dialogs.create" %>
+
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
+<asp:Content ContentPlaceHolderID="head" runat="server">
+
+    <script language="javascript" type="text/javascript">
+        
+        var pageNameHolder = null;
+        var pageName = null;
+        
+        jQuery(document).ready(function() {
+            pageNameHolder = jQuery("#<%=PageNameHolder.ClientID%>");
+		    pageName = pageNameHolder.find("p");    
+        });
+        
+		function dialogHandler(id) {
+			document.getElementById("nodeId").value = id;
+			document.getElementById("ok").disabled = false;
+			// Get node name by xmlrequest
+			if (id > 0) {
+			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
+				}
+			else			
+				pageName.html("<p><strong><%=umbraco.ui.Text(App)%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
+				pageNameHolder.attr("class","success");
+		}
+		
+		function updateName(result) {			  
+		    pageName.html("<p><strong>" + result + "</strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
+			pageNameHolder.attr("class","success");
+		}
+		
+		function onNodeSelectionConfirmed() {
+		    document.location.href = 'create.aspx?nodeType=<%=Request.CleanForXss("nodeType")%>&app=<%=App%>&nodeId=' + document.getElementById('nodeId').value
+		}
+	
+    </script>
+
+</asp:Content>
+<asp:Content ContentPlaceHolderID="body" runat="server">
+    <input type="hidden" id="nodeId" name="nodeId" value="<%=Request.CleanForXss("nodeId")%>" />
+    <input type="hidden" id="path" name="path" value="" runat="server" />
+    <cc1:Pane ID="pane_chooseNode" runat="server" Style="overflow: auto; height: 250px;">
+        <umbraco:TreeControl runat="server" ID="JTree" App='<%#App %>'
+            IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
+            Height="230"></umbraco:TreeControl>
+    </cc1:Pane>
+    <asp:Panel runat="server" ID="panel_buttons">
+        <cc1:Feedback runat="server" ID="PageNameHolder" type="notice" Style="margin-top: 10px;"
+            Text='<%#umbraco.ui.Text("moveOrCopy","noNodeSelected")%>' />
+        <div style="padding-top: 10px;" class="guiDialogNormal">
+            <input type="button" id="ok" value="<%=umbraco.ui.Text("ok")%>" onclick="onNodeSelectionConfirmed();"
+                disabled="true" style="width: 100px" />
+            &nbsp; <em>
+                <%= umbraco.ui.Text("or") %></em>&nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
+                    <%=umbraco.ui.Text("cancel")%></a>
+        </div>
+    </asp:Panel>
+    <cc1:Pane ID="pane_chooseName" Visible="false" runat="server">
+        <cc1:PropertyPanel runat="server">
+            <asp:PlaceHolder ID="phCreate" runat="server"></asp:PlaceHolder>
+        </cc1:PropertyPanel>
+    </cc1:Pane>
+</asp:Content>
@@ -0,0 +1,25 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="cruds.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.cruds" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+<style>
+  .guiDialogTinyMark{font-size: 9px !Important;}
+</style>
+</asp:Content>
+<asp:Content ContentPlaceHolderID="body" runat="server">
+
+<div class="umb-dialog-body form-horizontal">
+    <cc1:Pane ID="pane_form" runat="server">
+        <cc1:Feedback ID="feedback1" runat="server" />
+
+        <cc1:PropertyPanel runat="server">
+            <asp:PlaceHolder ID="PlaceHolder1" runat="server"></asp:PlaceHolder>
+        </cc1:PropertyPanel>
+    </cc1:Pane>
+</div>
+
+<div runat="server" ID="panel_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>  
+       <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
+</div>
+ </asp:Content>
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+    <title>Umbraco - empty document</title>
+</head>
+<body>
+
+</body>
+</html>
@@ -0,0 +1,83 @@
+<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
+<%@ Import Namespace="System.Globalization" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+		<script type="text/javascript">
+		
+		    var recycleBinType = '<%=BinType.ToString()%>';
+		    var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)%>';
+		    
+		    function emptyRecycleBin() {
+    			jQuery('#formDiv').hide();
+    			jQuery('#buttons').hide(); 
+	    		jQuery('#animation').show(); 
+		    	jQuery('#anim').attr("src","<%=umbraco.GlobalSettings.ClientPath%>/images/progressBar.gif");
+		    	
+		    	// call the empty trashcan webservice
+		    	umbraco.presentation.webservices.trashcan.EmptyTrashcan(recycleBinType);
+
+         // wait one second to start the status update
+         setTimeout('updateStatus();', 1000);
+		    }
+		    
+		    function updateStatus() {
+		        umbraco.presentation.webservices.trashcan.GetTrashStatus(updateStatusLabel, failure);
+		    }
+		    
+		    function failure(retVal) {
+		        alert('error: ' + retVal);
+		    }
+		    
+		    function updateStatusLabel(retVal) {
+                jQuery('#statusLabel').html("<strong>" + retVal + " <%=umbraco.ui.Text("remaining")%></strong>");            
+
+                if (retVal != '' && retVal != '0') {
+                    setTimeout('updateStatus();', 500);
+                } else {
+                    jQuery('#div_form').hide();
+                    jQuery('#notification').show();
+                    jQuery('#notification').html("<p><%=umbraco.ui.Text("defaultdialogs", "recycleBinIsEmpty")%> </p> <p><a href='#' onclick='UmbClientMgr.closeModalWindow()'><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a></p>");
+                    UmbClientMgr.mainTree().reloadActionNode();
+                }
+                
+		    }
+		</script>
+</asp:Content>
+
+<asp:Content runat="server" ContentPlaceHolderID="body">
+    
+ 		
+  	<div class="success" id="notification" style="display: none;"></div>
+		
+		<div id="div_form">
+		<cc1:Pane id="pane_form" runat="server">
+		<cc1:PropertyPanel runat="server">
+		
+		
+		
+		<div id="animation" align="center" style="display: none;">
+		<p><%= umbraco.ui.Text("defaultdialogs", "recycleBinDeleting")%></p>
+		
+		<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
+		<br />
+		<span class="guiDialogTiny" id="statusLabel"><%=umbraco.ui.Text("deleting", UmbracoUser)%></span>
+		</div>
+	  	  	  
+	  <div id="formDiv">
+	    <p><%= umbraco.ui.Text("defaultdialogs", "recycleBinWarning")%></p>
+		   <input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture), UmbracoUser)%></label>
+		</div>
+	  </cc1:PropertyPanel>
+	  </cc1:Pane>
+	  
+		<br />
+		<div id="buttons">
+		<input type="button" ID="ok" value="<%=umbraco.ui.Text("actions", "emptyTrashcan", UmbracoUser) %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
+		<em><%= umbraco.ui.Text("or") %></em> 
+    <a href="#" onclick="UmbClientMgr.closeModalWindow();">
+      <%=umbraco.ui.Text("cancel")%>
+    </a>
+		</div>
+		</div>
+</asp:Content>
@@ -0,0 +1 @@
+<%@ Page language="c#" Codebehind="exportDocumenttype.aspx.cs" AutoEventWireup="false" Inherits="umbraco.presentation.dialogs.exportDocumenttype" %>
@@ -0,0 +1,14 @@
+<%@ Page Language="c#" CodeBehind="imageViewer.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.imageViewer" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+<head>
+  <title>imageViewer</title>
+</head>
+<body>
+  <form id="Form1" method="post" runat="server">
+  <asp:PlaceHolder ID="image" runat="server">
+  </asp:PlaceHolder>  
+  </form>
+</body>
+</html>
@@ -0,0 +1,49 @@
+<%@ Page MasterPageFile="../masterpages/umbracoDialog.Master" Language="c#" Codebehind="importDocumenttype.aspx.cs" AutoEventWireup="false"
+  Inherits="umbraco.presentation.umbraco.dialogs.importDocumentType" %>
+
+<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="body">
+    <input id="tempFile" type="hidden" name="tempFile" runat="server" />
+
+    <asp:Literal ID="FeedBackMessage" runat="server" />
+
+    <table class="propertyPane" id="Table1" cellspacing="0" cellpadding="4" width="360" border="0" runat="server">
+      <tr>
+        <td class="propertyContent" colspan="2">
+          <asp:Panel ID="Wizard" runat="server" Visible="True">
+            <p>
+            <span class="guiDialogNormal">
+              <%=umbraco.ui.Text("importDocumentTypeHelp")%>
+            </span>
+            </p>
+            
+            <p>
+            <input id="documentTypeFile" type="file" runat="server" />
+            </p>
+            
+            
+            <asp:Button ID="submit" runat="server"></asp:Button> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
+          </asp:Panel>
+          
+          
+          <asp:Panel ID="Confirm" runat="server" Visible="False">
+            <strong>
+              <%=umbraco.ui.Text("name")%>
+              :</strong>
+            <asp:Literal ID="dtName" runat="server"></asp:Literal>
+            <br />
+            <strong>
+              <%=umbraco.ui.Text("alias")%>
+              :</strong>
+            <asp:Literal ID="dtAlias" runat="server"></asp:Literal>
+            <br />
+            <br />
+            <asp:Button ID="import" runat="server"></asp:Button>
+          </asp:Panel>
+          <asp:Panel ID="done" runat="server" Visible="False">
+            <asp:Literal ID="dtNameConfirm" runat="server"></asp:Literal>
+            has been imported!
+          </asp:Panel>
+        </td>
+      </tr>
+    </table>
+    </asp:Content>
@@ -0,0 +1,103 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master" ValidateRequest="false" Codebehind="insertMacro.aspx.cs" AutoEventWireup="True"
+  Inherits="umbraco.dialogs.insertMacro" Trace="false" %>
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+<script type="text/javascript">
+  function saveTreepickerValue(appAlias, macroAlias) {
+    var treePicker = window.showModalDialog('treePicker.aspx?app=' + appAlias + '&treeType=' + appAlias, 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
+    document.forms[0][macroAlias].value = treePicker;
+    document.getElementById("label" + macroAlias).innerHTML = "</b><i>updated with id: " + treePicker + "</i><b><br/>";
+  }
+
+  var macroAliases = new Array();
+
+  function registerAlias(alias) {
+    macroAliases[macroAliases.length] = alias;
+  }
+
+  function updateMacro() {
+    var macroString = '';
+
+    for (i = 0; i < macroAliases.length; i++) {
+      var propertyName = macroAliases[i]
+      // Vi opdaterer macroStringen
+      if (document.forms[0][macroAliases[i]].type == 'checkbox') {
+        if (document.forms[0][macroAliases[i]].checked)
+          macroString += propertyName + "=\"1\" ";
+        else
+          macroString += propertyName + "=\"0\" ";
+
+      } else if (document.forms[0][macroAliases[i]].length) {
+        var tempValue = '';
+        for (var j = 0; j < document.forms[0][macroAliases[i]].length; j++) {
+          if (document.forms[0][macroAliases[i]][j].selected)
+            tempValue += document.forms[0][macroAliases[i]][j].value + ', ';
+        }
+        if (tempValue.length > 2)
+          tempValue = tempValue.substring(0, tempValue.length - 2)
+        macroString += propertyName + "=\"" + tempValue + "\" ";
+      } else {
+        macroString += propertyName + "=\"" + pseudoHtmlEncode(document.forms[0][macroAliases[i]].value) + "\" ";
+      }
+    }
+
+    if (macroString.length > 1)
+      macroString = macroString.substr(0, macroString.length - 1);
+
+    if (document.forms[0].macroMode.value == 'edit') {
+      var idAliasRef = "";
+      if (document.forms[0]["macroAlias"].value != '')
+        idAliasRef = " macroAlias=\"" + document.forms[0]["macroAlias"].value;
+      else
+        idAliasRef = " macroID=\"" + document.forms[0]["macroID"].value;
+
+      top.right.umbracoEditMacroDo("<?UMBRACO_MACRO" + idAliasRef + "\" " + macroString + ">");
+    } else {
+      top.right.umbracoInsertMacroDo("<?UMBRACO_MACRO macroAlias=\"" + document.forms[0]["macroAlias"].value + "\" " + macroString + ">");
+    }
+
+
+    UmbClientMgr.closeModalWindow();
+  }
+
+  function pseudoHtmlEncode(text) {
+    return text.replace(/\"/gi, "&amp;quot;").replace(/\</gi, "&amp;lt;").replace(/\>/gi, "&amp;gt;");
+  }
+  </script>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+ <input type="hidden" name="macroMode" value="<%=Request["mode"]%>" />
+    
+    <%if (Request["macroID"] != null || Request["macroAlias"] != null) {%>
+    
+    <input type="hidden" name="macroID" value="<%=Request.CleanForXss("macroID")%>" />
+    <input type="hidden" name="macroAlias" value="<%=Request.CleanForXss("macroAlias")%>" />
+    
+    <div class="macroProperties">
+      <cc1:Pane id="pane_edit" runat="server">
+        <asp:PlaceHolder ID="macroProperties" runat="server" />
+      </cc1:Pane>
+    </div>
+    <p>
+    <input type="button" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" onclick="updateMacro()" />
+    &nbsp; <em> or </em> &nbsp;
+     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
+    </p>
+    <%} else {%>
+    
+    <cc1:Pane id="pane_insert" runat="server">
+      <cc1:PropertyPanel runat="server">
+          <asp:ListBox Rows="1" ID="macroAlias" runat="server"></asp:ListBox>
+      </cc1:PropertyPanel>
+    </cc1:Pane>
+    <p>
+    <input type="submit" value="<%=umbraco.ui.Text("general", "ok", UmbracoUser)%>" />
+    &nbsp; <em> or </em> &nbsp;
+     <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
+    </p>
+    
+    <%}%>
+</asp:Content>
@@ -0,0 +1,32 @@
+<%@ 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" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+<script type="text/javascript">
+    function insertCode() {
+        var idDD = document.getElementById("<%= dd_detectedAlias.ClientID %>");
+      var id = idDD.options[idDD.selectedIndex].value;
+      top.right.insertContentElement(id);
+      UmbClientMgr.closeModalWindow();
+  }
+</script>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
+  
+  <cc1:Pane ID="pane_insert" runat="server">
+    <cc1:PropertyPanel runat="server">
+            <p>
+                <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%>
+            </p>
+    </cc1:PropertyPanel>
+    <cc1:PropertyPanel runat="server" id="pp_placeholder" text="Placeholder ID">
+             <asp:DropDownList ID="dd_detectedAlias" 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;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
+  </cc1:Pane>
+</asp:Content>
@@ -0,0 +1,36 @@
+<%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="insertMasterpagePlaceholder.aspx.cs" Inherits="umbraco.presentation.umbraco.dialogs.insertMasterpagePlaceholder" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+  <script type="text/javascript">
+
+  function insertCode() {
+    var idtb = document.getElementById("<%= tb_alias.ClientID %>");
+    var id = idtb.value;
+    
+    top.right.insertPlaceHolderElement(id);
+    UmbClientMgr.closeModalWindow();
+  }
+
+</script>
+
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
+  
+  <cc1:Pane ID="pane_insert" runat="server">
+    <cc1:PropertyPanel runat="server">
+            <p>
+                <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%>
+            </p>
+    </cc1:PropertyPanel>
+    <cc1:PropertyPanel runat="server" id="pp_placeholder" text="Placeholder ID">
+            <asp:TextBox ID="tb_alias" 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;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
+  </cc1:Pane>
+</asp:Content>
@@ -0,0 +1,290 @@
+<%@ Page language="c#" Codebehind="insertTable.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.insertTable" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<HTML>
+  <HEAD>
+		<title>Insert Table</title>
+		<meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
+		<meta name="CODE_LANGUAGE" Content="C#">
+		<meta name="vs_defaultClientScript" content="JavaScript">
+		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
+		<LINK href="../css/umbracoGui.css" type="text/css" rel="stylesheet">
+		<style>BODY { MARGIN: 2px }
+	</style>
+		<script language="javascript">
+
+function insertTable()
+{
+	theForm = document.tableForm
+	// Indsaml tabel info
+	var tableCol = theForm.tableCol[theForm.tableCol.selectedIndex].text;
+	var tableRow = theForm.tableRow[theForm.tableRow.selectedIndex].text;
+	
+	var tableJust = theForm.tableJust[theForm.tableJust.selectedIndex].text;
+	var tableWidth = theForm.tableWidth.value;
+	var tableHeight = theForm.tableHeight.value;
+	var tablePadding = theForm.tablePadding.value;
+	var tableSpacing = theForm.tableSpacing.value;
+
+	// hvis der ikke er sat padding eller spacing, skal de sættes til nul
+	if (tablePadding == '') tablePadding = '0';
+	if (tableSpacing == '') tableSpacing = '0';
+
+	var tableBorder = theForm.tableBorder[theForm.tableBorder.selectedIndex].text;
+	var tableClass = "";
+	if (theForm.tableClass.length > 0)
+		tableClass = theForm.tableClass[theForm.tableClass.selectedIndex].value;
+	
+	
+	// Hvis tabellen blot redigeres, skal vi ikke generere kode
+	if (theForm.editMode.value != '') {
+		var tableTag = new Array(	tableJust,
+									tableWidth,
+									tableHeight,
+									tablePadding,
+									tableSpacing,
+									tableBorder,
+									tableClass);
+	} else {
+	
+		// vi skal lave kode
+		var tableTag = '<TABLE';
+		
+		if (tableJust != '') tableTag += ' ALIGN="'+ tableJust + '"';
+		if (tableWidth != '') tableTag += ' WIDTH="'+ tableWidth + '"';
+		if (tableHeight != '') tableTag += ' HEIGHT="'+ tableHeight + '"';
+		if (tablePadding != '') tableTag += ' CELLPADDING="'+ tablePadding + '"';
+		if (tableSpacing != '') tableTag += ' CELLSPACING="'+ tableSpacing + '"';
+		if (tableBorder != '') tableTag += ' BORDER="'+ tableBorder + '"';
+		if (tableClass != '') tableTag += ' CLASS="'+ tableClass + '"';
+		
+		tableTag += '>\n';
+		
+		// kolonner og rækker
+		for (i=1; i<=tableRow;i++) {
+			tableTag += '\t<TR>\n';
+			for(j=1; j<=tableCol;j++) {
+				tableTag += '\t\t<TD></TD>\n';
+			}
+			tableTag += '\t</TR>\n';
+		}
+		tableTag += '</TABLE>\n';
+	}
+	window.returnValue = tableTag;
+    window.close();
+}
+		</script>
+</HEAD>
+	<body MS_POSITIONING="GridLayout">
+		<h3><%=umbraco.ui.Text("defaultdialogs", "inserttable", this.getUser())%></h3>
+		<br />
+	<span class="guiDialogMedium"><%=umbraco.ui.Text("general", "size", this.getUser())%></span>
+	<hr size=1 noshade>
+	<TABLE WIDTH="100%" CELLPADDING=4 CELLSPACING=0 class="propertyPane">
+	<form id="tableForm" runat="server">
+	<input type="hidden" name="editMode" >
+        <TR>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("defaultdialogs", "tableColumns", this.getUser())%>
+			</TD>
+			<td class="propertyContent">
+				<select name="tableCol" size="1" class="guiInputText" >
+					<option selected>1
+<option>2
+<option>3
+<option>4
+<option>5
+<option>6
+<option>7
+<option>8
+<option>9
+<option>10
+<option>11
+<option>12
+<option>13
+<option>14
+<option>15
+<option>16
+<option>17
+<option>18
+<option>19
+<option>20
+<option>21
+<option>22
+<option>23
+<option>24
+<option>25
+<option>26
+<option>27
+<option>28
+<option>29
+<option>30
+<option>31
+<option>32
+<option>33
+<option>34
+<option>35
+<option>36
+<option>37
+<option>38
+<option>39
+<option>40
+<option>41
+<option>42
+<option>43
+<option>44
+<option>45
+<option>46
+<option>47
+<option>48
+<option>49
+<option>50</option>
+
+				</select>
+			</td>
+		</TR>
+
+        <TR>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("defaultdialogs", "tableRows", this.getUser())%>
+			</TD>
+			<td class="propertyContent">
+				<select name="tableRow" size="1" class="guiInputText" >
+					<option selected>1
+<option>2
+<option>3
+<option>4
+<option>5
+<option>6
+<option>7
+<option>8
+<option>9
+<option>10
+<option>11
+<option>12
+<option>13
+<option>14
+<option>15
+<option>16
+<option>17
+<option>18
+<option>19
+<option>20
+<option>21
+<option>22
+<option>23
+<option>24
+<option>25
+<option>26
+<option>27
+<option>28
+<option>29
+<option>30
+<option>31
+<option>32
+<option>33
+<option>34
+<option>35
+<option>36
+<option>37
+<option>38
+<option>39
+<option>40
+<option>41
+<option>42
+<option>43
+<option>44
+<option>45
+<option>46
+<option>47
+<option>48
+<option>49
+<option>50</option>
+
+				</select>
+			</td>
+		</TR>
+	</TABLE>
+	<br />
+	<span class="guiDialogMedium"><%=umbraco.ui.Text("general", "layout", this.getUser())%></span>
+	<hr size=1 noshade>
+	<TABLE WIDTH="100%" CELLPADDING=4 CELLSPACING=0 class="propertyPane">
+        <TR>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("general", "justify", this.getUser())%>
+			</TD>
+    <TD class="propertyContent align=" right?>
+			<select class="guiInputText" 
+      size=1 name=tableJust>
+					<option selected>
+<option>Left
+<option>Right
+<option>Center</option>
+			</select> </TD>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("general", "width", this.getUser())%>
+			</TD>
+			<td class="propertyContent">
+				<input type="text" name="tableWidth" value="100%" class="guiInputText" size="4" maxlength="4">
+			</td>
+		</TR>
+
+        <TR>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("general", "innerMargin", this.getUser())%>
+			</TD>
+    <TD class="propertyContent align=" right?>
+			<input class="guiInputText" 
+      maxlength="4" type=text size=4 name=tablePadding> </TD>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("general", "height", this.getUser())%>
+			</TD>
+			<td class="propertyContent">
+				<input type="text" name="tableHeight" class="guiInputText" size="4" maxlength="4">
+			</td>
+		</TR>
+
+        <TR>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("general", "cellMargin", this.getUser())%>
+			</TD>
+    <TD class="propertyContent align=" right?>
+			<input class="guiInputText" 
+      maxlength="4" type=text size=4 name=tableSpacing> </TD>
+            <TD class="propertyHeader" width="200">
+            	&nbsp;
+			</TD>
+			<td class="propertyContent">
+				&nbsp;
+			</td>
+		</TR>
+	</TABLE>
+<br />
+	<span class="guiDialogMedium"><%=umbraco.ui.Text("general", "design", this.getUser())%></span>
+	<hr size=1 noshade>
+	<TABLE WIDTH="100%" CELLPADDING=4 CELLSPACING=0 class="propertyPane">
+        <TR>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("general", "border", this.getUser())%>
+			</TD>
+			<td class="propertyContent">
+				<select name="tableBorder" size="1" class="guiInputText">
+					<option selected>0
+<option>1
+<option>2
+<option>3</option>
+
+				</select>
+			</td>
+            <TD class="propertyHeader" width="200">
+            	<%=umbraco.ui.Text("buttons", "styleChoose", this.getUser())%>
+			</TD>
+			<td class="propertyContent">
+				<asp:DropDownList Runat="server" ID="tableClass"></asp:DropDownList>
+			</td>
+		</TR></FORM>
+	</TABLE>
+	&nbsp;
+	<input type="button" class="guiInputButton" onClick="if (confirm('<%=umbraco.ui.Text("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=umbraco.ui.Text("cancel")%>"> &nbsp; 
+	<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=umbraco.ui.Text("insert")%>">
+	</body>
+</HTML>
@@ -0,0 +1,97 @@
+<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true"
+    CodeBehind="mediaPicker.aspx.cs" Inherits="umbraco.presentation.umbraco.dialogs.mediaPicker" %>
+
+<%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="umb2" TagName="Tree" Src="../controls/Tree/TreeControl.ascx" %>
+<%@ Register TagPrefix="umb3" TagName="Image" Src="../controls/Images/ImageViewer.ascx" %>
+<%@ Register TagName="MediaUpload" TagPrefix="umb4" Src="../controls/Images/UploadMediaImage.ascx" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+
+    <script type="text/javascript">
+
+        //need to wire up the submit button click
+        jQuery(document).ready(function() {
+            jQuery("#submitbutton").click(function() {
+                updatePicker();
+                return false;
+            });
+        });
+
+        //called when the user interacts with a node
+        function dialogHandler(id) {
+            if (id != -1) {
+                //update the hidden field with the selected id
+                jQuery("#selectedMediaId").val(id);
+                jQuery("#submitbutton").removeAttr("disabled").css("color", "#000");
+            }
+            else {
+                jQuery("#submitbutton").attr("disabled", "disabled").css("color", "gray");
+            }
+
+            jQuery("#<%=ImageViewer.ClientID%>").UmbracoImageViewerAPI().updateImage(id, function(p) {
+                //when the image is loaded, this callback method fires
+                if (p.hasImage) {
+                    jQuery("#submitbutton").removeAttr("disabled").css("color", "#000");                    
+                }
+                else {
+                    jQuery("#submitbutton").attr("disabled", "disabled").css("color", "gray");
+                }
+            });
+        }
+
+        function uploadHandler(e) {
+            dialogHandler(e.id);
+            //get the tree object for the chooser and refresh
+            var tree = jQuery("#<%=DialogTree.ClientID%>").UmbracoTreeAPI();
+            tree.refreshTree();
+        }
+
+        function updatePicker() {
+            var id = jQuery("#selectedMediaId").val();
+            if (id != "") {
+                UmbClientMgr.closeModalWindow(id);
+            }
+        }
+
+        function cancel() {
+            //update the hidden field with the selected id = none
+            jQuery("#selectedMediaId").val("");
+            UmbClientMgr.closeModalWindow();
+        }
+
+    </script>
+
+    <style type="text/css">        
+        .imageViewer .bgImage {float:right; }
+    </style>
+
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
+
+    <%--when a node is selected, the id will be stored in this field--%>
+    <input type="hidden" id="selectedMediaId" />
+    <ui:Pane ID="pane_src" runat="server">
+        <umb3:Image runat="server" ID="ImageViewer" ViewerStyle="ThumbnailPreview" />
+    </ui:Pane>
+    <br />
+    <ui:TabView AutoResize="false" Width="455px" Height="305px" runat="server" ID="tv_options" />
+    <ui:Pane ID="pane_select" runat="server">
+        <umb2:Tree runat="server" ID="DialogTree" App="media" TreeType="media" IsDialog="true"
+            ShowContextMenu="false" DialogMode="id" FunctionToCall="dialogHandler"
+            Height="250"/>
+    </ui:Pane>
+    <asp:Panel ID="pane_upload" runat="server">
+        <umb4:MediaUpload runat="server" ID="MediaUploader" OnClientUpload="uploadHandler" />
+    </asp:Panel>
+    <br />
+    <p>
+        <input type="submit" value="<%# umbraco.ui.Text("treepicker")%>" style="width: 60px;
+            color: gray" disabled="disabled" id="submitbutton" />
+        <em id="orcopy">
+            <%# umbraco.ui.Text("or") %></em> <a href="javascript:cancel();" style="color: blue"
+                id="cancelbutton">
+                <%#umbraco.ui.Text("cancel") %></a>
+    </p>
+</asp:Content>
@@ -0,0 +1,92 @@
+<%@ Page Language="c#" CodeBehind="moveOrCopy.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.MoveOrCopy" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+
+	<script type="text/javascript">
+
+			function dialogHandler(id) {
+				document.getElementById("copyTo").value = id;
+				document.getElementById("<%= ok.ClientID %>").disabled = false;
+				
+				// Get node name by xmlrequest
+				if (id > 0)
+						umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
+				else{
+					//document.getElementById("pageNameContent").innerHTML = "'<strong><%=umbraco.ui.Text(Request.CleanForXss("app"))%></strong>' <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>";
+			    
+					jQuery("#pageNameContent").html("<strong><%=umbraco.ui.Text(Request.CleanForXss("app"))%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>");
+					jQuery("#pageNameHolder").attr("class","success");
+			  }
+			}
+			
+            var actionIsValid = true;
+
+			function updateName(result) {
+                if(actionIsValid)
+                {
+				    jQuery("#pageNameContent").html("'<strong>" + result + "</strong>' <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %>");
+				    jQuery("#pageNameHolder").attr("class","success");
+                }
+			}
+
+           
+            function notValid()
+            {
+                jQuery("#pageNameHolder").attr("class", "error");
+                jQuery("#pageNameContent").html("<%= umbraco.ui.Text("moveOrCopy","notValid") %>");
+                actionIsValid = false;
+            }
+	
+	</script>
+
+	
+
+	<style type="text/css">
+		.propertyItemheader
+		{
+			width: 180px !important;
+		}
+	</style>
+</asp:Content>
+<asp:Content ContentPlaceHolderID="body" runat="server">
+	<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot"/>
+	
+	<input type="hidden" id="copyTo" name="copyTo" />
+	<cc1:Feedback ID="feedback" runat="server" />
+	<cc1:Pane ID="pane_form" runat="server" Visible="false">
+		<cc1:PropertyPanel runat="server" Style="overflow: auto; height: 220px;position: relative;">
+			<umbraco:TreeControl runat="server" ID="JTree" App='<%#Request.CleanForXss("app") %>'
+                IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
+                Height="200"></umbraco:TreeControl>
+		</cc1:PropertyPanel>
+		<cc1:PropertyPanel runat="server" ID="pp_relate" Text="relateToOriginal">
+			<asp:CheckBox runat="server" ID="RelateDocuments" Checked="false" />
+		</cc1:PropertyPanel>
+	</cc1:Pane>
+	<asp:PlaceHolder ID="pane_form_notice" runat="server" Visible="false">
+		<div class="notice" id="pageNameHolder" style="margin-top: 10px;">
+			<p id="pageNameContent">
+				<%= umbraco.ui.Text("moveOrCopy","noNodeSelected") %></p>
+		</div>
+	</asp:PlaceHolder>
+	<cc1:Pane ID="pane_settings" runat="server" Visible="false">
+		<cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Master Document Type">
+			<asp:ListBox ID="masterType" runat="server" CssClass="bigInput" Rows="1" SelectionMode="Single"></asp:ListBox>
+		</cc1:PropertyPanel>
+		<cc1:PropertyPanel runat="server" Text="Name">
+			<asp:TextBox ID="rename" runat="server" Style="width: 350px;" CssClass="bigInput"></asp:TextBox><asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
+		</cc1:PropertyPanel>
+	</cc1:Pane>
+	<asp:Panel ID="panel_buttons" runat="server">
+		<p>
+			<asp:Button ID="ok" runat="server" CssClass="guiInputButton" OnClick="HandleMoveOrCopy" UseSubmitBehavior="false" OnClientClick="this.disabled = 'disabled';"></asp:Button>
+			&nbsp; <em>
+				<%=umbraco.ui.Text("general", "or", UmbracoUser)%></em> &nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
+					<%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a>
+		</p>
+	</asp:Panel>
+</asp:Content>
@@ -0,0 +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" %>
+
+<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()"><%=umbraco.ui.Text("general", "cancel")%></a>  
+       <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
+</div>
+</asp:Content>
@@ -0,0 +1,200 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.presentation.umbraco.dialogs.protectPage" %>
+
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+    <script type="text/javascript">
+        function updateLoginId() {
+            var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl(true,"content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
+	    if (treePicker != undefined) {
+	        document.getElementById("loginId").value = treePicker;
+	        if (treePicker > 0) {
+	            umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateLoginTitle);
+					} else
+					    document.getElementById("loginTitle").innerHTML =  "<strong><%=umbraco.ui.Text("content", base.getUser())%></strong>";
+                }
+            }
+
+            function updateLoginTitle(result) {
+                document.getElementById("loginTitle").innerHTML = "<strong>" + result + "</strong> &nbsp;";
+            }
+
+            function updateErrorId() {
+                var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl(true,"content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
+			    if (treePicker != undefined) {
+			        document.getElementById("errorId").value = treePicker;
+			        if (treePicker > 0) {
+			            umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateErrorTitle);
+					} else
+					    document.getElementById("errorTitle").innerHTML =  "<strong><%=umbraco.ui.Text("content", base.getUser())%></strong>";
+                }
+            }
+            function updateErrorTitle(result) {
+                document.getElementById("errorTitle").innerHTML = "<strong>" + result + "</strong> &nbsp;";
+            }
+
+
+            function toggleSimple() {
+                if (document.getElementById("advanced").style.display != "none") {
+                    document.getElementById("advanced").style.display = "none";
+                    document.getElementById("simple").style.display = "none";
+                    document.getElementById("simpleForm").style.display = "block";
+                    document.getElementById("buttonSimple").style.display = "block";
+                    togglePages();
+                } else {
+                    document.getElementById("advanced").style.display = "block";
+                    document.getElementById("advanced").style.display = "block";
+                    document.getElementById("simpleForm").style.display = "none";
+                    document.getElementById("buttonSimple").style.display = "none";
+                    document.getElementById("pagesForm").style.display = "none";
+                }
+            }
+
+            function togglePages() {
+                document.getElementById("pagesForm").style.display = "block";
+            }
+
+            function toggleAdvanced() {
+                if (document.getElementById("simple").style.display != "none") {
+                    document.getElementById("advanced").style.display = "none";
+                    document.getElementById("simple").style.display = "none";
+                    document.getElementById("advancedForm").style.display = "block";
+                    document.getElementById("buttonAdvanced").style.display = "block";
+                    togglePages();
+                } else {
+                    document.getElementById("simple").style.display = "block";
+                    document.getElementById("advanced").style.display = "block";
+                    document.getElementById("advancedForm").style.display = "none";
+                    document.getElementById("pagesForm").style.display = "none";
+                    document.getElementById("buttonAdvanced").style.display = "none";
+                }
+            }
+    </script>
+
+</asp:Content>
+
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+    <style> .umb-dialog { overflow: auto; } .umb-dialog-footer { position: relative; }</style>
+
+    <input id="tempFile" type="hidden" name="tempFile" runat="server" />
+
+    <cc1:Feedback ID="feedback" runat="server" />
+
+    <asp:Panel ID="p_mode" runat="server" CssClass="pa-umb-overlay">
+
+        <div class="umg-dialog-body">
+
+            <cc1:Pane ID="pane_chooseMode" runat="server" Text="Choose how to restict access to this page">
+
+            <div class="pa-select-type">
+                <asp:RadioButton GroupName="mode" ID="rb_simple" runat="server" Checked="true" />
+
+                <label for="body_rb_simple">
+                    <h4 class="pa-access-header"><%= umbraco.ui.Text("publicAccess", "paSimple", base.getUser())%></h4>
+                    <p class="pa-access-description"><%= umbraco.ui.Text("publicAccess", "paSimpleHelp", base.getUser())%></p>
+                </label>
+            </div>
+
+
+            <div class="pa-select-type">
+                <asp:RadioButton GroupName="mode" ID="rb_advanced" runat="server"/>
+
+                <label for="body_rb_advanced">
+                    <h4 class="pa-access-header"><%= umbraco.ui.Text("publicAccess", "paAdvanced", base.getUser())%></h4>
+                    <p class="pa-access-description"><%= umbraco.ui.Text("publicAccess", "paAdvancedHelp", base.getUser())%></p>
+
+                    <asp:Panel runat="server" Visible="false" ID="p_noGroupsFound" CssClass="error">
+                        <p>
+                            <%= umbraco.ui.Text("publicAccess", "paAdvancedNoGroups", UmbracoUser)%>
+                        </p>
+                    </asp:Panel>
+                </label>
+            </div>
+
+            </cc1:Pane>
+        </div>
+
+        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+            <asp:Button ID="bt_selectMode" runat="server" Text="select" CssClass="btn btn-primary" OnClick="selectMode" />
+        </div>
+    </asp:Panel>
+
+
+    <cc1:Pane ID="pane_simple" runat="server" Visible="false" Text="Set the login and password for this page" CssClass="pa-umb-overlay">
+
+        <div class="pa-form">
+            <cc1:PropertyPanel Text="Login" ID="pp_login" runat="server">
+                <asp:TextBox ID="simpleLogin" runat="server" Width="250px"></asp:TextBox>
+                <asp:Label runat="server" ID="SimpleLoginLabel" Visible="False"></asp:Label>
+            </cc1:PropertyPanel>
+        </div>
+
+        <div class="pa-form">
+            <cc1:PropertyPanel Text="Password" ID="pp_pass" runat="server">
+                <asp:TextBox ID="simplePassword" runat="server" Width="250px"></asp:TextBox>
+            </cc1:PropertyPanel>
+        </div>
+
+        <asp:CustomValidator CssClass="pa-validation-message error" runat="server" ID="SimpleLoginNameValidator" Display="Dynamic" EnableViewState="False">
+           <p class="alert">Member name already exists, click <asp:LinkButton runat="server" OnClick="ChangeOnClick" CssClass="btn btn-mini btn-warning">Change</asp:LinkButton> to use a different name or Update to continue</p>
+        </asp:CustomValidator>
+    </cc1:Pane>
+
+    <cc1:Pane ID="pane_advanced" runat="server" Visible="false" Text="Role based protection">
+        <cc1:PropertyPanel ID="PropertyPanel3" runat="server">
+            <p><%= umbraco.ui.Text("publicAccess", "paSelectRoles", UmbracoUser)%></p>
+        </cc1:PropertyPanel>
+        <cc1:PropertyPanel ID="PropertyPanel2" runat="server">
+            <asp:PlaceHolder ID="groupsSelector" runat="server"></asp:PlaceHolder>
+        </cc1:PropertyPanel>
+    </cc1:Pane>
+
+    <asp:Panel ID="p_buttons" runat="server" Visible="false" CssClass="pa-umb-overlay">
+        <cc1:Pane runat="server" ID="pane_pages" Text="Select the pages that contain login form and error messages">
+
+            <cc1:PropertyPanel runat="server" ID="pp_loginPage" CssClass="pa-select-pages">
+                <small class="umb-detail">
+                    <%=umbraco.ui.Text("paLoginPageHelp")%>
+                </small>
+                <div class="pa-choose-page">
+                    <asp:PlaceHolder ID="ph_loginpage" runat="server" />
+                </div>
+
+                <asp:CustomValidator ErrorMessage="Please pick a login page" runat="server" ID="cv_loginPage" ForeColor="Red" />
+            </cc1:PropertyPanel>
+
+
+            <cc1:PropertyPanel runat="server" ID="pp_errorPage" CssClass="pa-select-pages">
+                <small class="umb-detail">
+                    <%=umbraco.ui.Text("paErrorPageHelp")%>
+                </small>
+                <div class="pa-choose-page">
+                    <asp:PlaceHolder ID="ph_errorpage" runat="server" />
+                </div>
+                <asp:CustomValidator ErrorMessage="Please pick an error page" runat="server" ID="cv_errorPage"  ForeColor="Red" />
+            </cc1:PropertyPanel>
+
+        </cc1:Pane>
+
+
+        <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+            <asp:Button ID="bt_protect" CssClass="btn btn-primary" runat="server" OnCommand="protect_Click"></asp:Button>
+            <asp:Button ID="bt_buttonRemoveProtection" CssClass="btn btn-danger" runat="server" Visible="False" OnClick="buttonRemoveProtection_Click" />
+        </div>
+
+    </asp:Panel>
+
+    <input id="errorId" type="hidden" runat="server" /><input id="loginId" type="hidden" runat="server" />
+</asp:Content>
+
+
+<asp:Content ContentPlaceHolderID="footer" runat="server">
+    <asp:PlaceHolder ID="js" runat="server"></asp:PlaceHolder>
+
+    <script type="text/javascript">
+        <asp:Literal Runat="server" ID="jsShowWindow"></asp:Literal>
+    </script>
+</asp:Content>
@@ -0,0 +1,97 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="Publish.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.Publish" %>
+
+<%@ Import Namespace="Umbraco.Core" %>
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+
+    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot" />
+    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="Dialogs/PublishDialog.js" PathNameAlias="UmbracoClient" />
+    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="Dialogs/PublishDialog.css" PathNameAlias="UmbracoClient" />
+
+    <script type="text/javascript">
+        //NOTE: These variables are required for the legacy UmbracoCheckKeys.js
+        var functionsFrame = this;
+        var tabFrame = this;
+        var isDialog = true;
+        var submitOnEnter = true;
+
+        (function ($) {
+            $(document).ready(function () {
+                Umbraco.Dialogs.PublishDialog.getInstance().init({
+                    restServiceLocation: "<%= Url.GetBulkPublishServicePath() %>",
+                    documentId: <%= DocumentId %>,
+                    documentPath: '<%= DocumentPath %>'
+                });
+            });
+        })(jQuery);
+    </script>
+
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
+
+    <div id="container" >
+
+        <div class="propertyDiv" data-bind="visible: processStatus() == 'init'">
+            <p>
+                <%= umbraco.ui.Text("publish", "publishHelp", PageName, UmbracoUser) %>
+            </p>
+
+            <div>
+                <input type="checkbox" id="publishAllCheckBox" data-bind="checked: publishAll" />
+                <label for="publishAllCheckBox">
+                    <%=umbraco.ui.Text("publish", "publishAll", PageName, UmbracoUser) %>
+                </label>
+            </div>
+
+            <div id="includeUnpublished">
+                <input type="checkbox" id="includeUnpublishedCheckBox" data-bind="checked: includeUnpublished, attr: { disabled: !publishAll() }" />
+                <label for="includeUnpublishedCheckBox" data-bind="css: { disabled: !publishAll() }">
+                    <%=umbraco.ui.Text("publish", "includeUnpublished") %>
+                </label>
+            </div>
+            
+            
+
+        </div>
+
+         <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar"  data-bind="visible: processStatus() == 'init'">
+            <a href="#" class="btn btn-link" data-bind="click: closeDialog">
+                <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%>
+            </a>
+             <button id="ok" class="btn btn-primary" data-bind="click: startPublish">
+                <%=umbraco.ui.Text("content", "publish", UmbracoUser)%>
+            </button>
+        </div>
+
+        <div id="animDiv" class="propertyDiv" data-bind="visible: processStatus() == 'publishing'">
+            <div>
+                <p>
+                    <%=umbraco.ui.Text("publish", "inProgress", UmbracoUser)%>
+                </p>
+                <cc1:ProgressBar runat="server" ID="ProgBar1" />
+                <br />
+            </div>
+        </div>
+
+
+        <div id="feedbackMsg" data-bind="visible: processStatus() == 'complete'">
+            <div data-bind="css: { success: isSuccessful(), error: !isSuccessful() }">
+                <span data-bind="text: resultMessage, visible: resultMessages().length == 0"></span>
+                <ul data-bind="foreach: resultMessages, visible: resultMessages().length > 1">
+                    <li data-bind="text: message"></li>
+                </ul>
+            </div>
+             <p>
+                 <a href='#' class="btn" data-bind="click: closeDialog"><%=umbraco.ui.Text("closeThisWindow") %></a>
+             </p>
+        </div> 
+       
+
+    </div>
+
+</asp:Content>
@@ -0,0 +1,41 @@
+<%@ 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" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+   <script type="text/javascript">
+     function showProgress(button, elementId) {
+       var img = document.getElementById(elementId);
+
+       img.style.visibility = "visible";
+       button.style.display = "none";
+     }
+		</script>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+<asp:Panel ID="p_republish" runat="server">
+    <div class="propertyDiv">      
+          <p><%= umbraco.ui.Text("defaultdialogs", "siterepublishHelp")%> </p>
+    </div>
+      
+    <div id="buttons" class="btn-toolbar umb-btn-toolbar">
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow();"><%=umbraco.ui.Text("cancel")%></a>
+        <asp:Button ID="bt_go" cssclass="btn btn-primary" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
+    </div>     
+      
+    <div id="progress" style="visibility: hidden;">
+      <div class="umb-loader-wrapper">
+		    <cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
+      </div>
+    </div>
+      
+    </asp:Panel>
+    
+    <asp:Panel ID="p_done" Visible="false" runat="server">
+     <div class="success">
+      <p><%= umbraco.ui.Text("defaultdialogs", "siterepublished")%></p>
+      
+     </div>
+      <input type="button" class="btn btn-primary" onclick="UmbClientMgr.closeModalWindow();" value="Ok" />
+    </asp:Panel>
+</asp:Content>
@@ -0,0 +1,98 @@
+<%@ 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" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+    <script type="text/javascript">
+        function doSubmit() { document.Form1["ok"].click() }
+
+        var functionsFrame = this;
+        var tabFrame = this;
+        var isDialog = true;
+        var submitOnEnter = true;
+    </script>
+
+    <style type="text/css">
+        .propertyItemheader {
+            width: 140px !Important;
+        }
+
+        .diff {
+            margin-top: 10px;
+            height: 100%;
+            overflow: auto;
+            border-top: 1px solid #efefef;
+            padding: 5px;
+        }
+
+            .diff table td {
+                border-bottom: 1px solid #ccc;
+                padding: 3px;
+            }
+
+            .diff del {
+                background: rgb(255, 230, 230) none repeat scroll 0%;
+                -moz-background-clip: -moz-initial;
+                -moz-background-origin: -moz-initial;
+                -moz-background-inline-policy: -moz-initial;
+            }
+
+            .diff ins {
+                background: rgb(230, 255, 230) none repeat scroll 0%;
+                -moz-background-clip: -moz-initial;
+                -moz-background-origin: -moz-initial;
+                -moz-background-inline-policy: -moz-initial;
+            }
+
+            .diff .diffnotice {
+                text-align: center;
+                margin-bottom: 10px;
+            }
+    </style>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+    <div class="umb-dialog-body">
+        <umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot" />
+
+        <cc1:Feedback ID="feedBackMsg" runat="server" />
+
+        <cc1:Pane ID="pp_selectVersion" runat="server" Text="Select a version to compare with the current version">
+            <cc1:PropertyPanel id="pp_currentVersion" Text="Current version" runat="server">
+                <asp:Literal ID="currentVersionTitle" runat="server" />
+                <small>(<asp:Literal ID="currentVersionMeta" runat="server" />)</small></cc1:PropertyPanel>
+            <cc1:PropertyPanel ID="pp_rollBackTo" Text="Rollback to" runat="server">
+                <asp:DropDownList OnSelectedIndexChanged="version_load" ID="allVersions" runat="server" Width="400px" AutoPostBack="True" CssClass="guiInputTextTiny" />
+            </cc1:PropertyPanel>
+
+            <cc1:PropertyPanel id="pp_view" Text="View" runat="server">
+                <small>
+                    <asp:RadioButtonList ID="rbl_mode" runat="server" OnSelectedIndexChanged="version_load" RepeatDirection="Horizontal">
+                        <asp:ListItem Selected="True" Value="diff">Diff</asp:ListItem>
+                        <asp:ListItem Value="html">Html</asp:ListItem>
+                    </asp:RadioButtonList>
+                </small>
+            </cc1:PropertyPanel>
+        </cc1:Pane>
+
+        <asp:Panel ID="diffPanel" Visible="false" runat="server" Height="300px">
+            <div class="diff">
+                <div class="diffnotice">
+                    <p>
+                        <asp:Literal ID="lt_notice" runat="server" />
+                    </p>
+                </div>
+
+                <table border="0" style="width: 95%;">
+                    <asp:Literal ID="propertiesCompare" runat="server"></asp:Literal>
+                </table>
+            </div>
+        </asp:Panel>
+    </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()"><%=umbraco.ui.Text("general", "cancel")%></a>
+        <asp:Button ID="Button1" runat="server" visible="false" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
+    </div>  
+</asp:Content>
@@ -0,0 +1,48 @@
+<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true"
+    CodeBehind="search.aspx.cs" Inherits="umbraco.presentation.dialogs.search" %>
+
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<asp:Content ID="header1" ContentPlaceHolderID="head" runat="server">
+<script type="text/javascript">
+    function openItem(id) {
+
+        var url = "";
+
+        switch (UmbClientMgr.mainWindow().UmbClientMgr.appActions().getCurrApp().toLowerCase()) {
+            case "media":
+                url = "editMedia.aspx";
+                break;
+            case "content":
+                url = "editContent.aspx";
+                break;
+            case "member":
+                url = "members/editMember.aspx";
+                break;
+            default:
+                url = "editContent.aspx";
+        }
+        url = url + "?id=" + id;
+
+
+        UmbClientMgr.contentFrame(url);
+        UmbClientMgr.closeModalWindow();
+    }
+</script>
+</asp:Content>
+<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">
+    <cc1:Pane ID="Wizard" runat="server">
+        <h3>Search</h3>
+        <p>
+        <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">
+        <p class="error">No results match</p></asp:Panel>
+        <asp:Xml ID="searchResult" runat="server" TransformSource="../xslt/searchResult.xslt"></asp:Xml>
+    </cc1:Pane>
+</asp:Content>
+<asp:Content ID="footer1" ContentPlaceHolderID="footer" runat="server">
+<script type="text/javascript">
+    jQuery(".bigInput").focus();
+</script>
+</asp:Content>
@@ -0,0 +1,37 @@
+<%@ 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" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+<style type="text/css">
+  .propertyItemheader{width: 160px !Important;}
+</style>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+
+<cc1:Feedback ID="feedback" runat="server" />
+
+<cc1:Pane ID="pane_form" runat="server">
+  <cc1:PropertyPanel ID="pp_translator" runat="server">
+    <asp:DropDownList ID="translator" runat="server"></asp:DropDownList>
+  </cc1:PropertyPanel>
+  <cc1:PropertyPanel ID="pp_language" runat="server">
+    <asp:DropDownList ID="language" runat="server"></asp:DropDownList>
+    <asp:Literal ID="defaultLanguage" Visible="false" runat="server"></asp:Literal>
+  </cc1:PropertyPanel>
+  <cc1:PropertyPanel ID="pp_includeSubs" runat="server">
+    <asp:CheckBox ID="includeSubpages" runat="server" />
+  </cc1:PropertyPanel>
+  <cc1:PropertyPanel ID="pp_comment" runat="server">
+    <asp:TextBox TextMode="multiLine" runat="Server" Rows="4" ID="comment"></asp:TextBox>
+  </cc1:PropertyPanel>
+</cc1:Pane>
+
+<asp:Panel ID="pl_buttons" runat="server">
+<p>
+<asp:Button ID="doTranslation" runat="Server" OnClick="doTranslation_Click" />
+&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+</p>
+</asp:Panel>
+</asp:Content>
+      
@@ -0,0 +1,86 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="sort.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.Sort" %>
+
+<%@ Import Namespace="System.Globalization" %>
+<%@ Import Namespace="Umbraco.Core.IO" %>
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="Dialogs/SortDialog.css" PathNameAlias="UmbracoClient"></umb:CssInclude>
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+
+    <umb:JsInclude ID="JsInclude3" runat="server" FilePath="Dialogs/SortDialog.js" PathNameAlias="UmbracoClient" />
+    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="tablesorting/jquery.tablesorter.min.js" PathNameAlias="UmbracoClient" />
+    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="tablesorting/tableDragAndDrop.js" PathNameAlias="UmbracoClient" />
+
+    <div class="umb-dialog-body">
+        <cc1:Pane runat="server">
+
+          <div id="loading" style="display: none; margin-bottom: 35px;">
+                <div class="notice">
+                    <p><%= umbraco.ui.Text("sort", "sortPleaseWait") %></p>
+                </div>
+                
+                <div class="umb-loader-wrapper">
+                    <cc1:ProgressBar ID="prog1" runat="server" Title="sorting.." />
+                </div>
+            </div>
+
+            <div id="sortingDone" style="display: none;" class="success">
+                <p>
+                    <asp:Literal runat="server" ID="sortDone"></asp:Literal>
+                </p>
+                <p>
+                    <a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a>
+                </p>
+            </div>
+
+            <div id="sortArea">
+                <p class="help">
+                    <%= umbraco.ui.Text("sort", "sortHelp") %>
+                </p>
+
+                <div id="sortableFrame">
+                    <table id="sortableNodes">
+                        <thead>
+                            <tr>
+                                <th style="width: 100%"><%= umbraco.ui.Text("general", "name") %></th>
+                                <th class="nowrap" style="display: <%= HideDateColumn ? "none" : "table-cell" %>;"><%= umbraco.ui.Text("sort", "sortCreationDate") %></th>
+                                <th class="nowrap"><%= umbraco.ui.Text("sort", "sortOrder") %></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <asp:Literal ID="lt_nodes" runat="server" />
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </cc1:Pane>
+
+    </div>
+    <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+        <a id="closeWindowButton" href="#" class="btn btn-link"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
+        <input id="submitButton" type="button" class="btn btn-primary" value="<%=umbraco.ui.Text("save") %>" />
+    </div>
+
+    <script type="text/javascript">
+
+        jQuery(document).ready(function () {
+
+            var sortDialog = new Umbraco.Dialogs.SortDialog({
+                submitButton: jQuery("#submitButton"),
+                closeWindowButton: jQuery("#closeWindowButton"),
+                dateTimeFormat: "<%=CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern%> <%=CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern%>",
+                currentId: "<%=Request.CleanForXss("ID")%>",
+                serviceUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/WebServices/NodeSorter.asmx/UpdateSortOrder?app=<%=Request.CleanForXss("app")%>"
+            });
+
+            sortDialog.init();
+        });
+
+    </script>
+
+</asp:Content>
@@ -0,0 +1,23 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="treePicker.aspx.cs"
+    AutoEventWireup="True" Inherits="umbraco.dialogs.treePicker" %>
+
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb2" TagName="Tree" Src="../controls/Tree/TreeControl.ascx" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+    
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
+
+    <script type="text/javascript" language="javascript">
+    
+			function dialogHandler(id) {
+			    UmbClientMgr.closeModalWindow(id);
+			}			
+			
+    </script>
+
+    <umb2:Tree runat="server" ID="DialogTree" App='<%#TreeParams.App %>' TreeType='<%#TreeParams.TreeType %>'
+        IsDialog="true" ShowContextMenu="false" DialogMode="id" FunctionToCall="dialogHandler" NodeKey='<%#TreeParams.NodeKey %>' />
+        
+</asp:Content>
@@ -0,0 +1,141 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="umbracoField.aspx.cs"
+    AutoEventWireup="True" Inherits="umbraco.dialogs.umbracoField" %>
+
+<%@ Import Namespace="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+    <script type="text/javascript">
+        (function($) {
+            $(document).ready(function() {
+                var umbracoField = new Umbraco.Dialogs.UmbracoField({
+                    cancelButton: $("#cancelButton"),
+                    submitButton: $("#submitButton"),
+                    form: document.forms[0],
+                    tagName: document.forms[0].<%= tagName.ClientID %>.value,
+                    objectId: '<%=Request.CleanForXss("objectId")%>'
+                });
+                umbracoField.init();
+            });            
+        })(jQuery);
+        
+        var functionsFrame = this;
+        var tabFrame = this;
+        var isDialog = true;
+        var submitOnEnter = true;
+    </script>
+
+</asp:Content>
+<asp:Content ContentPlaceHolderID="body" runat="server">
+    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot" />
+    <umb:JsInclude ID="JsInclude2" runat="server" FilePath="Dialogs/UmbracoField.js" PathNameAlias="UmbracoClient" />
+
+    <div class="umb-panel umb-modal">
+    <div class="umb-panel-body no-header with-footer">
+    <input type="hidden" name="tagName" runat="server" id="tagName" value="?UMBRACO_GETITEM" />
+    
+    <cc1:Pane ID="pane_form" runat="server" Title="Choose value">
+        <cc1:PropertyPanel ID="pp_insertField" runat="server">
+            <cc1:FieldDropDownList ID="fieldPicker" Width="170px" Rows="1" runat="server"></cc1:FieldDropDownList>            
+            <input type="text" size="25" name="field" class="guiInputTextTiny"/>
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="pp_insertAltField" runat="server">
+            <cc1:FieldDropDownList ID="altFieldPicker" Width="170px" Rows="1" runat="server"></cc1:FieldDropDownList>
+            <input type="text" size="25" name="useIfEmpty" class="guiInputTextTiny"/><br />
+            <span class="guiDialogTiny">
+                <%=umbraco.ui.Text("templateEditor", "usedIfEmpty")%></span>
+        </cc1:PropertyPanel>
+        
+        <cc1:PropertyPanel ID="pp_insertAltText" runat="server">
+            <textarea rows="1" style="width: 310px;" name="alternativeText" class="guiInputTextTiny"></textarea><br />
+            <span class="guiDialogTiny">
+                <%=umbraco.ui.Text("templateEditor", "usedIfAllEmpty")%></span>
+        </cc1:PropertyPanel>
+        
+        <cc1:PropertyPanel ID="pp_recursive" runat="server">
+            <input type="checkbox" name="recursive" value="true"/> <%=umbraco.ui.Text("templateEditor", "recursive")%>
+        </cc1:PropertyPanel>
+
+    </cc1:Pane>
+    
+    <cc1:Pane runat="server" Title="Format and encoding">
+        <cc1:PropertyPanel ID="pp_FormatAsDate" runat="server">
+            <input type="radio" name="formatAsDate" value="formatAsDate"/>
+            <%=umbraco.ui.Text("templateEditor", "dateOnly")%>
+            &nbsp; &nbsp;
+            <input type="radio" name="formatAsDate" value="formatAsDateWithTime"/>
+            <%=umbraco.ui.Text("templateEditor", "withTime")%>
+            <input type="text" size="6" name="formatAsDateWithTimeSeparator" style="width: 35px" class="guiInputTextTiny"/>
+            <br />
+            <span class="guiDialogTiny">Format the value as a date, or a date with time, accoring to the active culture.</span>
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="pp_casing" runat="server">
+            <input type="radio" name="toCase" value=""/>
+            <%=umbraco.ui.Text("templateEditor", "none")%>
+            <input type="radio" name="toCase" value="lower"/>
+            <%=umbraco.ui.Text("templateEditor", "lowercase")%>
+            <input type="radio" name="toCase" value="upper"/>
+            <%=umbraco.ui.Text("templateEditor", "uppercase")%>
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="pp_encode" runat="server">
+            <input type="radio" name="urlEncode" value=""/>
+            <%=umbraco.ui.Text("none")%>
+            <input type="radio" name="urlEncode" value="url"/>
+            <%=umbraco.ui.Text("templateEditor","urlEncode")%>
+            <input type="radio" name="urlEncode" value="html"/>
+            <%=umbraco.ui.Text("templateEditor", "htmlEncode")%>
+            <br />
+            <span class="guiDialogTiny">
+                <%=umbraco.ui.Text("templateEditor", "urlEncodeHelp")%>
+            </span>
+        </cc1:PropertyPanel>
+        </cc1:Pane>
+
+        <cc1:Pane runat="server" Title="Modify output">
+        <cc1:PropertyPanel ID="pp_insertBefore" runat="server">
+            <input type="text" size="40" name="insertTextBefore" class="guiInputTextTiny"/><br />
+            <span class="guiDialogTiny">
+                <%=umbraco.ui.Text("templateEditor", "insertedBefore")%>
+            </span>
+        </cc1:PropertyPanel>
+        <cc1:PropertyPanel ID="pp_insertAfter" runat="server">
+            <input type="text" size="40" name="insertTextAfter" class="guiInputTextTiny"/><br />
+            <span class="guiDialogTiny">
+                <%=umbraco.ui.Text("templateEditor", "insertedAfter")%>
+            </span>
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="pp_convertLineBreaks" runat="server">
+            <input type="checkbox" name="convertLineBreaks" value="true"/>  <%=umbraco.ui.Text("templateEditor", "convertLineBreaks")%>
+            
+            <br />
+            <span class="guiDialogTiny">
+                <%=umbraco.ui.Text("templateEditor", "convertLineBreaksHelp")%>
+            </span>
+        </cc1:PropertyPanel>
+
+        <cc1:PropertyPanel ID="pp_removePTags" runat="server">
+            <input type="checkbox" name="stripParagraph" value="true"/>  <%=umbraco.ui.Text("templateEditor", "removeParagraph")%>
+            <br />
+            <span class="guiDialogTiny"><%=umbraco.ui.Text("templateEditor", "removeParagraphHelp")%>
+            </span>
+        </cc1:PropertyPanel>
+    </cc1:Pane>
+    </div>
+    
+    <div class="umb-panel-footer">
+        <div class="btn-toolbar umb-btn-toolbar">
+            <a id="cancelButton" href="#" class="btn btn-link">
+                <%=umbraco.ui.Text("general", "cancel", UmbracoUser)%></a> 
+    
+            <input id="submitButton" type="button" name="gem" class="btn btn-primary" value="<%=umbraco.ui.Text("insert")%>" />
+        </div>
+    </div>
+
+    </div>
+    
+</asp:Content>
@@ -0,0 +1,28 @@
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="uploadImage.aspx.cs"
+    AutoEventWireup="True" Inherits="umbraco.dialogs.uploadImage" %>
+
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagName="MediaUpload" TagPrefix="umb" Src="../controls/Images/UploadMediaImage.ascx" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+    <style type="text/css">
+        body, html
+        {
+            margin: 0px !important;
+            padding: 0px !important;
+        }
+    </style>
+
+    <script type="text/javascript">
+        function uploadHandler(e) {
+            //get the tree object for the chooser and refresh
+            if (parent && parent.jQuery && parent.jQuery.fn.UmbracoTreeAPI) {
+                var tree = parent.jQuery("#treeContainer").UmbracoTreeAPI();
+                tree.refreshTree();
+            }
+        }
+    </script>
+
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
+    <umb:MediaUpload runat="server" ID="MediaUploader" OnClientUpload="uploadHandler" />
+</asp:Content>
@@ -0,0 +1,72 @@
+<%@ 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" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+<style type="text/css">
+.gridHeader{border-bottom:2px solid #D9D7D7;}
+.gridItem{border-color: #D9D7D7;}
+</style>
+
+<umb:CssInclude ID="CssInclude2" runat="server" FilePath="Tree/treeIcons.css" PathNameAlias="UmbracoClient" />
+<umb:CssInclude ID="CssInclude3" runat="server" FilePath="Tree/menuIcons.css" PathNameAlias="UmbracoClient" Priority="11" />
+</asp:Content>
+
+<asp:Content ContentPlaceHolderID="body" runat="server">
+<cc1:Pane runat="server">
+<div id="auditTrailList">
+ <asp:DataGrid ID="auditLog" runat="server" BorderStyle="None" HeaderStyle-CssClass="gridHeader" ItemStyle-CssClass="gridItem" GridLines="Horizontal" HeaderStyle-Font-Bold="True" AutoGenerateColumns="False"
+              width="100%">
+              <Columns>
+                <asp:TemplateColumn>
+                  <HeaderTemplate>
+                    <b>
+                      <%=umbraco.ui.Text("action")%>&nbsp;&nbsp;
+                    </b>
+                  </HeaderTemplate>
+                  <ItemTemplate>
+                    <%# FormatAction(DataBinder.Eval(Container.DataItem, "LogType", "{0}")) %>
+                  </ItemTemplate>
+                </asp:TemplateColumn>
+                <asp:TemplateColumn>
+                  <HeaderTemplate>
+                    <b>
+                      <%=umbraco.ui.Text("user")%>
+                    </b>
+                  </HeaderTemplate>
+                  <ItemTemplate>
+                    <%# umbraco.BusinessLogic.User.GetUser(int.Parse(DataBinder.Eval(Container.DataItem, "UserId", "{0}"))).Name%>
+                  </ItemTemplate>
+                </asp:TemplateColumn>
+                <asp:TemplateColumn>
+                  <HeaderTemplate>
+                    <b>
+                      <%=umbraco.ui.Text("date")%>
+                    </b>
+                  </HeaderTemplate>
+                  <ItemTemplate>
+                    <%# DataBinder.Eval(Container.DataItem, "Timestamp", "{0:D} {0:T}") %>
+                  </ItemTemplate>
+                </asp:TemplateColumn>
+                <asp:TemplateColumn>
+                  <HeaderTemplate>
+                    <b>
+                      <%=umbraco.ui.Text("comment")%>
+                    </b>
+                  </HeaderTemplate>
+                  <ItemTemplate>
+                    <%# DataBinder.Eval(Container.DataItem, "Comment", "{0}") %>
+                  </ItemTemplate>
+                </asp:TemplateColumn>
+              </Columns>
+            </asp:DataGrid>
+            </div>
+</cc1:Pane>
+
+</asp:Content>
+
+
+           
+            
+
				`@@ -0,0 +1 @@`
				`<%@ Page language="c#" Codebehind="exportDocumenttype.aspx.cs" AutoEventWireup="false" Inherits="umbraco.presentation.dialogs.exportDocumenttype" %>`