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

Merge remote-tracking branch 'origin/6.1.3' into 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
This commit is contained in:
Shannon
2013-07-23 13:41:42 +10:00
parent d657f2c3cb 8be54ba0cc
commit 4df80eb976
112 changed files with 6187 additions and 5742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/install/default.aspx
View File

@@ -12,7 +12,7 @@
<umb1:PageTitle runat="server" />
<link rel="icon" type="image/png" href="<%=umbraco.GlobalSettings.Path + "/images/pinnedIcons/umb.ico" %>" />
<link rel="icon" type="image/png" href="<%=umbraco.GlobalSettings.Path + "/Images/PinnedIcons/umb.ico" %>" />
<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" />

22
src/Umbraco.Web.UI/install/steps/Database.ascx.cs
View File

@@ -189,19 +189,31 @@ namespace Umbraco.Web.UI.Install.Steps
{
try
{
var dbContext = ApplicationContext.Current.DatabaseContext;
if (string.IsNullOrEmpty(ConnectionString.Text) == false)
{
ApplicationContext.Current.DatabaseContext.ConfigureDatabaseConnection(ConnectionString.Text);
dbContext.ConfigureDatabaseConnection(ConnectionString.Text);
}
else if (IsEmbeddedDatabase)
{
ApplicationContext.Current.DatabaseContext.ConfigureEmbeddedDatabaseConnection();
dbContext.ConfigureEmbeddedDatabaseConnection();
}
else
{
ApplicationContext.Current.DatabaseContext.ConfigureDatabaseConnection(DatabaseServer.Text, DatabaseName.Text,
DatabaseUsername.Text, DatabasePassword.Text,
DatabaseType.SelectedValue);
var server = DatabaseServer.Text;
var databaseName = DatabaseName.Text;
if (DatabaseType.SelectedValue == "SqlServer" && DatabaseIntegratedSecurity.Checked == true)
{
dbContext.ConfigureIntegratedSecurityDatabaseConnection(server, databaseName);
}
else
{
dbContext.ConfigureDatabaseConnection(server, databaseName,
DatabaseUsername.Text, DatabasePassword.Text, DatabaseType.SelectedValue
);
}
}
}
catch (Exception ex)

9
src/Umbraco.Web.UI/install/steps/Database.ascx.designer.cs generated
View File

@@ -102,6 +102,15 @@ namespace Umbraco.Web.UI.Install.Steps {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox DatabaseName;
/// <summary>
/// DatabaseIntegratedSecurity control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox DatabaseIntegratedSecurity;
/// <summary>
/// DatabaseUsernameItem control.
/// </summary>

52
src/Umbraco.Web.UI/install/steps/database.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="database.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Database"
TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="database.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Database" %>
<%@ Import Namespace="Umbraco.Core.Configuration" %>
<asp:PlaceHolder ID="settings" runat="server" Visible="true">
<!-- database box -->
<div class="tab main-tabinfo">
@@ -17,7 +17,6 @@
</div>
<!-- database -->
<div class="database-hold">
<form action="#">
<fieldset>
<div class="step">
<div class="container">
@@ -56,6 +55,46 @@
<!-- blank option -->
<div id="database-blank" class="database-option">
<script type="text/javascript">
(function($) {
$(document).ready(function() {
// Make database username and password dependent on the integrated security option
var databaseTypeSelect = $("#<%= DatabaseType.ClientID %>");
var integratedSecurityCheckBox = $("#<%= DatabaseIntegratedSecurity.ClientID %>");
var databaseUserNamePasswordInputs = $("#<%= DatabaseUsername.ClientID %>, #<%= DatabasePassword.ClientID %>");
toggle();
databaseTypeSelect.change(toggle);
integratedSecurityCheckBox.change(toggle);
function toggle() {
var databaseType = databaseTypeSelect.val();
if (databaseType == "SqlServer") {
// Only show and enable the integrated security option when it's supported
integratedSecurityCheckBox
.removeAttr("disabled")
.closest("div").show();
} else {
integratedSecurityCheckBox
.attr("disabled", "disabled")
.closest("div").hide();
}
if (integratedSecurityCheckBox.is(":checked")) {
// Hide username and password when integrated security is checked
databaseUserNamePasswordInputs.attr("disabled", "disabled");
databaseUserNamePasswordInputs.closest("div").hide();
} else {
databaseUserNamePasswordInputs.removeAttr("disabled");
databaseUserNamePasswordInputs.closest("div").show();
}
}
});
})(jQuery);
</script>
<div class="step">
<div class="container">
@@ -104,6 +143,12 @@
<span>
<asp:TextBox runat="server" CssClass="text" ID="DatabaseName" /></span>
</div>
<div class="row sql">
<asp:Label runat="server" AssociatedControlID="DatabaseIntegratedSecurity">Integrated security:</asp:Label>
<asp:CheckBox runat="server" ID="DatabaseIntegratedSecurity" />
</div>
<div class="row sql" runat="server" id="DatabaseUsernameItem">
<asp:Label runat="server" AssociatedControlID="DatabaseUsername" ID="DatabaseUsernameLabel">Username:</asp:Label>
<span>
@@ -205,7 +250,6 @@
</fieldset>
</form>
</div>
</div>
<script type="text/javascript">