yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP installer refactor, skinning

Browse Source 
[TFS Changeset #78287]
This commit is contained in:
starfighter83
2010-10-12 05:16:09 +00:00
parent 8a0a33870b
commit e65448d28e
5 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -669,6 +669,12 @@
<Compile Include="umbraco\LiveEditing\Modules\SkinModule\ModuleInjector.aspx.designer.cs">
<DependentUpon>ModuleInjector.aspx</DependentUpon>
</Compile>
<Compile Include="umbraco\LiveEditing\Modules\SkinModule\ModuleSelector.ascx.cs">
<DependentUpon>ModuleSelector.ascx</DependentUpon>
</Compile>
<Compile Include="umbraco\LiveEditing\Modules\SkinModule\ModuleSelector.ascx.designer.cs">
<DependentUpon>ModuleSelector.ascx</DependentUpon>
</Compile>
<Compile Include="umbraco\LiveEditing\Modules\SkinModule\SkinCustomizer.ascx.cs">
<DependentUpon>SkinCustomizer.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1673,6 +1679,7 @@
<Content Include="umbraco\LiveEditing\Modules\SkinModule\js\SkinModuleShowOnStartup.js" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\ModuleInjectionMacroRenderer.aspx" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\ModuleInjector.aspx" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\ModuleSelector.ascx" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\skin.png" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\SkinCustomizer.ascx" />
<Content Include="umbraco\LiveEditing\Modules\SkinModule\SkinModule.js" />

1
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx Normal file
View File

@@ -0,0 +1 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ModuleSelector.ascx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleSelector" %>

17
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.cs Normal file
View File

@@ -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)
{
}
}
}

17
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx.designer.cs generated Normal file
View File

@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
{
public partial class ModuleSelector
{
}
}

10
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/ModuleInjection.js
View File

@@ -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('</umbraco:Macro>',''),
function (data) {
jQuery(".umbModuleContainerPlaceHolder").html(data);
jQuery(".umbModuleContainerPlaceHolder").html(data);
UmbSpeechBubble.ShowMessage("Info", "Module", "Module inserted");
});
}