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

WIP installer refactor

Browse Source 
[TFS Changeset #78308]
This commit is contained in:
starfighter83
2010-10-12 12:43:13 +00:00
parent 64cc5eb3e7
commit fc2ed864f5
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ModuleSelector.ascx
View File

@@ -1,5 +1,13 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ModuleSelector.ascx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ModuleSelector" %>
<%@ Import Namespace="umbraco.cms.businesslogic.packager.repositories" %>
<script type="text/javascript">
var umbCurrentPageId = <%= umbraco.presentation.nodeFactory.Node.GetCurrent().Id %>;
var umbCurrentUmbracoDir = '<%= this.ResolveUrl(umbraco.GlobalSettings.Path) %>';
</script>
<div id="moduleSelectorContainer">
<asp:Repeater ID="rep_modules" runat="server"
@@ -30,7 +38,7 @@
<p id="installingModule" style="display:none;">
<span class="selectedModule"></span><br />
<img src="/umbraco/LiveEditing/Modules/SkinModule/images/loader.gif" /> Installing module...
<img src="<%= this.ResolveUrl(umbraco.GlobalSettings.Path) %>/LiveEditing/Modules/SkinModule/images/loader.gif" /> Installing module...
</p>

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

@@ -52,6 +52,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
private void ShowConnectionError()
{
//this.pnl_connectionerror.Visible = true;
}

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

@@ -15,7 +15,7 @@ function umbInstallModuleAndGetAlias(guid,name,sender) {
jQuery('.selectedModule').html(name);
jQuery("#installingModule").show();
jQuery.post("/umbraco/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx?guid=" + guid + "&name=" + name,
jQuery.post(umbCurrentUmbracoDir + "/LiveEditing/Modules/SkinModule/ModuleInstaller.aspx?guid=" + guid + "&name=" + name,
function (data) {
if (data == "error") {
@@ -63,7 +63,7 @@ function umbShowModuleContainerSelectors() {
jQuery(".umbModuleContainerSelector").click(function () {
jQuery(".ModuleSelector").hide();
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);
Umbraco.Controls.ModalWindow().open(umbCurrentUmbracoDir + '/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);
});
}
@@ -75,7 +75,7 @@ function umbRemoveModuleContainerSelectors() {
function umbInsertModule(container,macro,type) {
umbRemoveModuleContainerSelectors();
var working = "<div class='umbModuleContainerPlaceHolder'><img src='/umbraco/LiveEditing/Modules/SkinModule/images/loader.gif' />Inserting module...</div>";
var working = "<div class='umbModuleContainerPlaceHolder'><img src='" + umbCurrentUmbracoDir + "/LiveEditing/Modules/SkinModule/images/loader.gif' />Inserting module...</div>";
if (type == "append") {
jQuery("#" + container).append(working);
@@ -85,9 +85,9 @@ function umbInsertModule(container,macro,type) {
UmbracoCommunicator.SendClientMessage("injectmodule", container + ";" + macro + ";" + type);
//need to lose this replace calls + supply current page id;
//need to lose these replace calls
jQuery.post("/umbraco/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx?tag=" + macro.replace('>','').replace('<','').replace('</umbraco:Macro>',''),
jQuery.post(umbCurrentUmbracoDir + "/LiveEditing/Modules/SkinModule/ModuleInjectionMacroRenderer.aspx?tag=" + macro.replace('>', '').replace('<', '').replace('</umbraco:Macro>', '') + "&umbPageID=" + umbCurrentPageId,
function (data) {
jQuery(".umbModuleContainerPlaceHolder").html(data);