diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index 011ce74bf0..19c0bc94f3 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -669,6 +669,12 @@ ModuleInjector.aspx + + ModuleSelector.ascx + + + ModuleSelector.ascx + SkinCustomizer.ascx ASPXCodeBehind @@ -1673,6 +1679,7 @@ + diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx new file mode 100644 index 0000000000..5a1ec7812d --- /dev/null +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ModuleSelector.ascx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleSelector" %> diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs new file mode 100644 index 0000000000..1b984848b6 --- /dev/null +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule +{ + public partial class ModuleSelector : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs new file mode 100644 index 0000000000..4af9c55024 --- /dev/null +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule +{ + + + public partial class ModuleSelector + { + } +} diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js index 5bdc0fe057..daf6987b89 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js @@ -1,4 +1,6 @@ -function umbShowModuleContainerSelectors() { +var umbModuleToInsertAlias = 'CWS_twitter&target' + +function umbShowModuleContainerSelectors() { jQuery(".umbModuleContainer").each(function () { @@ -12,7 +14,7 @@ jQuery(".umbModuleContainerSelector").click(function () { - Umbraco.Controls.ModalWindow().open('/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx?macroAlias=RunwayTopNavigation&target=' + jQuery(this).parent().attr('id') + "&type=" + jQuery(this).attr('rel'), 'Insert module', true, 550, 550, 50, 0, ['.modalbuton'], null); + Umbraco.Controls.ModalWindow().open('/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx?macroAlias='+umbModuleToInsertAlias +'&target=' + jQuery(this).parent().attr('id') + "&type=" + jQuery(this).attr('rel'), 'Insert module', true, 550, 550, 50, 0, ['.modalbuton'], null); }); } @@ -37,7 +39,9 @@ function umbInsertModule(container,macro,type) { jQuery.post("/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx?tag=" + macro.replace('>','').replace('<','').replace('',''), function (data) { - jQuery(".umbModuleContainerPlaceHolder").html(data); + jQuery(".umbModuleContainerPlaceHolder").html(data); + + UmbSpeechBubble.ShowMessage("Info", "Module", "Module inserted"); }); } \ No newline at end of file