Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -599,6 +599,7 @@
     <Compile Include="Umbraco\Umbraco.aspx.designer.cs">
       <DependentUpon>umbraco.aspx</DependentUpon>
     </Compile>
+    <Content Include="Umbraco_Client\IconPicker\iconpicker.js" />
     <Content Include="App_Plugins\MyPackage\Common\Js\MyPackage.js" />
     <Content Include="App_Plugins\MyPackage\PropertyEditors\Js\CsvEditor.js" />
     <Content Include="App_Plugins\MyPackage\PropertyEditors\Js\PostcodeEditor.js" />

src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx

@@ -1,27 +1,30 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="PartialView.ascx.cs" Inherits="Umbraco.Web.UI.Umbraco.Create.PartialView" %>
 <%@ Import Namespace="umbraco" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
-<umb:CssInclude runat="server" FilePath="Dialogs/CreateDialog.css" PathNameAlias="UmbracoClient" />
+<cc1:Pane runat="server">
+    <cc1:PropertyPanel runat="server" text="Filename (without .cshtml)">
+        <asp:TextBox id="FileName" Runat="server" CssClass="bigInput input-large-type input-block-level"></asp:TextBox>
+        <asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
+    </cc1:PropertyPanel>
 
-Filename (without .cshtml):
-<asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
+    <cc1:PropertyPanel runat="server" Text="Template">
+        <asp:ListBox id="PartialViewTemplate" Runat="server" Width="350" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single">
+	        <asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
+        </asp:ListBox>
+    </cc1:PropertyPanel>
+    
+    <cc1:PropertyPanel runat="server">
+        <asp:CheckBox ID="CreateMacroCheckBox" Runat="server" Checked="true" Text="Create Macro"></asp:CheckBox>
+    </cc1:PropertyPanel>
+</cc1:Pane>
 
-<%--<input type="hidden" name="nodeType" value="-1">--%>
-<div>
-    <asp:TextBox ID="FileName" runat="server" CssClass="bigInput"></asp:TextBox>
-</div>
-<div>
-    Choose a template:<br />
-    <asp:ListBox ID="PartialViewTemplate" runat="server" Width="350" CssClass="bigInput" Rows="1"  SelectionMode="Single" />
-</div>
+<!-- added to support missing postback on enter in IE -->
+<asp:TextBox runat="server" style="visibility:hidden;display:none;" ID="Textbox1"/>
+<input type="hidden" name="nodeType" value="-1">
 
-<div>
-    <asp:CheckBox ID="CreateMacroCheckBox" runat="server" Checked="true" Text="Create Macro"></asp:CheckBox>
-</div>
 
-<div class="submit-footer">
-    <asp:Button ID="SubmitButton" runat="server" OnClick="SubmitButton_Click" Text='<%#ui.Text("create") %>'></asp:Button>
-    &nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;
-    <a href="#" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
-</div>
+<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
+     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+     <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" Text="Save" onclick="SubmitButton_Click"></asp:Button>
+</cc1:Pane>

src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs

@@ -12,15 +12,6 @@ namespace Umbraco.Web.UI.Umbraco.Create {
     
     public partial class PartialView {
         
-        /// <summary>
-        /// RequiredFieldValidator1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-        
         /// <summary>
         /// FileName control.
         /// </summary>
@@ -30,6 +21,15 @@ namespace Umbraco.Web.UI.Umbraco.Create {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox FileName;
         
+        /// <summary>
+        /// RequiredFieldValidator1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
+        
         /// <summary>
         /// PartialViewTemplate control.
         /// </summary>
@@ -49,12 +49,21 @@ namespace Umbraco.Web.UI.Umbraco.Create {
         protected global::System.Web.UI.WebControls.CheckBox CreateMacroCheckBox;
         
         /// <summary>
-        /// SubmitButton control.
+        /// Textbox1 control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Button SubmitButton;
+        protected global::System.Web.UI.WebControls.TextBox Textbox1;
+        
+        /// <summary>
+        /// sbmt control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button sbmt;
     }
 }

src/Umbraco.Web.UI/config/Dashboard.Release.config

@@ -82,7 +82,9 @@
     </tab>
 
     <tab caption="Change Password">
-      <control addPanel="true">/umbraco/dashboard/changepassword.ascx</control>
+      <control addPanel="true">
+        views/dashboard/changepassword.html
+      </control>
     </tab>
 
   </section>

src/Umbraco.Web.UI/config/Dashboard.config

@@ -75,7 +75,9 @@
       <control addPanel="true" MaxRecords="30">/umbraco/dashboard/latestEdits.ascx</control>
     </tab>
     <tab caption="Change Password">
-      <control addPanel="true">/umbraco/dashboard/changepassword.ascx</control>
+      <control addPanel="true">
+        views/dashboard/changepassword.html
+      </control>
     </tab>
   </section>
   <section alias="StartupMemberDashboardSection">

src/Umbraco.Web.UI/umbraco/Views/Default.cshtml

@@ -26,8 +26,7 @@
         <umb-navigation></umb-navigation>
 
         <section id="contentwrapper">
-            <div id="contentcolumn">
-                <div class="content-column-body" ng-view></div>
+            <div id="contentcolumn" ng-view>
             </div>
         </section>
 

src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx

@@ -56,12 +56,8 @@
   <cc2:Pane runat="server">  
     <cc2:PropertyPanel ID="pp_icon" runat="server" Text="Icon">
         <div class="umbIconDropdownList">
-          <asp:DropDownList ID="ddlIcons"  CssClass="guiInputText guiInputStandardSize" runat="server"/>
-        </div>
-    </cc2:PropertyPanel>
-    <cc2:PropertyPanel ID="pp_thumbnail" runat="server" Text="Thumbnail">
-        <div class="umbThumbnailDropdownList">
-          <asp:DropDownList ID="ddlThumbnails" CssClass="guiInputText guiInputStandardSize" runat="server"/>
+          <a href="#">Choose...</a>
+          <asp:TextBox ID="tb_icon" runat="server" />        
         </div>
     </cc2:PropertyPanel>
     <cc2:PropertyPanel ID="pp_description" runat="server" Text="Description">

src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx

@@ -1,31 +1,37 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DLRScripting.ascx.cs" Inherits="umbraco.presentation.create.DLRScripting" %>
-Filename (without extension): <asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator><br />
-<input type="hidden" name="nodeType" value="-1">
+<%@ Import Namespace="umbraco" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
-<asp:TextBox id="rename" Runat="server" CssClass="bigInput" Width="350"></asp:TextBox>
+<cc1:Pane runat="server">
+    <cc1:PropertyPanel runat="server" text="Filename (without extension)">
+        <asp:TextBox id="rename" Runat="server" CssClass="bigInput input-large-type input-block-level"></asp:TextBox>
+        <asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
+    </cc1:PropertyPanel>
 
-<asp:UpdatePanel ID="UpdatePanel1" runat="server">
-<ContentTemplate>
-<div style="MARGIN-TOP: 10px">Choose a language:<br />
-<asp:ListBox id="filetype" Runat="server" Width="350" CssClass="bigInput" Rows="1" SelectionMode="Single" AutoPostBack="true" OnSelectedIndexChanged="loadTemplates"></asp:ListBox>
-</div>
+    <asp:UpdatePanel ID="UpdatePanel1" runat="server">
+        <ContentTemplate>
+            <cc1:PropertyPanel runat="server" text="Choose a language">
+                <asp:ListBox id="filetype" Runat="server" CssClass="bigInput input-large-type input-block-level" Rows="1" 
+                    SelectionMode="Single" AutoPostBack="true" OnSelectedIndexChanged="loadTemplates">
+                </asp:ListBox>
+            </cc1:PropertyPanel>
+           <cc1:PropertyPanel runat="server" text="Template">
+                <asp:ListBox id="template" Runat="server" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single">
+                </asp:ListBox>
+           </cc1:PropertyPanel>
+        </ContentTemplate>
+    </asp:UpdatePanel>
 
-<div style="MARGIN-TOP: 10px">Choose a template:<br />
-<asp:ListBox id="template" Runat="server" Width="350" CssClass="bigInput" Rows="1" SelectionMode="Single"></asp:ListBox>
-</div>
-</ContentTemplate>
-</asp:UpdatePanel>
+     <cc1:PropertyPanel runat="server">
+        <asp:CheckBox ID="createMacro" Runat="server" Checked="true" Text="Create Macro"></asp:CheckBox>
+    </cc1:PropertyPanel>
+</cc1:Pane>
 
-
-<div style="MARGIN-TOP: 10px">
-<asp:CheckBox ID="createMacro" Runat="server" Checked="true" Text="Create Macro"></asp:CheckBox>
-</div>
+<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
+     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+     <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" Text="Save" onclick="sbmt_Click"></asp:Button>
+</cc1:Pane>
 
 <!-- added to support missing postback on enter in IE -->
 <asp:TextBox runat="server" style="visibility:hidden;display:none;" ID="Textbox1"/>
-
-<div style="MARGIN-TOP: 15px;">
-<asp:Button id="sbmt" Runat="server" style="MARGIN-TOP: 14px" Width="90" onclick="sbmt_Click"></asp:Button>
-&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;
-<a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
-</div>
+<input type="hidden" name="nodeType" value="-1">

src/Umbraco.Web.UI/umbraco/create/xslt.ascx

@@ -1,25 +1,30 @@
 <%@ Control Language="c#" AutoEventWireup="True" Codebehind="xslt.ascx.cs" Inherits="umbraco.presentation.create.xslt" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-Filename (without .xslt): <asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator><br />
-<input type="hidden" name="nodeType" value="-1">
-<asp:TextBox id="rename" Runat="server" CssClass="bigInput" Width="350"></asp:TextBox>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
+<cc1:Pane runat="server">
+    <cc1:PropertyPane runat="server" text="Filename (without .xslt)">
+        <asp:TextBox id="rename" Runat="server" CssClass="input-larger-type input-block-input"></asp:TextBox>
+        <asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
+    </cc1:PropertyPane>
 
-<div style="MARGIN-TOP: 10px">Choose a template:<br />
-<asp:ListBox id="xsltTemplate" Runat="server" Width="350" CssClass="bigInput" Rows="1" SelectionMode="Single">
-	<asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
-</asp:ListBox>
-</div>
-
-<div style="MARGIN-TOP: 10px">
-<asp:CheckBox ID="createMacro" Runat="server" Checked="true" Text="Create Macro"></asp:CheckBox>
-</div>
+    <cc1:PropertyPanel runat="server" Text="Template">
+        <asp:ListBox id="xsltTemplate" Runat="server" Width="350" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single">
+	        <asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
+        </asp:ListBox>
+    </cc1:PropertyPanel>
+    
+    <cc1:PropertyPanel runat="server" Text="Create macro">
+        <asp:CheckBox ID="createMacro" Runat="server" Checked="true" Text="Create Macro"></asp:CheckBox>
+    </cc1:PropertyPanel>
+</cc1:Pane>
 
 <!-- added to support missing postback on enter in IE -->
 <asp:TextBox runat="server" style="visibility:hidden;display:none;" ID="Textbox1"/>
+<input type="hidden" name="nodeType" value="-1">
 
 
-<div style="MARGIN-TOP: 15px;">
-<asp:Button id="sbmt" Runat="server" style="MARGIN-TOP: 14px" Width="90" onclick="sbmt_Click"></asp:Button>
-&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;
-<a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
-</div>
+<cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
+     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+     <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
+</cc1:Pane>
+

src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx

@@ -162,7 +162,7 @@
                                 </asp:DropDownList>
                             </td>
                             <td>
-                                <asp:Button ID="createNew" Text="Add" runat="server" CssClass="guiInputButton" />
+                                <asp:Button ID="createNew" Text="Add" runat="server" CssClass="btn btn-default" />
                             </td>
                         </tr>
                     </tfooter>

src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx

@@ -70,7 +70,7 @@
     <umb:Pane ID="directionPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="dualPropertyPanel" Text="Direction">
-                <asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Horizontal">
+                <asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Vertical">
                     <asp:ListItem Enabled="true" Selected="False" Text="Parent to Child" Value="0" /> 
                     <asp:ListItem Enabled="true" Selected="False" Text="Bidirectional" Value="1"/>
                 </asp:RadioButtonList>
@@ -107,7 +107,7 @@
             
             <asp:Repeater ID="relationsRepeater" runat="server">
                 <HeaderTemplate>
-                    <table class="relations">
+                    <table class="table relations">
                         <thead>
                             <tr>
                                 <th class="objectTypeIcon">&nbsp;</th>

src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx

@@ -1,4 +1,4 @@
-<%@ Page Language="C#" MasterPageFile="../MasterPages/UmbracoPage.Master" AutoEventWireup="true" CodeBehind="EditMacro.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.EditMacro" %>
+<%@ 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" %>
 
@@ -24,17 +24,23 @@
 
 </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>
-        <p>
-            <input data-bind="click: updateMacro" type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
-            <em>or </em>
-            <a data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-        </p>
+
+
+         <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($) {
@@ -49,18 +55,20 @@
         </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>
-        <p>
-            <asp:Button ID="bt_insert" runat="server" Text="ok" OnClick="renderProperties"></asp:Button>
-            <em>or </em>
-            <a data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-        </p>
+        
+        <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>

src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx

@@ -39,6 +39,7 @@
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <uc1:ContentTypeControlNew ID="ContentTypeControlNew1" runat="server"></uc1:ContentTypeControlNew>
+
     <cc1:Pane ID="tmpPane" runat="server">
         <cc1:PropertyPanel Text="Allowed templates" runat="server">
             <div class="guiInputStandardSize" style="border: #ccc 1px solid; background: #fff;

src/Umbraco.Web.UI/umbraco_client/IconPicker/iconpicker.js

@@ -0,0 +1,5 @@
+
+//todo
+function openIconPicker(element) {
+
+}