zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
vfedosevich 2015-05-08 05:02:49 -07:00
commit ed61136532
8 changed files with 86 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
WebsitePanel/Database/update_db.sql
View file

@ -9607,6 +9607,13 @@ IF EXISTS (SELECT * FROM ResourceGroups WHERE GroupName = 'SharePoint')
BEGIN
DECLARE @group_id INT
SELECT @group_id = GroupId FROM ResourceGroups WHERE GroupName = 'SharePoint'
DELETE FROM PackageQuotas WHERE QuotaID IN (SELECT QuotaID FROM Quotas WHERE GroupID = @group_id)
DELETE FROM HostingPlanQuotas WHERE QuotaID IN (SELECT QuotaID FROM Quotas WHERE GroupID = @group_id)
DELETE FROM HostingPlanResources WHERE GroupId = @group_id
DELETE FROM PackagesBandwidth WHERE GroupId = @group_id
DELETE FROM PackagesDiskspace WHERE GroupId = @group_id
DELETE FROM PackageResources WHERE GroupId = @group_id
DELETE FROM ResourceGroupDnsRecords WHERE GroupId = @group_id
DELETE FROM Providers WHERE GroupID = @group_id
DELETE FROM Quotas WHERE GroupID = @group_id
DELETE FROM VirtualGroups WHERE GroupID = @group_id

BIN
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Images/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Before After
Before After

72
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Content/Site.css
View file

@ -455,4 +455,76 @@ div#breadcrumb_wrapper a:last-child {
.navbar-right {
margin-right: 0;
}
}
.navbar-inverse {
background-color: #F4F4F4;
border-color: #d4d4d4;
background: rgb(251,251,251);
background: -moz-linear-gradient(top, rgba(251,251,251,1) 0%, rgba(242,242,242,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(251,251,251,1)), color-stop(100%,rgba(242,242,242,1)));
background: -webkit-linear-gradient(top, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
background: -o-linear-gradient(top, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
background: -ms-linear-gradient(top, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
background: linear-gradient(to bottom, rgba(251,251,251,1) 0%,rgba(242,242,242,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fbfbfb', endColorstr='#f2f2f2',GradientType=0 );
-webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
-moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
box-shadow: 0 1px 10px rgba(0,0,0,.1);
}
.navbar-inverse .navbar-text, .navbar-inverse .navbar-brand, .navbar-text, #logout {
color: #565656;
}
.navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus, .navbar-text:hover, #logout:hover {
color: #565656;
background-color: transparent;
opacity: 1;
}
div#breadcrumb_wrapper {
background-color: #F7F7F7;
border: 1px solid #d4d4d4;
margin-top: 9px;
}
.progress {
height:21px;
background-color: #ffffff;
border: 1px solid #BBBBBB;
border-radius: 3px!important;
}
.progress-bar {
background-color: #F4C18F;
-webkit-box-shadow: none;
box-shadow: none;
}
body {
background-color: #FAFAFA;
}
p.progress-text {
position: absolute;
left: 44%;
color: #515151;
}
p.resource-subtext {
color: #AEAEAE;
}
#logout :hover {
color: #333;
}
.file-link:hover {
text-decoration:none;
}
.file-link p {
color: #818181;
font-size: 13pt;
}
.file-link p:hover {
color: #333!important;
}
.icon-size {
width: 60px;
height: 60px;
}

3
WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text.RegularExpressions;
using System.Web;
using System.Web.Mvc;
using WebsitePanel.Providers.HostedSolution;
@ -53,9 +54,9 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes
if (settings.PasswordComplexityEnabled)
{
var symbolsCount = valueString.Count(Char.IsSymbol);
var numbersCount = valueString.Count(Char.IsDigit);
var upperLetterCount = valueString.Count(Char.IsUpper);
var symbolsCount = Regex.Matches(valueString, @"[~!@#$%^&*_\-+'\|\\(){}\[\]:;\""'<>,.?/]").Count;
if (upperLetterCount < settings.UppercaseLettersCount)
{

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js
View file

@ -45,7 +45,7 @@ $.validator.addMethod("numberscount", function (value, element, count) {
$.validator.unobtrusive.adapters.addSingleVal("symbolscount", "count");
$.validator.addMethod("symbolscount", function (value, element, count) {
if (value.replace(/[a-zA-Z0-9_]/g, "").length < count) {
if (value.replace(/[^~!@#$%^&*_\-+'\|\\(){}\[\]:;\"'<>,.?/]/g, "").length < count) {
return false;
}

3
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml
View file

@ -8,7 +8,8 @@
<div class="container row">
@using (Html.BeginRouteForm(AccountRouteNames.PasswordResetFinalStep, FormMethod.Post, new { @class = "form-horizontal user-password-reset-final-step bs-val-styles col-lg-9 col-lg-offset-3", id = "user-password-reset" }))
{
@Html.HiddenFor(x=>x.Login)
<div class="form-group">
<h3>@UI.PasswordReset</h3>
</div>

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
View file

@ -64,7 +64,7 @@
<p class="progress-text">@percent%</p>
</div>
</div>
<p>@ViewDataHelper.BytesToSize(resource.ContentLength) / @ViewDataHelper.BytesToSize(resource.AllocatedSpace)</p>
<p class="resource-subtext">@ViewDataHelper.BytesToSize(resource.ContentLength) / @ViewDataHelper.BytesToSize(resource.AllocatedSpace)</p>
}
<div class="selected-element-overlay">

18
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
View file

@ -206,23 +206,7 @@ namespace WebsitePanel.Portal
{
lblSharedIP.Text = string.Format("({0})", ipsGeneral[0].ExternalIP);
}
else
{
string[] settings = ES.Services.Servers.GetServiceSettings(site.ServiceId);
foreach (string setting in settings)
{
int idx = setting.IndexOf('=');
string option = setting.Substring(0, idx);
if (String.Compare(option, "publicsharedip", true) == 0)
{
string res = setting.Substring(idx + 1);
if (!String.IsNullOrEmpty(res))
lblSharedIP.Text = string.Format("({0})", res);
break;
}
}
}
lblSharedIP.Visible = !String.IsNullOrEmpty(lblSharedIP.Text);
lblSharedIP.Visible = generalIPExists;
}
dedicatedIP.Visible = site.IsDedicatedIP;