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

Added explanatory text to connection error messages in installer

Browse Source
This commit is contained in:
psterling
2011-02-25 03:51:37 +08:00
parent 4fcc62f04a
commit 11d09a6796
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx
View File

@@ -55,7 +55,17 @@
</asp:PlaceHolder>
<asp:PlaceHolder ID="pl_starterKitsConnectionError" runat="server" Visible="false">
<!-- btn box -->
<div style="padding: 0 100px 13px 5px;">
<h2>Oops...the installer can't connect to the repository</h2>
Starter Kits could not be fetched from the repository as there was no connection - which can occur if you are using a proxy server or firewall with certain configurations,
or if you are not currently connected to the internet.
<br />
Click <strong>Continue</strong> to complete the installation then navigate to the Developer section of your Umbraco installation
where you will find the Starter Kits listed in the Packages tree.
</div>
<!-- btn box -->
<footer class="btn-box">
<div class="t">&nbsp;</div>
<asp:LinkButton ID="LinkButton1" class="btn-step btn btn-continue" runat="server" onclick="gotoLastStep"><span>Continue</span></asp:LinkButton>

6
umbraco/presentation/install/steps/Skinning/loadStarterKits.ascx.cs
View File

@@ -72,12 +72,8 @@ namespace umbraco.presentation.install.steps.Skinning
private void ShowConnectionError()
{
uicontrols.Feedback fb = new global::umbraco.uicontrols.Feedback();
fb.type = global::umbraco.uicontrols.Feedback.feedbacktype.error;
fb.Text = "<strong>No connection to repository.</strong> Starter Kits could not be fetched from the repository as there was no connection to: '" + repo.RepositoryUrl + "'";
pl_starterKitsConnectionError.Controls.Add(fb);
pl_starterKitsConnectionError.Visible = true;
}
protected void gotoLastStep(object sender, EventArgs e)

2
umbraco/presentation/install/utills/p.aspx.cs
View File

@@ -47,7 +47,7 @@ namespace umbraco.presentation.install.utills
}
else
{
Response.Write("We can't connect to umbraco.org right now. Click 'Set up your new website' above to continue.");
Response.Write("We can't connect to umbraco.tv right now. Click <strong>Set up your new website</strong> above to continue.");
}
}
}