Skip to content

Commit 80a4ad4

Browse files
JeavonJeavon
committed
Installer WIP
1 parent 25aaa54 commit 80a4ad4

File tree

4 files changed

+52
-55
lines changed

4 files changed

+52
-55
lines changed

‎src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Controllers/Configure.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
$scope.saved = false;
66

77
// Ajax request to controller for data-
8-
$http.get(getDataUrl).success(function (data) {
9-
$scope.parameters = data;
8+
$http.get(getDataUrl).then(function (response) {
9+
$scope.parameters = response.data;
1010
});
1111

1212
$scope.submitForm = function (e) {

‎src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/Configure.htm‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
 <div ng-controller="Loader">
2-
<div class="row">
3-
<div class="span1">
4-
<img src="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/azure-logo-32.png"/>
5-
</div>
6-
<div><h4>Umbraco Azure File System Provider</h4></div>
7-
</div>
8-
<div class="row">
9-
<div><hr /></div>
10-
</div>
11-
<div class="row" ng-show="!saved">
12-
<div>
13-
<fieldset>
14-
<legend><h4>To complete installation, please enter the required parameters for the Azure storage provider below</h4></legend>
15-
<form name="paramForm" class="form-horizontal" role="form">
16-
<div ng-repeat="param in parameters" class="control-group">
17-
<ng-form name="form">
18-
<label class="control-label" for="param.key">{{ capitalizeFirstLetter(param.key) }}</label>
19-
<div class="controls">
20-
<span ng-if="getInputType(param.key) === 'checkbox'" ng-include="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/checkbox.htm"></span>
21-
<span ng-if="getInputType(param.key) === 'text'" ng-include="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/textfield.htm"></span>
22-
</div>
23-
<span data-ng-show=" {{'form.'+param.key+'.$dirty && form.'+param.key+'.$error.required'}}">Required!</span>
24-
</ng-form>
25-
</div>
26-
<button preventDefault class="btn btn-primary" ng-disabled="paramForm.$invalid" ng-click="submitForm($event)">Save</button>
27-
</form>
28-
</fieldset>
29-
</div>
1+
<div ng-controller="Loader">
2+
<div class="row">
3+
<div class="span1">
4+
<img src="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/azure-logo-32.png" />
305
</div>
31-
<div class="row" ng-show="!saved">
32-
<div><hr /></div>
6+
<div><h4>Umbraco Azure File System Provider</h4></div>
7+
</div>
8+
<div class="row">
9+
<div><hr /></div>
10+
</div>
11+
<div class="row" ng-show="!saved">
12+
<div>
13+
<fieldset>
14+
<legend><h4>To complete installation, please enter the required parameters for the Azure storage provider below</h4></legend>
15+
<form name="paramForm" class="form-horizontal" role="form">
16+
<div ng-repeat="param in parameters" class="control-group">
17+
<ng-form name="form">
18+
<label class="control-label" for="param.key">{{ capitalizeFirstLetter(param.key) }}</label>
19+
<div class="controls">
20+
<span ng-if="getInputType(param.key) === 'checkbox'" ng-include="'/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/checkbox.htm'"></span>
21+
<span ng-if="getInputType(param.key) === 'text'" ng-include="'/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Views/textfield.htm'"></span>
22+
</div>
23+
<span data-ng-show="{{'form.' + param.key + '.$dirty && form.' + param.key + '.$error.required'}}">Required!</span>
24+
</ng-form>
25+
</div>
26+
<button preventDefault class="btn btn-primary" ng-disabled="paramForm.$invalid" ng-click="submitForm($event)">Save</button>
27+
</form>
28+
</fieldset>
3329
</div>
30+
</div>
31+
<div class="row" ng-show="!saved">
32+
<div><hr /></div>
33+
</div>
3434

35-
<div class="row">
36-
<div>
37-
<div class="alert alert-success" ng-show="saved && (status === 'Ok' || status === 'ImageProcessorWebCompatibility' || status === 'ImageProcessorWebConfigError')">
38-
The Azure storage provider was sucessfully configured and your media is now as light as candyfloss
39-
</div>
40-
<div class="alert alert-info" ng-show="saved && status === 'ImageProcessorWebCompatibility'">
41-
<strong>Warning!</strong> You need to upgrade the installed version of ImageProcessor.Web to v4.3.2+ (reinstall this package once you've updated) to be fully compatible with this package <a href="https://our.umbraco.org/projects/collaboration/imageprocessor/" target="_blank">https://our.umbraco.org/projects/collaboration/imageprocessor/</a>
42-
</div>
43-
<div class="alert alert-info" ng-show="saved && status === 'ImageProcessorWebConfigError'">
44-
<strong>Warning!</strong> The installer was unable to configure ImageProcessor.Web, please see documentation to fix the issue <a href="https://our.umbraco.org/projects/collaboration/umbracofilesystemprovidersazure/" target="_blank">https://our.umbraco.org/projects/collaboration/umbracofilesystemprovidersazure/</a>
45-
</div>
46-
<div class="alert alert-error" ng-show="saved && status != 'Ok' && status != 'ImageProcessorWebCompatibility'">
47-
<strong>Oh no</strong>, something went wrong saving, please check Umbraco log files for exceptions
48-
</div>
49-
<div class="alert alert-error" ng-show="!saved && status === 'ConnectionError'">
50-
<strong>Oh no</strong>, there was something wrong with your Azure connection string, please check and try again, more info in the Umbraco log files
51-
</div>
35+
<div class="row">
36+
<div>
37+
<div class="alert alert-success" ng-show="saved && (status === 'Ok' || status === 'ImageProcessorWebCompatibility' || status === 'ImageProcessorWebConfigError')">
38+
The Azure storage provider was sucessfully configured and your media is now as light as candyfloss
39+
</div>
40+
<div class="alert alert-info" ng-show="saved && status === 'ImageProcessorWebCompatibility'">
41+
<strong>Warning!</strong> You need to upgrade the installed version of ImageProcessor.Web to v4.3.2+ (reinstall this package once you've updated) to be fully compatible with this package <a href="https://our.umbraco.org/projects/collaboration/imageprocessor/" target="_blank">https://our.umbraco.org/projects/collaboration/imageprocessor/</a>
42+
</div>
43+
<div class="alert alert-info" ng-show="saved && status === 'ImageProcessorWebConfigError'">
44+
<strong>Warning!</strong> The installer was unable to configure ImageProcessor.Web, please see documentation to fix the issue <a href="https://our.umbraco.org/projects/collaboration/umbracofilesystemprovidersazure/" target="_blank">https://our.umbraco.org/projects/collaboration/umbracofilesystemprovidersazure/</a>
45+
</div>
46+
<div class="alert alert-error" ng-show="saved && status != 'Ok' && status != 'ImageProcessorWebCompatibility'">
47+
<strong>Oh no</strong>, something went wrong saving, please check Umbraco log files for exceptions
48+
</div>
49+
<div class="alert alert-error" ng-show="!saved && status === 'ConnectionError'">
50+
<strong>Oh no</strong>, there was something wrong with your Azure connection string, please check and try again, more info in the Umbraco log files
5251
</div>
5352
</div>
54-
5553
</div>
54+
55+
</div>

‎src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,11 @@ namespace Our.Umbraco.FileSystemProviders.Azure.Installer
1919
using global::Umbraco.Core;
2020
using global::Umbraco.Core.Composing;
2121
using global::Umbraco.Core.Logging;
22-
using global::Umbraco.Core.Xml;
2322
using global::Umbraco.Web.Mvc;
2423
using global::Umbraco.Web.WebApi;
2524
using Microsoft.WindowsAzure.Storage;
2625
using Microsoft.WindowsAzure.Storage.Blob;
2726
using Models;
28-
using System.Runtime.CompilerServices;
29-
using Our.Umbraco.FileSystemProviders.Azure.Helpers;
3027

3128
/// <summary>
3229
/// The installer controller for managing installer logic.

‎src/UmbracoFileSystemProviders.Azure/Helpers/XmlHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Our.Umbraco.FileSystemProviders.Azure.Helpers
1+
namespace Our.Umbraco.FileSystemProviders.Azure
22
{
33
using System;
44
using System.Collections.Generic;

0 commit comments

Comments
 (0)