Skip to content

Commit 2a0e3d8

Browse files
nul800sebastiaannul800sebastiaan
committed
Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1
2 parents 670a672 + 0bedf09 commit 2a0e3d8

File tree

14 files changed

+89
-27
lines changed

14 files changed

+89
-27
lines changed

‎src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ angular.module("umbraco.directives.html")
2626

2727

2828
var imagesOnly = element.attr('images-only') === "true";
29+
30+
2931
var margin = element.attr('border') ? parseInt(element.attr('border'), 10) : 5;
3032
var startingIndex = element.attr('baseline') ? parseInt(element.attr('baseline'), 10) : 0;
3133
var minWidth = element.attr('min-width') ? parseInt(element.attr('min-width'), 10) : 420;

‎src/Umbraco.Web.UI.Client/src/common/services/util.service.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
259259

260260
//first fill in all of the original image sizes and URLs
261261
for (var i = startingIndex; i < images.length; i++) {
262-
var item = images[0];
262+
var item = images[i];
263263

264-
this.setImageData(images[i]);
265-
this.setOriginalSize(images[i], maxRowHeight);
264+
this.setImageData(item);
265+
this.setOriginalSize(item, maxRowHeight);
266266

267267
if(imagesOnly && !item.isFolder && !item.thumbnail){
268268
images.splice(i, 1);

‎src/Umbraco.Web.UI.Client/src/installer/steps/user.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ <h1>Install Umbraco 7</h1>
3131
<input type="text" name="installer.current.model.password"
3232
ng-minlength="{{installer.current.model.minCharLength}}"
3333
ng-pattern="passwordPattern"
34+
autocorrect="off"
35+
autocapitalize="off"
3436
required
3537
ng-model="installer.current.model.password" />
3638
<small class="inline-help">At least {{installer.current.model.minCharLength}} characters long</small>

‎src/Umbraco.Web.UI.Client/src/less/listview.less

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
}
8888

8989
.umb-listview .selected i.icon, .umb-listview tr:hover i.icon{display: none}
90-
.umb-listview .selected input[type="checkbox"], .umb-listview tr:hover input[type="checkbox"]{display: inline-block;}
90+
.umb-listview .selected input[type="checkbox"],
91+
.umb-listview tr:hover input[type="checkbox"]{display: inline-block !important;}
9192
.umb-listview .inactive{color: @grayLight;}
9293

9394
.umb-listview .selected td{font-weight: bold;}
@@ -171,10 +172,14 @@
171172
position: relative
172173
}
173174

175+
176+
.umb-listview .table-striped thead input[type="checkbox"] {
177+
margin-left: 7px;
178+
}
179+
174180
.umb-listview .table-striped tbody input[type="checkbox"] {
175181
display: none;
176-
top: 10px;
177-
left:10px;
182+
margin-left: 7px;
178183
z-index: 5;
179184
}
180185

‎src/Umbraco.Web.UI.Client/src/less/property-editors.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ ul.color-picker li a {
398398

399399
.umb-photo-folder .umb-non-thumbnail i{
400400
color: @grayLight;
401-
font-size: 70px;
402-
line-height: 80px;
401+
font-size: 50px;
402+
line-height: 60px;
403403
display: block;
404404
margin: auto;
405405
padding-top: 20px;

‎src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,14 @@
100100
<div class="umb-panel-body with-footer">
101101
<div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader"
102102
ng-hide="active() == 0"></div>
103-
104103
<umb-photo-folder
105-
min-height="75"
104+
min-height="105"
106105
min-width="150"
107106
max-height="250"
108107
ideal-items-per-row="3"
109108
on-click="clickHandler"
110109
ng-model="images"
111-
images-only="true"
110+
images-only="{{onlyImages}}"
112111
filter-by="searchTerm"/>
113112
</div>
114113

‎src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</umb-upload-dropzone>
2121

2222
<umb-photo-folder
23-
min-height="100"
23+
min-height="105"
2424
min-width="220"
2525
on-click="clickHandler"
2626
ng-model="images" />

‎src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,6 +2075,9 @@
20752075
<Content Include="Web.config">
20762076
<SubType>Designer</SubType>
20772077
</Content>
2078+
<Content Include="Views\Post.cshtml">
2079+
<SubType>Code</SubType>
2080+
</Content>
20782081
<None Include="Web.Debug.config.transformed" />
20792082
<None Include="web.Template.Debug.config">
20802083
<DependentUpon>Web.Template.config</DependentUpon>

‎src/Umbraco.Web/Editors/UpdateCheckController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public UpgradeCheckResponse GetCheck()
2424
{
2525
try
2626
{
27-
var check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();
27+
var check = new org.umbraco.update.CheckForUpgrade();
2828
var result = check.CheckUpgrade(UmbracoVersion.Current.Major,
2929
UmbracoVersion.Current.Minor,
3030
UmbracoVersion.Current.Build,

‎src/Umbraco.Web/Install/Controllers/InstallController.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ public ActionResult Index()
6969
//get the base umbraco folder
7070
ViewBag.UmbracoBaseFolder = IOHelper.ResolveUrl(SystemDirectories.Umbraco);
7171

72+
InstallHelper ih = new InstallHelper(_umbracoContext);
73+
ih.InstallStatus(false, "");
74+
7275
//always ensure full path (see NOTE in the class remarks)
7376
return View(GlobalSettings.Path.EnsureEndsWith('/') + "install/views/index.cshtml");
7477
}

‎src/Umbraco.Web/Install/InstallHelper.cs

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
using System.Web;
88
using System.Web.Script.Serialization;
99
using System.Web.UI;
10+
using umbraco.BusinessLogic;
1011
using Umbraco.Core;
1112
using Umbraco.Core.Configuration;
1213
using Umbraco.Core.IO;
1314
using Umbraco.Core.Persistence;
1415
using Umbraco.Web.Install.InstallSteps;
1516
using Umbraco.Web.Install.Models;
1617

18+
1719
namespace Umbraco.Web.Install
1820
{
1921
internal class InstallHelper
@@ -88,8 +90,50 @@ internal void DeleteLegacyInstaller()
8890
if (Directory.Exists(IOHelper.MapPath("~/Areas/UmbracoInstall")))
8991
{
9092
Directory.Delete(IOHelper.MapPath("~/Areas/UmbracoInstall"), true);
93+
}
94+
}
95+
96+
internal void InstallStatus(bool isCompleted, string errorMsg)
97+
{
98+
try
99+
{
100+
string userAgent = _umbContext.HttpContext.Request.UserAgent;
101+
102+
// Check for current install Id
103+
Guid installId = Guid.NewGuid();
104+
StateHelper.Cookies.Cookie installCookie = new StateHelper.Cookies.Cookie("umb_installId", 1);
105+
if (!String.IsNullOrEmpty(installCookie.GetValue()))
106+
{
107+
if (Guid.TryParse(installCookie.GetValue(), out installId))
108+
{
109+
// check that it's a valid Guid
110+
if (installId == Guid.Empty)
111+
installId = Guid.NewGuid();
112+
}
113+
}
114+
installCookie.SetValue(installId.ToString());
115+
116+
string dbProvider = String.Empty;
117+
if (!IsBrandNewInstall)
118+
dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
119+
120+
org.umbraco.update.CheckForUpgrade check = new org.umbraco.update.CheckForUpgrade();
121+
check.Install(installId,
122+
!IsBrandNewInstall,
123+
isCompleted,
124+
DateTime.Now,
125+
UmbracoVersion.Current.Major,
126+
UmbracoVersion.Current.Minor,
127+
UmbracoVersion.Current.Build,
128+
UmbracoVersion.CurrentComment,
129+
errorMsg,
130+
userAgent,
131+
dbProvider);
132+
}
133+
catch (Exception ex)
134+
{
135+
91136
}
92-
93137
}
94138

95139
/// <summary>

‎src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ public override InstallSetupResult Execute(object model)
4848
//// login token from a previous version when we didn't have csrf tokens in place
4949
//var security = new WebSecurity(new HttpContextWrapper(Context), ApplicationContext.Current);
5050
//security.ClearCurrentLogin();
51+
52+
//reports the ended install
53+
InstallHelper ih = new InstallHelper(UmbracoContext.Current);
54+
ih.InstallStatus(true, "");
55+
5156
return null;
5257
}
5358

‎src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
4-
// Runtime Version:4.0.30319.18034
4+
// Runtime Version:4.0.30319.18444
55
//
66
// Changes to this file may cause incorrect behavior and will be lost if
77
// the code is regenerated.
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

1111
//
12-
// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18034.
12+
// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18444.
1313
//
1414
#pragma warning disable 1591
1515

16-
namespace umbraco.presentation.org.umbraco.update
17-
{
16+
namespace Umbraco.Web.org.umbraco.update {
1817
using System;
1918
using System.Web.Services;
2019
using System.Diagnostics;
@@ -24,7 +23,7 @@ namespace umbraco.presentation.org.umbraco.update
2423

2524

2625
/// <remarks/>
27-
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
26+
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
2827
[System.Diagnostics.DebuggerStepThroughAttribute()]
2928
[System.ComponentModel.DesignerCategoryAttribute("code")]
3029
[System.Web.Services.WebServiceBindingAttribute(Name="CheckForUpgradeSoap", Namespace="http://update.umbraco.org/")]
@@ -181,7 +180,7 @@ private bool IsLocalFileSystemWebService(string url) {
181180
}
182181

183182
/// <remarks/>
184-
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18034")]
183+
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18408")]
185184
[System.SerializableAttribute()]
186185
[System.Diagnostics.DebuggerStepThroughAttribute()]
187186
[System.ComponentModel.DesignerCategoryAttribute("code")]
@@ -226,7 +225,7 @@ public string UpgradeUrl {
226225
}
227226

228227
/// <remarks/>
229-
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18034")]
228+
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.18408")]
230229
[System.SerializableAttribute()]
231230
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://update.umbraco.org/")]
232231
public enum UpgradeType {
@@ -254,15 +253,15 @@ public enum UpgradeType {
254253
}
255254

256255
/// <remarks/>
257-
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
256+
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
258257
public delegate void InstallCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
259258

260259
/// <remarks/>
261-
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
260+
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
262261
public delegate void CheckUpgradeCompletedEventHandler(object sender, CheckUpgradeCompletedEventArgs e);
263262

264263
/// <remarks/>
265-
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.17929")]
264+
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
266265
[System.Diagnostics.DebuggerStepThroughAttribute()]
267266
[System.ComponentModel.DesignerCategoryAttribute("code")]
268267
public partial class CheckUpgradeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {

‎src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public UpgradeResult CallUpgradeService()
2626
{
2727
if (!AuthorizeRequest()) return null;
2828

29-
var check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();
30-
org.umbraco.update.UpgradeResult result = check.CheckUpgrade(UmbracoVersion.Current.Major,
29+
var check = new global::Umbraco.Web.org.umbraco.update.CheckForUpgrade();
30+
var result = check.CheckUpgrade(UmbracoVersion.Current.Major,
3131
UmbracoVersion.Current.Minor,
3232
UmbracoVersion.Current.Build,
3333
UmbracoVersion.CurrentComment);
@@ -74,7 +74,7 @@ public void InstallStatus(bool isCompleted, string userAgent, string errorMsg)
7474
if (!String.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
7575
dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
7676

77-
org.umbraco.update.CheckForUpgrade check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();
77+
var check = new global::Umbraco.Web.org.umbraco.update.CheckForUpgrade();
7878
check.Install(installId,
7979
isUpgrade,
8080
isCompleted,

0 commit comments

Comments
 (0)