working on U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets but unfortunately we cannot lazy load in things like directives as angular doesn't like that, we have to re-load the browser.
This commit is contained in:
@@ -364,6 +364,12 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
|
||||
getRootScope().$emit("app.closeDialogs", undefined);
|
||||
}
|
||||
},
|
||||
/* This is used for the package installer to call in order to reload all app assets so we don't have to reload the window */
|
||||
_packageInstalled: function() {
|
||||
var injector = getRootInjector();
|
||||
var packageHelper = injector.get("packageHelper");
|
||||
packageHelper.packageInstalled();
|
||||
},
|
||||
_debug: function(strMsg) {
|
||||
if (this._isDebug) {
|
||||
Sys.Debug.trace("UmbClientMgr: " + strMsg);
|
||||
|
||||
@@ -65,6 +65,11 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
|
||||
scope.currentSection = args.value;
|
||||
}
|
||||
});
|
||||
|
||||
eventsService.on("app.reInitialize", function (e, args) {
|
||||
//re-load the sections if we're re-initializing (i.e. package installed)
|
||||
loadSections();
|
||||
});
|
||||
|
||||
//on page resize
|
||||
window.onresize = calculateHeight;
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
* </pre>
|
||||
*/
|
||||
angular.module('umbraco.services')
|
||||
.factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope) {
|
||||
.factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope, $http) {
|
||||
|
||||
var initAssetsLoaded = false;
|
||||
|
||||
@@ -71,6 +71,23 @@ angular.module('umbraco.services')
|
||||
return deferred.promise;
|
||||
},
|
||||
|
||||
/** Internal method. This is used after installing a package to reload the application assets so we don't have to reload the whole window */
|
||||
_reloadApplicationAssets: function() {
|
||||
|
||||
umbRequestHelper.resourcePromise(
|
||||
$http.get(umbRequestHelper.getApiUrl("manifestAssetList", "", "")),
|
||||
'Failed to get manifest list').then(function(data) {
|
||||
|
||||
//ok so we have the list of assets, now we'll use yepnope to go get them. Anything that is already loaded should remain loaded
|
||||
// and this should just load anything that is newly installed.
|
||||
|
||||
yepnope({
|
||||
load: data
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* @ngdoc method
|
||||
* @name umbraco.services.assetsService#loadCss
|
||||
|
||||
@@ -65,7 +65,7 @@ function eventsService($q, $rootScope) {
|
||||
return $rootScope.$on(name, callback);
|
||||
},
|
||||
|
||||
/** pass in the result of subscribe to this method, or just call the method returned from subscribe to unsubscribe */
|
||||
/** pass in the result of 'on' to this method, or just call the method returned from 'on' to unsubscribe */
|
||||
unsubscribe: function(handle) {
|
||||
if (angular.isFunction(handle)) {
|
||||
handle();
|
||||
|
||||
@@ -1,5 +1,21 @@
|
||||
/*Contains multiple services for various helper tasks */
|
||||
|
||||
function packageHelper(assetsService, treeService, eventsService) {
|
||||
|
||||
return {
|
||||
|
||||
/** Called when a package is installed, this resets a bunch of data and ensures the new package assets are loaded in */
|
||||
packageInstalled: function () {
|
||||
assetsService._reloadApplicationAssets();
|
||||
treeService.clearCache();
|
||||
//send event
|
||||
eventsService.emit("app.reInitialize");
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
angular.module('umbraco.services').factory('packageHelper', packageHelper);
|
||||
|
||||
function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, umbRequestHelper) {
|
||||
return {
|
||||
/** sets the image's url - will check if it is a folder or a real image */
|
||||
|
||||
@@ -260,6 +260,14 @@
|
||||
<cc1:Pane ID="pane_optional" runat="server" Visible="false" />
|
||||
<cc1:Pane ID="pane_success" runat="server" Text="Package is installed" Visible="false">
|
||||
<cc1:PropertyPanel runat="server">
|
||||
|
||||
<%--This is a hack to fix this currently until we can replace the installer with a native angular editor
|
||||
http://issues.umbraco.org/issue/U4-4011
|
||||
--%>
|
||||
<script type="text/javascript">
|
||||
UmbClientMgr.mainWindow().UmbClientMgr._reloadApplicationAssets();
|
||||
</script>
|
||||
|
||||
<p>
|
||||
All items in the package has been installed</p>
|
||||
<p>
|
||||
|
||||
@@ -6,6 +6,7 @@ using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.UI;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Umbraco.Core.Configuration;
|
||||
using Umbraco.Core.IO;
|
||||
@@ -68,6 +69,26 @@ namespace Umbraco.Web.Editors
|
||||
return JavaScript(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns a js array of all of the manifest assets
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[UmbracoAuthorize(Order = 0)]
|
||||
[HttpGet]
|
||||
public JsonNetResult GetManifestAssetList()
|
||||
{
|
||||
var plugins = new DirectoryInfo(Server.MapPath("~/App_Plugins"));
|
||||
var parser = new ManifestParser(plugins);
|
||||
var initJs = new JsInitialization(parser);
|
||||
var initCss = new CssInitialization(parser);
|
||||
var jsResult = initJs.GetJavascriptInitializationArray(HttpContext, new JArray());
|
||||
var cssResult = initCss.GetStylesheetInitializationArray(HttpContext);
|
||||
|
||||
ManifestParser.MergeJArrays(jsResult, cssResult);
|
||||
|
||||
return new JsonNetResult {Data = jsResult, Formatting = Formatting.Indented};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the JavaScript object representing the static server variables javascript object
|
||||
/// </summary>
|
||||
@@ -86,6 +107,7 @@ namespace Umbraco.Web.Editors
|
||||
"umbracoUrls", new Dictionary<string, object>
|
||||
{
|
||||
{"legacyTreeJs", Url.Action("LegacyTreeJs", "BackOffice")},
|
||||
{"manifestAssetList", Url.Action("GetManifestAssetList", "BackOffice")},
|
||||
//API URLs
|
||||
{
|
||||
"contentApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl<ContentController>(
|
||||
|
||||
56
src/Umbraco.Web/Mvc/JsonNetResult.cs
Normal file
56
src/Umbraco.Web/Mvc/JsonNetResult.cs
Normal file
@@ -0,0 +1,56 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Umbraco.Web.Mvc
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Custom json result using newtonsoft json.net
|
||||
/// </summary>
|
||||
public class JsonNetResult : ActionResult
|
||||
{
|
||||
public Encoding ContentEncoding { get; set; }
|
||||
public string ContentType { get; set; }
|
||||
public object Data { get; set; }
|
||||
|
||||
public JsonSerializerSettings SerializerSettings { get; set; }
|
||||
public Formatting Formatting { get; set; }
|
||||
|
||||
public JsonNetResult()
|
||||
{
|
||||
SerializerSettings = new JsonSerializerSettings();
|
||||
}
|
||||
|
||||
public override void ExecuteResult(ControllerContext context)
|
||||
{
|
||||
if (context == null)
|
||||
throw new ArgumentNullException("context");
|
||||
|
||||
HttpResponseBase response = context.HttpContext.Response;
|
||||
|
||||
response.ContentType = string.IsNullOrEmpty(ContentType) == false
|
||||
? ContentType
|
||||
: "application/json";
|
||||
|
||||
if (ContentEncoding != null)
|
||||
response.ContentEncoding = ContentEncoding;
|
||||
|
||||
if (Data != null)
|
||||
{
|
||||
var writer = new JsonTextWriter(response.Output) { Formatting = Formatting };
|
||||
|
||||
var serializer = JsonSerializer.Create(SerializerSettings);
|
||||
serializer.Serialize(writer, Data);
|
||||
|
||||
writer.Flush();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -24,6 +24,13 @@ namespace Umbraco.Web.UI.JavaScript
|
||||
/// Processes all found manifest files and outputs yepnope.injectcss calls for all css files found in all manifests
|
||||
/// </summary>
|
||||
public string GetStylesheetInitialization(HttpContextBase httpContext)
|
||||
{
|
||||
var result = GetStylesheetInitializationArray(httpContext);
|
||||
|
||||
return ParseMain(result);
|
||||
}
|
||||
|
||||
public JArray GetStylesheetInitializationArray(HttpContextBase httpContext)
|
||||
{
|
||||
var merged = new JArray();
|
||||
foreach (var m in _parser.GetManifests())
|
||||
@@ -37,7 +44,7 @@ namespace Umbraco.Web.UI.JavaScript
|
||||
//now we need to merge in any found cdf declarations on property editors
|
||||
ManifestParser.MergeJArrays(merged, ScanPropertyEditors(ClientDependencyType.Css, httpContext));
|
||||
|
||||
return ParseMain(merged);
|
||||
return merged;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -39,6 +39,15 @@ namespace Umbraco.Web.UI.JavaScript
|
||||
/// Processes all found manifest files and outputs the main.js file containing all plugin manifests
|
||||
/// </summary>
|
||||
public string GetJavascriptInitialization(HttpContextBase httpContext, JArray umbracoInit, JArray additionalJsFiles = null)
|
||||
{
|
||||
var result = GetJavascriptInitializationArray(httpContext, umbracoInit, additionalJsFiles);
|
||||
|
||||
return ParseMain(
|
||||
result.ToString(),
|
||||
IOHelper.ResolveUrl(SystemDirectories.Umbraco));
|
||||
}
|
||||
|
||||
public JArray GetJavascriptInitializationArray(HttpContextBase httpContext, JArray umbracoInit, JArray additionalJsFiles = null)
|
||||
{
|
||||
foreach (var m in _parser.GetManifests())
|
||||
{
|
||||
@@ -57,9 +66,7 @@ namespace Umbraco.Web.UI.JavaScript
|
||||
//now we need to merge in any found cdf declarations on property editors
|
||||
ManifestParser.MergeJArrays(umbracoInit, ScanPropertyEditors(ClientDependencyType.Javascript, httpContext));
|
||||
|
||||
return ParseMain(
|
||||
umbracoInit.ToString(),
|
||||
IOHelper.ResolveUrl(SystemDirectories.Umbraco));
|
||||
return umbracoInit;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -305,6 +305,7 @@
|
||||
<Compile Include="Models\ContentEditing\ListViewAwareContentItemDisplayBase.cs" />
|
||||
<Compile Include="Models\IRenderModel.cs" />
|
||||
<Compile Include="Models\RenderModelOfTContent.cs" />
|
||||
<Compile Include="Mvc\JsonNetResult.cs" />
|
||||
<Compile Include="Mvc\MinifyJavaScriptResultAttribute.cs" />
|
||||
<Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
|
||||
<Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
|
||||
@@ -433,6 +434,9 @@
|
||||
<Compile Include="umbraco.presentation\umbraco\create\xslt.ascx.cs">
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco.presentation\umbraco\developer\Packages\Installer.aspx.cs">
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco.presentation\umbraco\dialogs\cruds.aspx.cs">
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
@@ -1363,13 +1367,6 @@
|
||||
<Compile Include="umbraco.presentation\umbraco\dialogs\notifications.aspx.designer.cs">
|
||||
<DependentUpon>notifications.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.cs">
|
||||
<DependentUpon>installer.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx.designer.cs">
|
||||
<DependentUpon>installer.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="umbraco.presentation\umbraco\dialogs\RegexWs.aspx.cs">
|
||||
<DependentUpon>RegexWs.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -1867,7 +1864,6 @@
|
||||
<Content Include="umbraco.presentation\umbraco\dialogs\notifications.aspx">
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Content>
|
||||
<Content Include="umbraco.presentation\umbraco\developer\Packages\installer.aspx" />
|
||||
<Content Include="umbraco.presentation\umbraco\dialogs\RegexWs.aspx" />
|
||||
<Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
||||
@@ -1,261 +0,0 @@
|
||||
<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" CodeBehind="installer.aspx.cs"
|
||||
AutoEventWireup="True" Inherits="umbraco.presentation.developer.packages.Installer"
|
||||
Trace="false" %>
|
||||
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="head" runat="server">
|
||||
|
||||
<script type="text/javascript">
|
||||
function enableButton() {
|
||||
|
||||
var f = jQuery("#<%= file1.ClientID %>");
|
||||
var b = jQuery("#<%= ButtonLoadPackage.ClientID %>");
|
||||
var cb = jQuery("#cb");
|
||||
|
||||
|
||||
if (f.val() != "" && cb.attr("checked"))
|
||||
b.attr("disabled", false);
|
||||
else
|
||||
b.attr("disabled", true);
|
||||
}
|
||||
</script>
|
||||
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="body" runat="server">
|
||||
<cc1:UmbracoPanel ID="Panel1" Text="Install package" runat="server" Width="496px"
|
||||
Height="584px">
|
||||
|
||||
|
||||
<cc1:Feedback ID="fb" Style="margin-top: 7px;" runat="server" />
|
||||
<cc1:Pane ID="pane_upload" runat="server" Text="Install from local package file">
|
||||
<cc1:PropertyPanel runat="server" Text="">
|
||||
<div class="notice">
|
||||
<h3>
|
||||
Only install packages from sources you know and trust!</h3>
|
||||
<p>
|
||||
When installing an Umbraco package you should use the same caution as when you install
|
||||
an application on your computer.</p>
|
||||
<p>
|
||||
A malicious package could damage your Umbraco installation just like a malicious
|
||||
application can damage your computer.
|
||||
</p>
|
||||
<p>
|
||||
It is <strong>recommended</strong> to install from the official Umbraco package
|
||||
repository or a custom repository whenever it's possible.
|
||||
</p>
|
||||
<p>
|
||||
<input type="checkbox" id="cb" onchange="enableButton();" />
|
||||
<label for="cb" style="font-weight: bold">
|
||||
I understand the security risks associated with installing a local package</label>
|
||||
</p>
|
||||
</div>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel9" Text="Choose a file" runat="server">
|
||||
<p>
|
||||
<input id="file1" type="file" style="width: 300px;" name="file1" onchange="enableButton();"
|
||||
runat="server" />
|
||||
<br />
|
||||
<small>
|
||||
<%= umbraco.ui.Text("packager", "chooseLocalPackageText") %>
|
||||
</small>
|
||||
</p>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel runat="server" Text=" ">
|
||||
<asp:Button ID="ButtonLoadPackage" runat="server" Enabled="false" Text="Load Package"
|
||||
OnClick="uploadFile"></asp:Button>
|
||||
<span id="loadingbar" style="display: none;">
|
||||
<cc1:ProgressBar ID="progbar1" runat="server" Title="Please wait..." />
|
||||
</span>
|
||||
</cc1:PropertyPanel>
|
||||
</cc1:Pane>
|
||||
<cc1:Pane ID="pane_authenticate" runat="server" Visible="false" Text="Repository authentication">
|
||||
<cc1:PropertyPanel runat="server">
|
||||
<div class="notice">
|
||||
<p>
|
||||
This repository requires authentication before you can download any packages from
|
||||
it.<br />
|
||||
Please enter email and password to login.
|
||||
</p>
|
||||
</div>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel runat="server" Text="Email">
|
||||
<asp:TextBox ID="tb_email" runat="server" /></cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Password">
|
||||
<asp:TextBox ID="tb_password" TextMode="Password" runat="server" /></cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel2" runat="server">
|
||||
<asp:Button ID="Button1" OnClick="fetchProtectedPackage" Text="Login" runat="server" /></cc1:PropertyPanel>
|
||||
</cc1:Pane>
|
||||
<asp:Panel ID="pane_acceptLicense" runat="server" Visible="false">
|
||||
<br />
|
||||
<div class="notice">
|
||||
<p>
|
||||
<strong>Please note:</strong> Installing a package containing several items and
|
||||
files can take some time. Do not refresh the page or navigate away before, the installer
|
||||
notifies you the install is completed.
|
||||
</p>
|
||||
</div>
|
||||
<cc1:Pane ID="pane_acceptLicenseInner" runat="server">
|
||||
<cc1:PropertyPanel ID="PropertyPanel3" runat="server" Text="Name">
|
||||
<asp:Label ID="LabelName" runat="server" /></cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel5" runat="server" Text="Author">
|
||||
<asp:Label ID="LabelAuthor" runat="server" /></cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel4" runat="server" Text="More info">
|
||||
<asp:Label ID="LabelMore" runat="server" /></cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel6" runat="server" Text="License">
|
||||
<asp:Label ID="LabelLicense" runat="server" /></cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel7" runat="server" Text="Accept license">
|
||||
<asp:CheckBox Text="Accept license" runat="server" ID="acceptCheckbox" /></cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="PropertyPanel8" runat="server" Text="Read me">
|
||||
<asp:Literal ID="readme" runat="server"></asp:Literal>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="pp_unsecureFiles" runat="server" Visible="false" Text=" ">
|
||||
<div class="error" style="width: 370px;">
|
||||
<h3>
|
||||
Binary files in the package!</h3>
|
||||
<p style="padding-bottom:1px">
|
||||
<span id="dll-readMore" style="cursor:pointer;">Read more...</span>
|
||||
</p>
|
||||
<div id="dll-readMore-pane" style="display:none;">
|
||||
<p>
|
||||
This package contains .NET code. This is <strong>not unusual</strong> as .NET code
|
||||
is used for any advanced functionality on an Umbraco powered website.</p>
|
||||
<p>
|
||||
However, if you <strong>don't know the author</strong> of the package or are unsure why this package
|
||||
contains these files, it is adviced <strong>not to continue the installation</strong>.
|
||||
</p>
|
||||
<p>
|
||||
<strong>The Files in question:</strong><br />
|
||||
<ul>
|
||||
<asp:Literal ID="lt_files" runat="server" />
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="pp_macroConflicts" runat="server" Visible="false" Text=" ">
|
||||
<div class="error" style="width: 370px;">
|
||||
<h3>
|
||||
Macro Conflicts in the package!</h3>
|
||||
<p style="padding-bottom:1px;">
|
||||
<span id="macro-readMore" style="cursor:pointer;">Read more...</span>
|
||||
</p>
|
||||
<div id="macro-readMore-pane" style="display:none">
|
||||
<p>
|
||||
This package contains one or more macros which have the same alias as an existing one on your site, based on the Macro Alias.
|
||||
</p>
|
||||
<p>
|
||||
If you choose to continue your existing macros will be replaced with the ones from this package. If you do not want to overwrite your existing macros you will need to change their alias.
|
||||
</p>
|
||||
<p>
|
||||
<strong>The Macros in question:</strong><br />
|
||||
<ul>
|
||||
<asp:Literal ID="ltrMacroAlias" runat="server" />
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="pp_templateConflicts" runat="server" Visible="false" Text=" ">
|
||||
<div class="error" style="width: 370px;">
|
||||
<h3>
|
||||
Template Conflicts in the package!</h3>
|
||||
<p style="padding-bottom:1px;">
|
||||
<span id="template-readMore" style="cursor:pointer;">Read more...</span>
|
||||
</p>
|
||||
<div id="template-readMore-pane" style="display:none">
|
||||
<p>
|
||||
This package contains one or more templates which have the same alias as an existing one on your site, based on the Template Alias.
|
||||
</p>
|
||||
<p>
|
||||
If you choose to continue your existing template will be replaced with the ones from this package. If you do not want to overwrite your existing templates you will need to change their alias.
|
||||
</p>
|
||||
<p>
|
||||
<strong>The Templates in question:</strong><br />
|
||||
<ul>
|
||||
<asp:Literal ID="ltrTemplateAlias" runat="server" />
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel ID="pp_stylesheetConflicts" runat="server" Visible="false" Text=" ">
|
||||
<div class="error" style="width: 370px;">
|
||||
<h3>
|
||||
Stylesheet Conflicts in the package!</h3>
|
||||
<p style="padding-bottom:1px;">
|
||||
<span id="stylesheet-readMore" style="cursor:pointer;">Read more...</span>
|
||||
</p>
|
||||
<div id="stylesheet-readMore-pane" style="display:none">
|
||||
<p>
|
||||
This package contains one or more stylesheets which have the same alias as an existing one on your site, based on the Stylesheet Name.
|
||||
</p>
|
||||
<p>
|
||||
If you choose to continue your existing stylesheets will be replaced with the ones from this package. If you do not want to overwrite your existing stylesheets you will need to change their name.
|
||||
</p>
|
||||
<p>
|
||||
<strong>The Stylesheets in question:</strong><br />
|
||||
<ul>
|
||||
<asp:Literal ID="ltrStylesheetNames" runat="server" />
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</cc1:PropertyPanel>
|
||||
<cc1:PropertyPanel runat="server" Text=" ">
|
||||
<br />
|
||||
<div style="display: none;" id="installingMessage">
|
||||
<cc1:ProgressBar runat="server" ID="_progbar1" />
|
||||
<br />
|
||||
<em> Installing package, please wait...</em><br />
|
||||
</div>
|
||||
<asp:Button ID="ButtonInstall" runat="server" Text="Install Package" Enabled="False"
|
||||
OnClick="startInstall"></asp:Button>
|
||||
</cc1:PropertyPanel>
|
||||
</cc1:Pane>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
jQuery('#dll-readMore').click(function() {
|
||||
jQuery('#dll-readMore-pane').toggle();
|
||||
});
|
||||
|
||||
jQuery('#macro-readMore').click(function() {
|
||||
jQuery('#macro-readMore-pane').toggle();
|
||||
});
|
||||
|
||||
jQuery('#template-readMore').click(function() {
|
||||
jQuery('#template-readMore-pane').toggle();
|
||||
});
|
||||
|
||||
jQuery('#stylesheet-readMore').click(function() {
|
||||
jQuery('#stylesheet-readMore-pane').toggle();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</asp:Panel>
|
||||
<cc1:Pane ID="pane_installing" runat="server" Visible="false" Text="Installing package">
|
||||
<cc1:PropertyPanel runat="server">
|
||||
<cc1:ProgressBar runat="server" ID="progBar2" />
|
||||
<asp:Literal ID="lit_installStatus" runat="server" />
|
||||
</cc1:PropertyPanel>
|
||||
</cc1:Pane>
|
||||
<cc1:Pane ID="pane_optional" runat="server" Visible="false" />
|
||||
<cc1:Pane ID="pane_success" runat="server" Text="Package is installed" Visible="false">
|
||||
<cc1:PropertyPanel runat="server">
|
||||
<p>
|
||||
All items in the package has been installed</p>
|
||||
<p>
|
||||
Overview of what was installed can found under "installed package" in the developer
|
||||
section.</p>
|
||||
<p>
|
||||
Uninstall is available at the same location.</p>
|
||||
<p>
|
||||
<asp:Button Text="View installed package" ID="bt_viewInstalledPackage" runat="server" />
|
||||
<asp:Literal ID="lit_authorUrl" runat="server" />
|
||||
</p>
|
||||
|
||||
</cc1:PropertyPanel>
|
||||
</cc1:Pane>
|
||||
<input id="tempFile" type="hidden" name="tempFile" runat="server" /><input id="processState"
|
||||
type="hidden" name="processState" runat="server" />
|
||||
</cc1:UmbracoPanel>
|
||||
</asp:Content>
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
@@ -53,9 +53,9 @@ namespace umbraco.presentation.developer.packages
|
||||
}
|
||||
|
||||
//if we are actually in the middle of installing something... meaning we keep redirecting back to this page with
|
||||
// custom query strings
|
||||
// TODO: SD: This process needs to be fixed/changed/etc... to use the InstallPackageController
|
||||
// http://issues.umbraco.org/issue/U4-1047
|
||||
// custom query strings
|
||||
// TODO: SD: This process needs to be fixed/changed/etc... to use the InstallPackageController
|
||||
// http://issues.umbraco.org/issue/U4-1047
|
||||
if (!string.IsNullOrEmpty(Request.GetItemAsString("installing")))
|
||||
{
|
||||
HideAllPanes();
|
||||
@@ -63,22 +63,22 @@ namespace umbraco.presentation.developer.packages
|
||||
ProcessInstall(Request.GetItemAsString("installing")); //process the current step
|
||||
|
||||
}
|
||||
else if (tempFile.Value.IsNullOrWhiteSpace() //if we haven't downloaded the .umb temp file yet
|
||||
&& (!Request.GetItemAsString("guid").IsNullOrWhiteSpace() && !Request.GetItemAsString("repoGuid").IsNullOrWhiteSpace()))
|
||||
else if (tempFile.Value.IsNullOrWhiteSpace() //if we haven't downloaded the .umb temp file yet
|
||||
&& (!Request.GetItemAsString("guid").IsNullOrWhiteSpace() && !Request.GetItemAsString("repoGuid").IsNullOrWhiteSpace()))
|
||||
{
|
||||
//we'll fetch the local information we have about our repo, to find out what webservice to query.
|
||||
_repo = cms.businesslogic.packager.repositories.Repository.getByGuid(Request.GetItemAsString("repoGuid"));
|
||||
|
||||
_repo = cms.businesslogic.packager.repositories.Repository.getByGuid(Request.GetItemAsString("repoGuid"));
|
||||
|
||||
if (_repo != null && _repo.HasConnection())
|
||||
{
|
||||
//from the webservice we'll fetch some info about the package.
|
||||
cms.businesslogic.packager.repositories.Package pack = _repo.Webservice.PackageByGuid(Request.GetItemAsString("guid"));
|
||||
cms.businesslogic.packager.repositories.Package pack = _repo.Webservice.PackageByGuid(Request.GetItemAsString("guid"));
|
||||
|
||||
//if the package is protected we will ask for the users credentials. (this happens every time they try to fetch anything)
|
||||
if (!pack.Protected)
|
||||
{
|
||||
//if it isn't then go straigt to the accept licens screen
|
||||
tempFile.Value = _installer.Import(_repo.fetch(Request.GetItemAsString("guid")));
|
||||
tempFile.Value = _installer.Import(_repo.fetch(Request.GetItemAsString("guid")));
|
||||
UpdateSettings();
|
||||
|
||||
}
|
||||
@@ -212,25 +212,25 @@ namespace umbraco.presentation.developer.packages
|
||||
|
||||
private void ProcessInstall(string currentStep)
|
||||
{
|
||||
var dir = Request.GetItemAsString("dir");
|
||||
var dir = Request.GetItemAsString("dir");
|
||||
var packageId = 0;
|
||||
int.TryParse(Request.GetItemAsString("pId"), out packageId);
|
||||
int.TryParse(Request.GetItemAsString("pId"), out packageId);
|
||||
|
||||
switch (currentStep)
|
||||
{
|
||||
case "businesslogic":
|
||||
//first load in the config from the temporary directory
|
||||
//this will ensure that the installer have access to all the new files and the package manifest
|
||||
_installer.LoadConfig(dir);
|
||||
//first load in the config from the temporary directory
|
||||
//this will ensure that the installer have access to all the new files and the package manifest
|
||||
_installer.LoadConfig(dir);
|
||||
_installer.InstallBusinessLogic(packageId, dir);
|
||||
|
||||
|
||||
//making sure that publishing actions performed from the cms layer gets pushed to the presentation
|
||||
library.RefreshContent();
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(_installer.Control))
|
||||
{
|
||||
Response.Redirect("installer.aspx?installing=customInstaller&dir=" + dir + "&pId=" + packageId.ToString() + "&customControl=" + Server.UrlEncode(_installer.Control) + "&customUrl=" + Server.UrlEncode(_installer.Url));
|
||||
Response.Redirect("installer.aspx?installing=customInstaller&dir=" + dir + "&pId=" + packageId.ToString() + "&customControl=" + Server.UrlEncode(_installer.Control) + "&customUrl=" + Server.UrlEncode(_installer.Url));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -238,50 +238,50 @@ namespace umbraco.presentation.developer.packages
|
||||
}
|
||||
break;
|
||||
case "customInstaller":
|
||||
var customControl = Request.GetItemAsString("customControl");
|
||||
var customControl = Request.GetItemAsString("customControl");
|
||||
|
||||
if (!customControl.IsNullOrWhiteSpace())
|
||||
if (!customControl.IsNullOrWhiteSpace())
|
||||
{
|
||||
HideAllPanes();
|
||||
|
||||
_configControl = new System.Web.UI.UserControl().LoadControl(SystemDirectories.Root + customControl);
|
||||
_configControl = new System.Web.UI.UserControl().LoadControl(SystemDirectories.Root + customControl);
|
||||
_configControl.ID = "packagerConfigControl";
|
||||
|
||||
pane_optional.Controls.Add(_configControl);
|
||||
pane_optional.Visible = true;
|
||||
|
||||
if (!IsPostBack)
|
||||
{
|
||||
//We still need to clean everything up which is normally done in the Finished Action
|
||||
PerformPostInstallCleanup(packageId, dir);
|
||||
}
|
||||
|
||||
if (!IsPostBack)
|
||||
{
|
||||
//We still need to clean everything up which is normally done in the Finished Action
|
||||
PerformPostInstallCleanup(packageId, dir);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
//if the custom installer control is empty here (though it should never be because we've already checked for it previously)
|
||||
//then we should run the normal FinishedAction
|
||||
PerformFinishedAction(packageId, dir, Request.GetItemAsString("customUrl"));
|
||||
//then we should run the normal FinishedAction
|
||||
PerformFinishedAction(packageId, dir, Request.GetItemAsString("customUrl"));
|
||||
}
|
||||
break;
|
||||
case "finished":
|
||||
PerformFinishedAction(packageId, dir, Request.GetItemAsString("customUrl"));
|
||||
PerformFinishedAction(packageId, dir, Request.GetItemAsString("customUrl"));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Perform the 'Finished' action of the installer
|
||||
/// </summary>
|
||||
/// <param name="packageId"></param>
|
||||
/// <param name="dir"></param>
|
||||
/// <param name="url"></param>
|
||||
private void PerformFinishedAction(int packageId, string dir, string url)
|
||||
{
|
||||
HideAllPanes();
|
||||
//string url = _installer.Url;
|
||||
/// <summary>
|
||||
/// Perform the 'Finished' action of the installer
|
||||
/// </summary>
|
||||
/// <param name="packageId"></param>
|
||||
/// <param name="dir"></param>
|
||||
/// <param name="url"></param>
|
||||
private void PerformFinishedAction(int packageId, string dir, string url)
|
||||
{
|
||||
HideAllPanes();
|
||||
//string url = _installer.Url;
|
||||
string packageViewUrl = "installedPackage.aspx?id=" + packageId.ToString();
|
||||
|
||||
bt_viewInstalledPackage.OnClientClick = "document.location = '" + packageViewUrl + "'; return false;";
|
||||
@@ -292,23 +292,23 @@ namespace umbraco.presentation.developer.packages
|
||||
|
||||
pane_success.Visible = true;
|
||||
|
||||
PerformPostInstallCleanup(packageId, dir);
|
||||
}
|
||||
PerformPostInstallCleanup(packageId, dir);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Runs Post install actions such as clearning any necessary cache, reloading the correct tree nodes, etc...
|
||||
/// </summary>
|
||||
/// <param name="packageId"></param>
|
||||
/// <param name="dir"></param>
|
||||
private void PerformPostInstallCleanup(int packageId, string dir)
|
||||
{
|
||||
BasePage.Current.ClientTools.ReloadActionNode(true, true);
|
||||
_installer.InstallCleanUp(packageId, dir);
|
||||
//clear the tree cache
|
||||
ClientTools.ClearClientTreeCache().RefreshTree("packager");
|
||||
TreeDefinitionCollection.Instance.ReRegisterTrees();
|
||||
BizLogicAction.ReRegisterActionsAndHandlers();
|
||||
}
|
||||
/// <summary>
|
||||
/// Runs Post install actions such as clearning any necessary cache, reloading the correct tree nodes, etc...
|
||||
/// </summary>
|
||||
/// <param name="packageId"></param>
|
||||
/// <param name="dir"></param>
|
||||
private void PerformPostInstallCleanup(int packageId, string dir)
|
||||
{
|
||||
BasePage.Current.ClientTools.ReloadActionNode(true, true);
|
||||
_installer.InstallCleanUp(packageId, dir);
|
||||
//clear the tree cache
|
||||
ClientTools.ClearClientTreeCache().RefreshTree("packager");
|
||||
TreeDefinitionCollection.Instance.ReRegisterTrees();
|
||||
BizLogicAction.ReRegisterActionsAndHandlers();
|
||||
}
|
||||
|
||||
//this accepts the package, creates the manifest and then installs the files.
|
||||
protected void startInstall(object sender, System.EventArgs e)
|
||||
@@ -323,11 +323,11 @@ namespace umbraco.presentation.developer.packages
|
||||
//and then copy over the files. This will take some time if it contains .dlls that will reboot the system..
|
||||
_installer.InstallFiles(pId, tempFile.Value);
|
||||
|
||||
//TODO: This is a total hack, we need to refactor the installer to be just like the package installer during the
|
||||
// install process and use AJAX to ensure that app pool restarts and restarts PROPERLY before installing the business
|
||||
// logic. Until then, we are going to put a thread sleep here for 2 seconds in hopes that we always fluke out and the app
|
||||
// pool will be restarted after redirect.
|
||||
Thread.Sleep(2000);
|
||||
//TODO: This is a total hack, we need to refactor the installer to be just like the package installer during the
|
||||
// install process and use AJAX to ensure that app pool restarts and restarts PROPERLY before installing the business
|
||||
// logic. Until then, we are going to put a thread sleep here for 2 seconds in hopes that we always fluke out and the app
|
||||
// pool will be restarted after redirect.
|
||||
Thread.Sleep(2000);
|
||||
|
||||
Response.Redirect("installer.aspx?installing=businesslogic&dir=" + tempFile.Value + "&pId=" + pId.ToString());
|
||||
}
|
||||
@@ -341,5 +341,423 @@ namespace umbraco.presentation.developer.packages
|
||||
pane_success.Visible = false;
|
||||
pane_upload.Visible = false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.UmbracoPanel Panel1;
|
||||
|
||||
/// <summary>
|
||||
/// fb control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Feedback fb;
|
||||
|
||||
/// <summary>
|
||||
/// pane_upload control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_upload;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel9 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel9;
|
||||
|
||||
/// <summary>
|
||||
/// file1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputFile file1;
|
||||
|
||||
/// <summary>
|
||||
/// ButtonLoadPackage control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button ButtonLoadPackage;
|
||||
|
||||
/// <summary>
|
||||
/// progbar1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.ProgressBar progbar1;
|
||||
|
||||
/// <summary>
|
||||
/// pane_authenticate control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_authenticate;
|
||||
|
||||
/// <summary>
|
||||
/// tb_email control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox tb_email;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel1;
|
||||
|
||||
/// <summary>
|
||||
/// tb_password control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox tb_password;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel2 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel2;
|
||||
|
||||
/// <summary>
|
||||
/// Button1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button Button1;
|
||||
|
||||
/// <summary>
|
||||
/// pane_acceptLicense control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Panel pane_acceptLicense;
|
||||
|
||||
/// <summary>
|
||||
/// pane_acceptLicenseInner control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_acceptLicenseInner;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel3 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel3;
|
||||
|
||||
/// <summary>
|
||||
/// LabelName control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelName;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel5 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel5;
|
||||
|
||||
/// <summary>
|
||||
/// LabelAuthor control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelAuthor;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel4 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel4;
|
||||
|
||||
/// <summary>
|
||||
/// LabelMore control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelMore;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel6 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel6;
|
||||
|
||||
/// <summary>
|
||||
/// LabelLicense control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelLicense;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel7 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel7;
|
||||
|
||||
/// <summary>
|
||||
/// acceptCheckbox control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.CheckBox acceptCheckbox;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel8 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel8;
|
||||
|
||||
/// <summary>
|
||||
/// readme control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal readme;
|
||||
|
||||
/// <summary>
|
||||
/// pp_unsecureFiles control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_unsecureFiles;
|
||||
|
||||
/// <summary>
|
||||
/// lt_files control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal lt_files;
|
||||
|
||||
/// <summary>
|
||||
/// pp_macroConflicts control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_macroConflicts;
|
||||
|
||||
/// <summary>
|
||||
/// ltrMacroAlias control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal ltrMacroAlias;
|
||||
|
||||
/// <summary>
|
||||
/// pp_templateConflicts control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_templateConflicts;
|
||||
|
||||
protected global::umbraco.uicontrols.PropertyPanel BinaryFileErrorsPanel;
|
||||
protected global::umbraco.uicontrols.PropertyPanel LegacyPropertyEditorPanel;
|
||||
protected global::System.Web.UI.WebControls.Literal BinaryFileErrorReport;
|
||||
|
||||
/// <summary>
|
||||
/// ltrTemplateAlias control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal ltrTemplateAlias;
|
||||
|
||||
/// <summary>
|
||||
/// pp_stylesheetConflicts control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_stylesheetConflicts;
|
||||
|
||||
/// <summary>
|
||||
/// ltrStylesheetNames control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal ltrStylesheetNames;
|
||||
|
||||
/// <summary>
|
||||
/// _progbar1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.ProgressBar _progbar1;
|
||||
|
||||
/// <summary>
|
||||
/// ButtonInstall control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button ButtonInstall;
|
||||
|
||||
/// <summary>
|
||||
/// pane_installing control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_installing;
|
||||
|
||||
/// <summary>
|
||||
/// progBar2 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.ProgressBar progBar2;
|
||||
|
||||
/// <summary>
|
||||
/// lit_installStatus control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal lit_installStatus;
|
||||
|
||||
/// <summary>
|
||||
/// pane_optional control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_optional;
|
||||
|
||||
/// <summary>
|
||||
/// pane_success control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_success;
|
||||
|
||||
/// <summary>
|
||||
/// bt_viewInstalledPackage control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button bt_viewInstalledPackage;
|
||||
|
||||
/// <summary>
|
||||
/// lit_authorUrl control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal lit_authorUrl;
|
||||
|
||||
/// <summary>
|
||||
/// tempFile control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputHidden tempFile;
|
||||
|
||||
/// <summary>
|
||||
/// processState control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputHidden processState;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,433 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <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.developer.packages {
|
||||
|
||||
|
||||
public partial class Installer {
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.UmbracoPanel Panel1;
|
||||
|
||||
/// <summary>
|
||||
/// fb control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Feedback fb;
|
||||
|
||||
/// <summary>
|
||||
/// pane_upload control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_upload;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel9 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel9;
|
||||
|
||||
/// <summary>
|
||||
/// file1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputFile file1;
|
||||
|
||||
/// <summary>
|
||||
/// ButtonLoadPackage control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button ButtonLoadPackage;
|
||||
|
||||
/// <summary>
|
||||
/// progbar1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.ProgressBar progbar1;
|
||||
|
||||
/// <summary>
|
||||
/// pane_authenticate control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_authenticate;
|
||||
|
||||
/// <summary>
|
||||
/// tb_email control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox tb_email;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel1;
|
||||
|
||||
/// <summary>
|
||||
/// tb_password control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox tb_password;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel2 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel2;
|
||||
|
||||
/// <summary>
|
||||
/// Button1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button Button1;
|
||||
|
||||
/// <summary>
|
||||
/// pane_acceptLicense control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Panel pane_acceptLicense;
|
||||
|
||||
/// <summary>
|
||||
/// pane_acceptLicenseInner control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_acceptLicenseInner;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel3 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel3;
|
||||
|
||||
/// <summary>
|
||||
/// LabelName control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelName;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel5 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel5;
|
||||
|
||||
/// <summary>
|
||||
/// LabelAuthor control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelAuthor;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel4 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel4;
|
||||
|
||||
/// <summary>
|
||||
/// LabelMore control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelMore;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel6 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel6;
|
||||
|
||||
/// <summary>
|
||||
/// LabelLicense control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label LabelLicense;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel7 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel7;
|
||||
|
||||
/// <summary>
|
||||
/// acceptCheckbox control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.CheckBox acceptCheckbox;
|
||||
|
||||
/// <summary>
|
||||
/// PropertyPanel8 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel PropertyPanel8;
|
||||
|
||||
/// <summary>
|
||||
/// readme control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal readme;
|
||||
|
||||
/// <summary>
|
||||
/// pp_unsecureFiles control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_unsecureFiles;
|
||||
|
||||
/// <summary>
|
||||
/// lt_files control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal lt_files;
|
||||
|
||||
/// <summary>
|
||||
/// pp_macroConflicts control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_macroConflicts;
|
||||
|
||||
/// <summary>
|
||||
/// ltrMacroAlias control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal ltrMacroAlias;
|
||||
|
||||
/// <summary>
|
||||
/// pp_templateConflicts control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_templateConflicts;
|
||||
|
||||
protected global::umbraco.uicontrols.PropertyPanel BinaryFileErrorsPanel;
|
||||
protected global::umbraco.uicontrols.PropertyPanel LegacyPropertyEditorPanel;
|
||||
protected global::System.Web.UI.WebControls.Literal BinaryFileErrorReport;
|
||||
|
||||
/// <summary>
|
||||
/// ltrTemplateAlias control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal ltrTemplateAlias;
|
||||
|
||||
/// <summary>
|
||||
/// pp_stylesheetConflicts control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.PropertyPanel pp_stylesheetConflicts;
|
||||
|
||||
/// <summary>
|
||||
/// ltrStylesheetNames control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal ltrStylesheetNames;
|
||||
|
||||
/// <summary>
|
||||
/// _progbar1 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.ProgressBar _progbar1;
|
||||
|
||||
/// <summary>
|
||||
/// ButtonInstall control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button ButtonInstall;
|
||||
|
||||
/// <summary>
|
||||
/// pane_installing control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_installing;
|
||||
|
||||
/// <summary>
|
||||
/// progBar2 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.ProgressBar progBar2;
|
||||
|
||||
/// <summary>
|
||||
/// lit_installStatus control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal lit_installStatus;
|
||||
|
||||
/// <summary>
|
||||
/// pane_optional control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_optional;
|
||||
|
||||
/// <summary>
|
||||
/// pane_success control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::umbraco.uicontrols.Pane pane_success;
|
||||
|
||||
/// <summary>
|
||||
/// bt_viewInstalledPackage control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Button bt_viewInstalledPackage;
|
||||
|
||||
/// <summary>
|
||||
/// lit_authorUrl control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal lit_authorUrl;
|
||||
|
||||
/// <summary>
|
||||
/// tempFile control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputHidden tempFile;
|
||||
|
||||
/// <summary>
|
||||
/// processState control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlInputHidden processState;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user