Fixes #29760: Update design of no nodes page (so it fits with new installer)

This commit is contained in:
starfighter83
2010-12-23 09:57:21 -01:00
parent 8d16887ba9
commit 3646f8af4b
5 changed files with 176 additions and 263 deletions

View File

@@ -2,227 +2,186 @@
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!DOCTYPE html>
<html>
<head runat="server">
<meta charset="utf-8">
<title>Umbraco
<%=umbraco.GlobalSettings.CurrentVersion%>
- no pages found</title>
<cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
<umb:JsInclude ID="JsInclude4" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
Priority="0" />
<style type="text/css">
body
{
font-size: 11px;
width: 100%;
font-family: Trebuchet MS, verdana, arial, Lucida Grande;
text-align: center;
padding-top: 25px;
margin: 0px;
}
#Panel1_content
{
margin-left: 1px;
background: url(images/background.png) no-repeat bottom center;
width: 100%;
}
#Panel1_content p
{
font-size: 11px;
line-height: 15px;
}
#buttons
{
position: absolute;
bottom: 5px;
width: 648px;
}
#buttons #next
{
float: right;
}
#buttons #back
{
float: left;
}
#loadingBar
{
visibility: hidden;
padding-left: 220px;
}
#loadingBar img
{
width: 220px;
}
#contentScroll
{
overflow: auto;
width: 100%;
height: 545px;
padding-right: 7px;
}
h1
{
font-size: 2em;
margin-top: 5px;
margin-bottom: 5px;
}
h2
{
font-size: 1.4em;
margin-top: 5px;
margin-bottom: 5px;
}
.error, .notice, .success
{
padding: .8em;
padding-top: 0em;
padding-bottom: 0em;
margin-bottom: .5em;
border: 2px solid #ddd;
}
.error
{
background: #FBE3E4;
color: #8a1f11;
border-color: #FBC2C4;
}
.notice
{
background: #FFF6BF;
color: #514721;
border-color: #FFD324;
}
.success
{
background: #E6EFC2;
color: #264409;
border-color: #C6D880;
}
.error a
{
color: #8a1f11;
}
.notice a
{
color: #514721;
}
.success a
{
color: #264409;
}
#videos
{
padding: 0px;
width: 400px;
text-align: center;
margin: auto;
font-size: 11px;
}
#videos td
{
text-align: center;
}
#videos a
{
color: #666;
text-decoration: none;
}
#videos img
{
padding: 1px;
border: none;
display: block;
margin: auto;
}
#videos.single
{
margin: 0px;
width: 150px;
}
#nitros p
{
display: none;
}
#nitros h2
{
font-size: 1.2em;
}
#nitros h3
{
font-size: 1em;
margin-bottom: 0px;
margin-top: 0px;
}
#nitros .umbNitroList input
{
float: left;
}
#nitros .umbNitroList div.nitro
{
float: left;
padding: 3px 0px 5px 10px;
clear: right;
}
</style>
<!--<umb:JsInclude ID="JsInclude4" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
Priority="0" /> -->
<link media="all" rel="stylesheet" href="../../umbraco_client/installer/css/jquery-ui-1.8.6.custom.css" />
<link media="all" type="text/css" rel="stylesheet" href="../../umbraco_client/installer/css/reset.css" />
<link media="all" rel="stylesheet" href="../../umbraco_client/installer/css/all.css" />
<link media="all" type="text/css" rel="stylesheet" href="../../umbraco_client/installer/css/form.css" />
<script src="../../umbraco_client/installer/js/jquery.1.4.4.js" type="text/javascript"></script>
<script src="../../umbraco_client/installer/js/jquery.ui.selectmenu.js" type="text/javascript"></script>
<script src="../../umbraco_client/installer/js/jquery.main.js" type="text/javascript"></script>
<script src="../../umbraco_client/passwordStrength/passwordstrength.js" type="text/javascript"></script>
<!--[if lt IE 9]>
<link media="all" rel="stylesheet" href="../../umbraco_client/installer/css/lt7.css" />
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!--[if lt IE 7]><script type="text/javascript" src="../../umbraco_client/installer/js/ie-png.js"></script><![endif]-->
</head>
<body>
<body class="theend">
<form id="Form1" method="post" runat="server">
<asp:ScriptManager runat="server" ID="umbracoScriptManager">
</asp:ScriptManager>
<cc1:UmbracoPanel Style="text-align: left;" ID="Panel1" runat="server" Height="600px"
AutoResize="false" Width="680px" Text="No pages found">
<div id="contentScroll">
<div style="text-align: center; padding: 15px;">
<img src="worker.png" align="middle" title="Umbraco logo" alt="Umbraco logo" />
<h1>
Looks like there's still work to do</h1>
<p>
You're seeing the wonderful image above because your website doesn't contain any
<strong>published</strong> content yet.</p>
<p>
So get rid of that historic piece of web art by starting umbraco and publishing
some content. You can do this by clicking the "launch umbraco" button below.
</p>
<p>
<input type="button" value="Launch umbraco" id="bt_launch" runat="server" />
</p>
<br />
<h2 style="border-top: 1px solid #ccc; padding-top: 10px;">
Off to a great start</h2>
<p>
You can watch our intro videos on how to get off to a fast and easy start</p>
<table id="videos">
<tr>
<td>
<a target="_blank" href="http://umbraco.org/documentation/videos/getting-started/building-a-simple-site">
<img runat="server" id="vid1" src="~/install/images/packagesVid1.png" />
<span>Watch: Building a simple site.</span> </a>
</td>
<td>
<a target="_blank" href="http://umbraco.org/documentation/videos/getting-started/using-packages">
<img runat="server" id="vid2" src="~/install/images/packagesVid2.png" />
<span>Watch: using packages</span> </a>
</td>
</tr>
</table>
<p>
If you need more information on how to use umbraco, visit <a href="http://umbraco.org/documentation">
the books section on umbraco.org</a>.
</p>
</div>
</div>
<div id="buttons">
</div>
</cc1:UmbracoPanel>
<!-- all page -->
<section id="wrapper">
<div class="wholder">
<!-- header -->
<header id="header">
<div class="holder">
<strong class="logo"><a href="#">Umbraco</a></strong>
</div>
</header>
<!-- all content -->
<section id="main">
<!-- content -->
<section class="content">
<script type="text/javascript">
jQuery(document).ready(function () {
$.post("../../install/utills/p.aspx?feed=sitebuildervids",
function (data) {
jQuery("#ajax-sitebuildervids").html(data);
});
$.post("../../install/utills/p.aspx?feed=developervids",
function (data) {
jQuery("#ajax-developervids").html(data);
});
});
</script>
<!-- done box -->
<div class="tab main-tabinfo">
<div class="container">
<h1>
Looks like there's still work to do</h1>
<p>
You're seeing the wonderful page because your website doesn't contain any
<strong>published</strong> content yet.
</p>
<p>
So get rid of this page by starting umbraco and publishing
some content. You can do this by clicking the "set up your new website" button below.
</p>
<ul class="btn-web">
<li class="btn-set"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/umbraco.aspx"><span>Launch umbraco</span></a></li>
</ul>
</div>
<div class="threcol">
<div class="t">
&nbsp;</div>
<div class="hold">
<aside class="col1">
<h2>Useful links</h2>
<p>Weve put together some useful links to help you get started with Umbraco.</p>
<nav class="links">
<ul>
<li><a href="http://our.umbraco.org?ref=ourFromInstaller">our.umbraco.org</a></li>
</ul>
<ul>
<li><a href="http://our.umbraco.org/wiki?ref=LatestDocsFromInstaller">New documentation</a></li>
<li><a href="http://our.umbraco.org/projects?ref=LatestProjectsFromInstaller">New Projects</a></li>
<li><a href="http://our.umbraco.org/forum?ref=LatesTalkFromInstaller">Forum Talk</a></li>
</ul>
</nav>
</aside>
<aside class="col2">
<h2>Sitebuilder introduction</h2>
<div id="ajax-sitebuildervids"><small>Loading...</small></div>
</aside>
<aside class="col3">
<h2>Developer introduction</h2>
<div id="ajax-developervids"><small>Loading...</small></div>
</aside>
</div>
</div>
</div>
</section>
</section>
</div>
</section>
<!-- bg page -->
<div class="bg-main">
<div class="color2">
<div class="bg-c"></div>
</div>
<div class="color3">
<div class="bg-c"></div>
</div>
<div class="color1">
<div class="bg-c"></div>
</div>
<div class="color4">
<div class="bg-c"></div>
</div>
<div class="color5">
<div class="bg-c"></div>
</div>
</div>
</form>
</body>
</html>

View File

@@ -25,10 +25,10 @@ namespace umbraco.presentation.config.splashes
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
protected void Page_Load(object sender, EventArgs e)
{
ClientLoader.DataBind();
bt_launch.Attributes.Add("onclick", "document.location.href='" + ResolveUrl(SystemDirectories.Umbraco) + "/';");
vid1.Src = SystemDirectories.Install + "/images/packagesVid1.png";
vid2.Src = SystemDirectories.Install + "/images/packagesVid2.png";
//ClientLoader.DataBind();
//bt_launch.Attributes.Add("onclick", "document.location.href='" + ResolveUrl(SystemDirectories.Umbraco) + "/';");
//vid1.Src = SystemDirectories.Install + "/images/packagesVid1.png";
//vid2.Src = SystemDirectories.Install + "/images/packagesVid2.png";
}
}
}

View File

@@ -38,50 +38,5 @@ namespace umbraco.presentation.config.splashes {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm Form1;
/// <summary>
/// umbracoScriptManager control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.ScriptManager umbracoScriptManager;
/// <summary>
/// Panel1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.UmbracoPanel Panel1;
/// <summary>
/// bt_launch control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputButton bt_launch;
/// <summary>
/// vid1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlImage vid1;
/// <summary>
/// vid2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlImage vid2;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

View File

@@ -1645,7 +1645,6 @@
</Compile>
<Content Include="config\splashes\booting.aspx" />
<Content Include="config\splashes\noNodes.aspx" />
<Content Include="config\splashes\worker.png" />
<Content Include="umbraco_client\Installer\css\all.css" />
<Content Include="umbraco_client\Installer\css\form.css" />
<Content Include="umbraco_client\Installer\css\jquery-ui-1.8.6.custom.css" />