Updates legacy editor visuals

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

@@ -3,6 +3,8 @@
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
+
+
 <cc1:TabView ID="TabView1" Height="392px" Width="552px" runat="server"></cc1:TabView>
 
 <asp:Panel ID="pnlGeneral" runat="server"></asp:Panel>
@@ -57,8 +59,8 @@
   <cc2:Pane runat="server">  
     <cc2:PropertyPanel ID="pp_icon" runat="server" Text="Icon">
         <div class="umbIconDropdownList">
-          <a href="#">Choose...</a>
-          <asp:TextBox ID="tb_icon" runat="server" />        
+          <a href="#" class="icon-picker"> <i class="<asp:Literal runat="server" ID="lt_icon" />"></i> Choose...</a>
+          <asp:HiddenField ID="tb_icon" runat="server" />
         </div>
     </cc2:PropertyPanel>
     <cc2:PropertyPanel ID="pp_description" runat="server" Text="Description">
@@ -102,8 +104,22 @@
         <asp:Literal runat="server" ID="checkTxtAliasJs" />
     });
 
+
+
     jQuery(document).ready(function () {
 
+        jQuery(".icon-picker").click(function(){
+            var that = this;
+            UmbClientMgr.openAngularModalWindow({
+                template: 'views/common/dialogs/iconpicker.html', 
+                callback: function(data){
+                    jQuery(that).next().val("." + data);
+                    jQuery(that).find("i").attr("class", data);
+                }}); 
+            
+            return false;
+        });
+
         // Make each tr of the tabs table sortable (prevent dragging of header row, and set up a callback for when row dragged)
         jQuery("table.tabs-table tbody").sortable({
             containment: 'parent',

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

@@ -147,8 +147,6 @@
                 </tr>
             </ItemTemplate>
             <FooterTemplate>
-                </tbody>
-                    <tfooter>
                         <tr>
                             <td>
                                 <asp:TextBox runat="server" ID="macroPropertyAliasNew" Text='New Alias' OnTextChanged="macroPropertyCreate" />
@@ -165,7 +163,7 @@
                                 <asp:Button ID="createNew" Text="Add" runat="server" CssClass="btn btn-default" />
                             </td>
                         </tr>
-                    </tfooter>
+                </tbody>
                 </table>
             </FooterTemplate>
         </asp:Repeater>

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

@@ -2,34 +2,31 @@
 <%@ 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();
+    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">
-  <div class="notice">
-  <p>
-    <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%>
-  </p>
-  </div>
-   
-  <cc1:Pane runat="server">
-  <p>
-    <%= umbraco.ui.Text("placeHolderID") %>:<br />
-    <asp:DropDownList ID="dd_detectedAlias" Width="350px" CssClass="bigInput" runat="server" />
-  </p>
-  </cc1:Pane>
-  <p>
-    <input type="button" onclick="insertCode(); return false;" value="<%= umbraco.ui.Text("insert") %>" /> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
-  </p>
   
+  <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>

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

@@ -17,21 +17,20 @@
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
-  <div class="notice">
-  <p>
-    <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%>
-  </p>
-  </div>
-   
-  <cc1:Pane ID="Pane1" runat="server">
-  <p>
-  <%= umbraco.ui.Text("placeHolderID") %><br />
-  <asp:TextBox ID="tb_alias" Width="350px" CssClass="bigInput" runat="server" />
-  </p>
-  </cc1:Pane>
   
-  <p>
-    <input type="button" onclick="insertCode(); return false;" value="<%= umbraco.ui.Text("insert") %>" /> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
-  </p>
-
+  <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>

src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css

@@ -1,10 +1,8 @@
  .CodeMirror { 
         border: none !Important;
-        font-size: 14px !Important;
+        font-size: 15px !Important;
     }
-    
  .CodeMirror-gutter{background: none !Important; border: none; padding-rigth: 5px;}
  
  span.cm-at{background: yellow !Important;}
- 
  textarea.codepress{display: block; width: 100% !Important; font-size: 14px;}