yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

umbraco base url

Browse Source
This commit is contained in:
perploug
2014-02-27 10:00:38 +01:00
parent 429b5f7c01
commit 9c4212703b
4 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web.UI.Client/src/installer/installer.html
View File

@@ -9,29 +9,23 @@
<link rel="stylesheet" href="assets/css/installer.css" />
</head>
<body ng-class="{touch:touchDevice}" ng-controller="Umbraco.InstallerController" id="umbracoInstallPageBody">
<img src="assets/img/application/logo_white.png" id="logo" />
<div class="umb-loader" id="loader" ng-if="installer.loading"></div>
<div class="umb-loader" id="loader" ></div>
<pre>
{{installer | json}}
</pre>
<div id="installer" class="absolute-center clearfix" ng-if="installer.current">
<div ng-include="installer.current.view"></div>
</div>
<!--
<ul>
<li ng-repeat="step in installer.steps"
ng-class="{current:$index === stepIndex, completed:step.completed}">
<h4>{{step.name}}</h4>
<p>{{step.description}}</p>
</li>
</ul>
-->
<script src="lib/yepnope/yepnope.min.js"></script>
<script src="js/install.loader.js"></script>
<script src="lib/yepnope/yepnope.min.js"></script>
<script src="js/install.loader.js"></script>
</body>
</html>
</html>

3
src/Umbraco.Web.UI.Client/src/installer/installer.service.js
View File

@@ -12,7 +12,6 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
status : _status,
getSteps : function(){
var deferred = $q.defer();
var s = [
{
name: "User",
@@ -39,6 +38,7 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
},
init : function(){
if(!_status.all){
service.getSteps().then(function(steps){
service.status.steps = steps;
@@ -46,6 +46,7 @@ angular.module("umbraco.install").factory('installerService', function($q, $time
service.gotoStep(0);
});
}
},
gotoStep : function(index){

47
src/Umbraco.Web.UI/Areas/UmbracoInstall/Views/Install/Index.cshtml
View File

@@ -3,6 +3,42 @@
@{
Layout = null;
}
<!doctype html>
<html lang="en">
<head>
<base href="@ViewBag.UmbracoBaseFolder/" />
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Install Umbraco</title>
<link rel="stylesheet" href="assets/css/installer.css" />
</head>
<body ng-class="{touch:touchDevice}" ng-controller="Umbraco.InstallerController" id="umbracoInstallPageBody">
<img src="assets/img/application/logo_white.png" id="logo" />
<div class="umb-loader" id="loader" ng-if="installer.loading"></div>
<div id="installer" class="absolute-center clearfix" ng-if="installer.current">
<div ng-include="installer.current.view"></div>
</div>
<script type="text/javascript">
var Umbraco = {};
Umbraco.Sys = {};
Umbraco.Sys.ServerVariables = {
"installApiBaseUrl": "@ViewBag.InstallApiBaseUrl",
"defaultStarterKit": "@ViewBag.DefaultPackageId"
};
</script>
<script src="lib/yepnope/yepnope.min.js"></script>
<script src="js/install.loader.js"></script>
</body>
</html>
<!DOCTYPE html>
@@ -12,15 +48,8 @@
</head>
<body>
<div>
Hello world
Hello @ViewBag.UmbracoBaseFolder
</div>
<script type="text/javascript">
var Umbraco = {};
Umbraco.Sys = {};
Umbraco.Sys.ServerVariables = {
"installApiBaseUrl": "@ViewBag.InstallApiBaseUrl",
"defaultStarterKit": "@ViewBag.DefaultPackageId"
};
</script>
</body>
</html>

3
src/Umbraco.Web/Install/Controllers/InstallController.cs
View File

@@ -54,6 +54,9 @@ namespace Umbraco.Web.Install.Controllers
//gen the install base url
ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "install").TrimEnd("GetSetup");
//get the base umbraco folder
ViewBag.UmbracoBaseFolder = SystemDirectories.Umbraco;
return View();
}