Merge branch 'temp-U4-10409' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10409
This commit is contained in:
Sebastiaan Janssen
@@ -119,14 +119,4 @@
|
||||
</control>
|
||||
</tab>
|
||||
</section>
|
||||
<section alias="Deploy">
|
||||
<areas>
|
||||
<area>content</area>
|
||||
</areas>
|
||||
<tab caption="Deploy">
|
||||
<control>
|
||||
/App_Plugins/Deploy/views/dashboards/dashboard.html
|
||||
</control>
|
||||
</tab>
|
||||
</section>
|
||||
</dashBoard>
|
||||
@@ -1,7 +1,7 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true"%>
|
||||
<%@ Page Language="C#" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Config.Splashes.NoNodes" CodeBehind="NoNodes.aspx.cs" %>
|
||||
<%@ Import Namespace="Umbraco.Core.Configuration" %>
|
||||
<%@ Import Namespace="Umbraco.Core.IO" %>
|
||||
<%@ Import Namespace="Umbraco.Deploy.UI" %>
|
||||
<%@ Import Namespace="Umbraco.Web" %>
|
||||
|
||||
<!doctype html>
|
||||
<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
|
||||
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
|
||||
@@ -11,145 +11,51 @@
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
|
||||
|
||||
|
||||
<title></title>
|
||||
<meta name="description" content="">
|
||||
<meta name="author" content="">
|
||||
|
||||
<link href='//fonts.googleapis.com/css?family=Open+Sans:300,400,700,600' rel='stylesheet' type='text/css'>
|
||||
<link href='//fonts.googleapis.com/css?family=Asap:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
|
||||
|
||||
<link rel="stylesheet" href="<%=IOHelper.ResolveUrl(SystemDirectories.Umbraco)%>/assets/css/nonodes.style.min.css" />
|
||||
<link rel="stylesheet" href="<%=IOHelper.ResolveUrl(SystemDirectories.AppPlugins)%>/deploy/assets/css/deploy.css" />
|
||||
|
||||
<!--[if lt IE 9]>
|
||||
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js"></script>
|
||||
<![endif]-->
|
||||
<link rel="stylesheet" href="../../Umbraco/assets/css/nonodes.style.min.css" />
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<% if(HttpContext.Current.Request.IsLocal == false){ %>
|
||||
<section>
|
||||
<article>
|
||||
<div>
|
||||
<div class="logo"></div>
|
||||
<article>
|
||||
<div>
|
||||
<div class="logo"></div>
|
||||
|
||||
<h1>Welcome to your Umbraco installation</h1>
|
||||
<h3>You're seeing the wonderful page because your website doesn't contain any published content yet.</h3>
|
||||
<h1>Welcome to your Umbraco installation</h1>
|
||||
<h3>You're seeing this wonderful page because your website doesn't contain any published content yet.</h3>
|
||||
|
||||
<div class="cta">
|
||||
<a href="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>" class="button">Open Umbraco</a>
|
||||
</div>
|
||||
<div class="cta">
|
||||
<a href="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>" class="button">Open Umbraco</a>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<h2>Easy start with Umbraco.tv</h2>
|
||||
<p>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.</p>
|
||||
|
||||
<a href="http://umbraco.tv?ref=tvFromInstaller" target="_blank">Umbraco.tv →</a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<h2>Easy start with Umbraco.tv</h2>
|
||||
<p>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.</p>
|
||||
|
||||
<a href="http://umbraco.tv?ref=tvFromInstaller" target="_blank">Umbraco.tv →</a>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<h2>Be a part of the community</h2>
|
||||
<p>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.</p>
|
||||
|
||||
<a href="http://our.umbraco.org?ref=ourFromInstaller" target="_blank">our.Umbraco →</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<h2>Be a part of the community</h2>
|
||||
<p>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.</p>
|
||||
|
||||
<a href="http://our.umbraco.org?ref=ourFromInstaller" target="_blank">our.Umbraco →</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</article>
|
||||
</section>
|
||||
|
||||
<% }else{ %>
|
||||
|
||||
<section ng-controller="Umbraco.NoNodes.Controller as vm">
|
||||
<article class="ud-nonodes">
|
||||
|
||||
<div>
|
||||
<div class="logo"></div>
|
||||
|
||||
<div>
|
||||
|
||||
<div ng-if="vm.restore.status === ''">
|
||||
|
||||
<div ng-if="!vm.requiresInitialization">
|
||||
<h1>Initializing...</h1>
|
||||
<small>Please wait while your site is loaded</small>
|
||||
</div>
|
||||
|
||||
<p ng-show="vm.restore.restoreProgress">{{ vm.restore.restoreProgress }}% restored</p>
|
||||
<small ng-show="vm.restore.currentActivity">{{ vm.restore.currentActivity }}</small>
|
||||
|
||||
<div ng-if="vm.requiresInitialization">
|
||||
<h1>Initialize your site...</h1>
|
||||
<small>Press the button below to get started</small>
|
||||
<div class="cta">
|
||||
<button class="button" ng-click="vm.restoreSchema()">Go!</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="vm.restore.status === 'ready'">
|
||||
<h1>Restore from Umbraco Cloud</h1>
|
||||
<div class="cta">
|
||||
<button class="button" ng-click="vm.restoreData()">Restore</button>
|
||||
<small><span>or</span> <a ng-href="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>">Skip restore and open Umbraco</a></small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="vm.restore.status === 'inProgress'">
|
||||
<h1>Restoring your website...</h1>
|
||||
<p>{{ vm.restore.restoreProgress }}% restored</p>
|
||||
<small>{{ vm.restore.currentActivity }}</small>
|
||||
</div>
|
||||
|
||||
<div ng-if="vm.restore.status === 'completed'">
|
||||
<h1>Ready to rock n' roll!</h1>
|
||||
<p>Everything has been restored and is ready for use, click below to open Umbraco</p>
|
||||
<div class="cta">
|
||||
<a href="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>" class="button">Open Umbraco</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ud-error
|
||||
ng-if="vm.restore.error.hasError"
|
||||
comment="vm.restore.error.comment"
|
||||
log="vm.restore.error.log"
|
||||
exception="vm.restore.error.exception"
|
||||
status="vm.restore.status"
|
||||
class="ud-restore-error"
|
||||
no-nodes="true">
|
||||
</ud-error>
|
||||
|
||||
<%--<div ng-if="vm.restore.error.hasError" class="json">
|
||||
<h1 style="margin-top: 0;">An error occurred: </h1>
|
||||
<h2 ng-if="vm.restore.error.exceptionMessage">{{ vm.restore.error.exceptionMessage }}</h2>
|
||||
<a href="#" ng-click="vm.showLog()" ng-hide="vm.logIsvisible">Show details</a>
|
||||
<pre ng-if="vm.logIsvisible === true">{{ vm.restore.error.log }}</pre>
|
||||
</div>--%>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
</section>
|
||||
|
||||
<%= NoNodesHelper.ServerVariables(HttpContext.Current.Request.RequestContext, UmbracoContext.Current) %>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/lib/jquery/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/lib/angular/1.1.5/angular.min.js"></script>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.AppPlugins) %>/deploy/lib/signalr/jquery.signalR.min.js"></script>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/backoffice/signalr/hubs"></script>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.AppPlugins) %>/deploy/js/nonodes.modules.js"></script>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.AppPlugins) %>/deploy/js/deploy.services.js"></script>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.AppPlugins) %>/deploy/js/deploy.components.js"></script>
|
||||
<script type="text/javascript" src="<%= IOHelper.ResolveUrl(SystemDirectories.AppPlugins) %>/deploy/js/nonodes.bootstrap.js"></script>
|
||||
<script type="text/javascript">
|
||||
angular.bootstrap(document, ['umbraco.nonodes']);
|
||||
</script>
|
||||
<% } %>
|
||||
<script src="https://code.jquery.com/jquery-latest.min.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
@@ -41,5 +41,4 @@
|
||||
<add initialize="true" sortOrder="0" alias="form" application="forms" title="Forms" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormTreeController, Umbraco.Forms.Web" />
|
||||
<add initialize="true" sortOrder="3" alias="prevaluesource" application="forms" title="Prevalue sources" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.PreValueSourceTreeController, Umbraco.Forms.Web" />
|
||||
<add initialize="true" sortOrder="3" alias="formsecurity" application="users" title="Forms Security" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormSecurityTreeController, Umbraco.Forms.Web" />
|
||||
<add initialize="false" sortOrder="0" alias="emailTemplates" application="forms" title="Email Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.EmailTemplateTreeController, Umbraco.Forms.Web" />
|
||||
</trees>
|
||||
Reference in New Issue
Block a user