diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx index aa53d97638..278009ba22 100644 --- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx +++ b/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" %> + + @@ -57,8 +59,8 @@
- Choose... - + "> Choose... +
@@ -102,8 +104,22 @@ }); + + 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', diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx index c5984f7263..3f3fa31754 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx @@ -147,8 +147,6 @@ - - @@ -165,7 +163,7 @@ - + diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx index 1e35711282..802e5e8365 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx @@ -2,34 +2,31 @@ <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - -
-

- <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%> -

-
- - -

- <%= umbraco.ui.Text("placeHolderID") %>:
- -

- -

- " /> <%= umbraco.ui.Text("or") %> <%= umbraco.ui.Text("cancel") %> -

+ + +

+ <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%> +

+ + + + + + + + <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + " /> + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx index a9b73eb852..6bd968493f 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx @@ -17,21 +17,20 @@ -
-

- <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%> -

-
- - -

- <%= umbraco.ui.Text("placeHolderID") %>
- -

- -

- " /> <%= umbraco.ui.Text("or") %> <%= umbraco.ui.Text("cancel") %> -

- + + +

+ <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%> +

+ + + + + + + + <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + " /> + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css b/src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css index ac7074f6a2..cfbd5f220e 100644 --- a/src/Umbraco.Web.UI/umbraco_client/CodeArea/styles.css +++ b/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;} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 717d93da1b..7d7f20e5a1 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1980,8 +1980,12 @@ - - + + ASPXCodeBehind + + + ASPXCodeBehind + ASPXCodeBehind @@ -2016,7 +2020,9 @@ - + + ASPXCodeBehind + ASPXCodeBehind diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs index fbd3291534..3d88b9949a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs @@ -295,7 +295,7 @@ namespace umbraco.controls { _contentType.ContentTypeItem.Name = txtName.Text; _contentType.ContentTypeItem.Alias = txtAlias.Text; - _contentType.ContentTypeItem.Icon = tb_icon.Text; + _contentType.ContentTypeItem.Icon = tb_icon.Value; _contentType.ContentTypeItem.Description = description.Text; //_contentType.ContentTypeItem.Thumbnail = ddlThumbnails.SelectedValue; _contentType.ContentTypeItem.AllowedAsRoot = allowAtRoot.Checked; @@ -339,7 +339,7 @@ namespace umbraco.controls if (asyncState.HasAliasChanged()) _contentType.Alias = txtAlias.Text; - _contentType.IconUrl = tb_icon.Text; + _contentType.IconUrl = tb_icon.Value; _contentType.Description = description.Text; //_contentType.Thumbnail = ddlThumbnails.SelectedValue; @@ -429,8 +429,13 @@ namespace umbraco.controls txtName.Text = _contentType.GetRawText(); txtAlias.Text = _contentType.Alias; description.Text = _contentType.GetRawDescription(); - tb_icon.Text = _contentType.IconUrl; + tb_icon.Value = _contentType.IconUrl; + + if(string.IsNullOrEmpty(_contentType.IconUrl)) + lt_icon.Text = "icon-document"; + else + lt_icon.Text = _contentType.IconUrl.TrimStart('.'); /* var dirInfo = new DirectoryInfo(Server.MapPath(SystemDirectories.Umbraco + "/images/umbraco")); @@ -1527,9 +1532,10 @@ Umbraco.Controls.TabView.onActiveTabChange(function(tabviewid, tabid, tabs) { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox tb_icon; + protected global::System.Web.UI.WebControls.HiddenField tb_icon; + protected global::System.Web.UI.WebControls.Literal lt_icon; - + /// /// pp_description control. /// diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs index faf8c60375..232f192919 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx index 1e35711282..4d03583621 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx @@ -2,9 +2,7 @@ <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - -
-

- <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%> -

-
- - -

- <%= umbraco.ui.Text("placeHolderID") %>:
- -

- -

- " /> <%= umbraco.ui.Text("or") %> <%= umbraco.ui.Text("cancel") %> -

+ + +

+ <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%> +

+ + + + + + + + <%=umbraco.ui.Text("general", "cancel")%> + " /> + \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.cs index 1e73f15317..0aa49a70b5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.cs @@ -18,6 +18,8 @@ namespace umbraco.presentation.umbraco.dialogs protected void Page_Load(object sender, EventArgs e) { + //labels + pp_placeholder.Text = ui.Text("placeHolderID"); //Add a default Item var li = new ListItem("Choose ID..."); @@ -38,38 +40,9 @@ namespace umbraco.presentation.umbraco.dialogs dd_detectedAlias.Items.Add(cpId); } - //string mp = System.IO.File.ReadAllText(masterPageFile); - - //string pat = ""; - - /* Instantiate the regular expression object. - Regex r = new Regex(pat, RegexOptions.IgnoreCase); - - // Match the regular expression pattern against a text string. - Match m = r.Match(mp); - - while (m.Success) { - - CaptureCollection cc = m.Groups[3].Captures; - - foreach (Capture c in cc) { - if(c.Value != "server") - dd_detectedAlias.Items.Add(c.Value); - } - - m = m.NextMatch(); - } - - //just to be sure that they have something to select, we will add the default placeholder.... - - * - */ - if (dd_detectedAlias.Items.Count == 1) dd_detectedAlias.Items.Add("ContentPlaceHolderDefault"); - - } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs index cbf0371011..f5308c1905 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,6 +12,24 @@ namespace umbraco.presentation.umbraco.dialogs { public partial class insertMasterpageContent { + /// + /// pane_insert control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.Pane pane_insert; + + /// + /// pp_placeholder control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel pp_placeholder; + /// /// dd_detectedAlias control. /// diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx index a9b73eb852..e3c114be2d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx @@ -1,37 +1,34 @@ <%@ 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" %> - -
-

- <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%> -

-
- - -

- <%= umbraco.ui.Text("placeHolderID") %>
- -

- -

- " /> <%= umbraco.ui.Text("or") %> <%= umbraco.ui.Text("cancel") %> -

+ + +

+ <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%> +

+ + + + + + + + <%=umbraco.ui.Text("general", "cancel", this.getUser())%> + " /> + \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs index 75c8b77915..efac983598 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.cs @@ -12,7 +12,9 @@ namespace umbraco.presentation.umbraco.dialogs { CurrentApp = BusinessLogic.DefaultApps.settings.ToString(); } protected void Page_Load(object sender, EventArgs e) { - + //labels + pp_placeholder.Text = ui.Text("placeHolderID"); + } } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs index 3a00be2a86..624826f390 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,15 +12,6 @@ namespace umbraco.presentation.umbraco.dialogs { public partial class insertMasterpagePlaceholder { - /// - /// Pane1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane Pane1; - /// /// tb_alias control. /// @@ -30,5 +20,7 @@ namespace umbraco.presentation.umbraco.dialogs { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox tb_alias; + + protected global::umbraco.uicontrols.PropertyPanel pp_placeholder; } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs index 159a2a8968..91a0ec587c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs @@ -131,12 +131,7 @@ namespace umbraco.cms.presentation.settings 640, 550); umbDictionary.AltText = "Insert umbraco dictionary item"; - //uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon(); - //umbMacro.ImageURL = UmbracoPath + "/images/editor/insMacro.gif"; - //umbMacro.AltText = ui.Text("template", "insertMacro"); - //umbMacro.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530); - - editorSource.Menu.NewElement("div", "splitButtonMacroPlaceHolder", "sbPlaceHolder", 40); + editorSource.Menu.NewElement("div", "splitButtonMacroPlaceHolder", "sbPlaceHolder", 40); if (UmbracoConfiguration.Current.UmbracoSettings.Templates.UseAspNetMasterPages) { @@ -163,18 +158,6 @@ namespace umbraco.cms.presentation.settings editorSource.Menu.InsertSplitter(); editorSource.Menu.NewElement("div", "splitButtonPlaceHolder", "sbPlaceHolder", 40); - if (Skinning.StarterKitGuid(_template.Id).HasValue) - { - editorSource.Menu.InsertSplitter(); - MenuIconI umbContainer = editorSource.Menu.NewIcon(); - umbContainer.ImageURL = UmbracoPath + "/images/editor/skin.gif"; - umbContainer.AltText = ui.Text("template", "modifyTemplateSkin"); - //umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/TemplateSkinning.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "modifyTemplateSkin"), 570, 420); - umbContainer.OnClickCommand = "window.open('" + GlobalSettings.Path + "/canvas.aspx?redir=" + - ResolveUrl("~/") + "&umbSkinning=true&umbSkinningConfigurator=true" + - "','canvas')"; - } - // Help editorSource.Menu.InsertSplitter();