diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config index 09fd6b24f3..a5295ad028 100644 --- a/src/Umbraco.Tests/App.config +++ b/src/Umbraco.Tests/App.config @@ -63,6 +63,11 @@ + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpasswordtoggle.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpasswordtoggle.directive.js index 30cfaf88b2..d75b9e2de0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpasswordtoggle.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpasswordtoggle.directive.js @@ -1,6 +1,9 @@ (function () { 'use strict'; + // comes from https://codepen.io/jakob-e/pen/eNBQaP + // works fine with Angular 1.6.5 - alas not with 1.1.5 - binding issue + function PasswordToggleDirective($compile) { var directive = { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js index 18158a5ff2..3712324132 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js @@ -16,7 +16,13 @@ maxFileSize: Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB", acceptedFileTypes: mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes), uploaded: false - } + } + $scope.togglePassword = function () { + console.log('toggle'); + var elem = $("form[name='loginForm'] input[name='password']"); + console.log(elem); + elem.attr("type", (elem.attr("type") === "text" ? "password" : "text")); + } function init() { // Check if it is a new user @@ -48,7 +54,7 @@ ]).then(function () { $scope.inviteStep = Number(inviteVal); - + }); } } @@ -82,7 +88,7 @@ var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10); // set percentage property on file - $scope.avatarFile.uploadProgress = progressPercentage; + $scope.avatarFile.uploadProgress = progressPercentage; } }).success(function (data, status, headers, config) { @@ -149,11 +155,11 @@ //error formHelper.handleError(err); - + $scope.invitedUserPasswordModel.buttonState = "error"; }); - } + } }; var setFieldFocus = function (form, field) { @@ -180,7 +186,7 @@ } function resetInputValidation() { - $scope.confirmPassword = ""; + $scope.confirmPassword = ""; $scope.password = ""; $scope.login = ""; if ($scope.loginForm) { @@ -255,7 +261,7 @@ //TODO: Do validation properly like in the invite password update - //if the login and password are not empty we need to automatically + //if the login and password are not empty we need to automatically // validate them - this is because if there are validation errors on the server // then the user has to change both username & password to resubmit which isn't ideal, // so if they're not empty, we'll just make sure to set them to valid. @@ -289,7 +295,7 @@ }); //setup a watch for both of the model values changing, if they change - // while the form is invalid, then revalidate them so that the form can + // while the form is invalid, then revalidate them so that the form can // be submitted again. $scope.loginForm.username.$viewChangeListeners.push(function () { if ($scope.loginForm.username.$invalid) { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html index a1913d76e7..6505af4de9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html @@ -149,8 +149,9 @@
- -
+
+ Toggle +
diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx index d46ecd6113..ac8504ce45 100644 --- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx +++ b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx @@ -1,7 +1,7 @@ -<%@ Page Language="C#" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Config.Splashes.NoNodes" CodeBehind="NoNodes.aspx.cs" %> -<%@ Import Namespace="Umbraco.Core.Configuration" %> +<%@ Page Language="C#" AutoEventWireup="true"%> <%@ Import Namespace="Umbraco.Core.IO" %> - +<%@ Import Namespace="Umbraco.Deploy.UI" %> +<%@ Import Namespace="Umbraco.Web" %> @@ -11,51 +11,146 @@ - + - + + + + + + + +<% if(HttpContext.Current.Request.IsLocal == false){ %>
-
-
- +
+
+ -

Welcome to your Umbraco installation

-

You're seeing this wonderful page because your website doesn't contain any published content yet.

+

Welcome to your Umbraco installation

+

You're seeing the wonderful page because your website doesn't contain any published content yet.

-
- Open Umbraco -
+
+ Open Umbraco +
-
-
-

Easy start with Umbraco.tv

-

We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.

- - Umbraco.tv → -
+
+
+

Easy start with Umbraco.tv

+

We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.

-
-

Be a part of the community

-

The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.

- - our.Umbraco → -
-
+ Umbraco.tv → +
-
-
+
+

Be a part of the community

+

The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we’re sure that you can get your answers from the community.

+ + our.Umbraco → +
+
+ +
+ + + +<% }else{ %> + +
+
+ +
+ + +
+ +
+ +

Initializing your website...

+ +
+ Press the button below to get started +
+ +
+
+
+ +
+

Restore from Umbraco Cloud

+
+ + or Skip restore and open Umbraco +
+
+ +
+

{{ vm.restore.restoreMessage }}

+

{{ vm.restore.restoreProgress }}% restored

+ {{ vm.restore.currentActivity }} +
{{ vm.restore.timestamp }}
+
+ +
+

Ready to rock n' roll!

+

Everything has been restored and is ready for use, click below to open Umbraco

+
+ Open Umbraco +
+
+ + + + +
+
+
+ + <%--
+

An error occurred:

+

{{ vm.restore.error.exceptionMessage }}

+ Show details + 
{{ vm.restore.error.log }}
+
--%> + +
+ +
+
- - +<%= NoNodesHelper.ServerVariables(HttpContext.Current.Request.RequestContext, UmbracoContext.Current) %> + + + + + + + + + + +<% } %> - + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config index 01e5fdcc37..d322439fba 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.config @@ -10,12 +10,12 @@ umbracoWidth - umbracoHeight + umbracoHeight umbracoBytes umbracoExtension - + @@ -98,9 +98,9 @@ error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page. Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. --> throw - + - ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,svg,php,htaccess + ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,php,htaccess @@ -109,13 +109,13 @@ Textstring false - + - true - + true + assets/img/installer.jpg - + @@ -124,7 +124,7 @@ false - + true @@ -209,7 +209,7 @@ - @@ -237,40 +237,40 @@ - - - + + @@ -288,7 +288,7 @@ -