Skip to content

Commit 570add9

Browse files
committed
Fix for #47 - we don't support Umbraco v6 anymore so removing conditional code. If we did we could use https://github.com/HashTagDotNet/Semantic-Version.Net for version passing instead of System.Version
1 parent b0428bb commit 570add9

File tree

3 files changed

+3
-37
lines changed

3 files changed

+3
-37
lines changed

src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/Configure.ascx

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
<%@ Control Language="c#" AutoEventWireup="True" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
2-
<%@ Import Namespace="Our.Umbraco.FileSystemProviders.Azure.Installer" %>
32

4-
<%
5-
string angularSrc = "/umbraco/lib/angular/1.1.5/angular.min.js";
6-
string span = string.Empty;
7-
if (Helpers.GetUmbracoVersion().Major < 7)
8-
{
9-
angularSrc = "//cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular.js";
10-
span = " class=\"span12\"";
11-
%>
12-
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap.css" type="text/css" rel="stylesheet"/>
13-
<%
14-
}
15-
%>
16-
17-
<script src="<%=angularSrc%>"></script>
3+
<script src="/umbraco/lib/angular/1.1.5/angular.min.js"></script>
184
<script src="/App_Plugins/UmbracoFileSystemProviders/Azure/Install/Configurator/Controllers/Configure.js"></script>
195

206
<div ng-app ="UFSPLoader">
@@ -29,7 +15,7 @@
2915
<div><hr /></div>
3016
</div>
3117
<div class="row" ng-show="!saved">
32-
<div<%=span %>>
18+
<div>
3319
<fieldset>
3420
<legend><h4>To complete installation, please enter the required parameters for the Azure storage provider below</h4></legend>
3521
<form name="paramForm" class="form-horizontal" role="form">
@@ -53,7 +39,7 @@
5339
</div>
5440

5541
<div class="row">
56-
<div<%=span %>>
42+
<div>
5743
<div class="alert alert-success" ng-show="saved && (status === 'Ok' || status === 'ImageProcessorWebCompatibility' || status === 'ImageProcessorWebConfigError')">
5844
The Azure storage provider was sucessfully configured and your media is now as light as candyfloss
5945
</div>

src/UmbracoFileSystemProviders.Azure.Installer/Helpers.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@
255255
<ItemGroup>
256256
<Compile Include="Constants.cs" />
257257
<Compile Include="Enums\InstallerStatus.cs" />
258-
<Compile Include="Helpers.cs" />
259258
<Compile Include="Properties\AssemblyInfo.cs" />
260259
<Compile Include="Models\Parameter.cs" />
261260
<Compile Include="InstallerController.cs" />

0 commit comments

Comments
 (0)