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

Merge

Browse Source
This commit is contained in:
starfighter83
2011-01-05 08:17:20 -01:00
parent b89257b96c 288ae8826c
commit 07804c149b
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
umbraco/presentation/install/steps/database.ascx
View File

@@ -6,12 +6,11 @@
<div class="container">
<h1>Database configuration</h1>
<p>
To complete this step, you must know some information regarding your database server
(”connection string”). Please contact your ISP if necessary. If you’re installingon
a local machine or server you might need information from your system administrator.</p>
<p>
<strong>If you do not have any database available,</strong> you can choose the embedded
database which does not require any information from you ISP or system administrators.</p>
<strong>To complete this step you will either need a blank database or if you do not have a blank database available, you can choose the SQL CE 4 embedded
database (This is the recommended approach for first time users or if you are unsure).</strong></p>
<p>
If you are not using the SQL CE 4 embedded database you will need the connection details for your database, such as the
&quot;server name and password&quot;. You may need to contact your system administrator or web host for this information.</p>
</div>
<!-- database -->
<div class="database-hold">
@@ -47,8 +46,7 @@
<div class="step">
<div class="container">
<p class="instructionText">
<strong>3. Instructions:</strong> Please fill out the below fields to connect to
your database.</p>
<strong>3. Instructions:</strong> Please fill out the connection information for your database.</p>
<div class="instruction-hold">
<div class="row embeddedError" runat="server" id="embeddedFilesMissing" style="display: none;">
<p>
@@ -56,15 +54,14 @@
CE 4 runtime to your Umbraco installation.<br />
<a href="http://our.umbraco.org/wiki/install-and-setup/using-sql-ce-4-with-juno"
target="_blank">More instructions</a>.
You can either follow the instructions above to add SQL CE 4 or choose another database
type.
You can either follow the instructions above to add SQL CE 4 or select another database type from the dropdown above.
</p>
</div>
<div class="row embedded" style="display: none;">
<p>
<strong>Nothing to configure:</strong>SQL CE 4 does not require any configuration
so simply click the "install" button below to continue.
<strong>Nothing to configure:</strong>SQL CE 4 does not require any configuration,
simply click the "install" button to continue.
</p>
</div>
@@ -228,7 +225,7 @@
Database upgraded</h1>
<div class="success">
<p>
Your database has been upgraded to the final version
Your database has been upgraded to version:
<%=umbraco.GlobalSettings.CurrentVersion%>.<br />
Press <b>Continue</b> to proceed.
</p>

8
umbraco/presentation/install/steps/license.ascx
View File

@@ -5,14 +5,14 @@
<h1>License</h1>
<div class="accept-hold">
<h2>Accept the license for Umbraco CMS</h2>
<p>By clicking the accept button (or modify the Umbraco Configuration Status in web.config), you accept the license for this software as specified in the text below.</p>
<p>By clicking the "accept and continue" button (or by modifying the Umbraco Configuration Status in the web.config), you accept the license for this software as specified in the text below.</p>
</div>
<h3>The License (MIT):</h3>
<div class="box-software">
<p>Copyright (c) 2002 - <%=DateTime.Now.Year %> Umbraco I/S</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright and this permisson notice shall be included in all copies or substantial postions of the software.</p>
<p><span>THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRENTY OF ANY KIND, EPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USER OR OTHER DEALINGS IN THE SOFTWARE.</span></p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright and this permisson notice shall be included in all copies or substantial portions of the software.</p>
<p><span>THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USER OR OTHER DEALINGS IN THE SOFTWARE.</span></p>
</div>
<p>That’s all. That didn’t hurt did it?</p>
</div>

2
umbraco/presentation/install/steps/welcome.ascx
View File

@@ -6,7 +6,7 @@
<h1>
Welcome to the Umbraco installation</h1>
<h2>
Thanks a lot for downloading the Umbraco CMS installer.
Thanks for downloading the Umbraco CMS installer.
</h2>
<p>
You are just a few minutes away from getting up and running. The installer will