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

Merge remote-tracking branch 'origin/dev-v7' into 7.3.0

Browse Source 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
This commit is contained in:
Shannon
2015-03-20 08:26:16 +11:00
parent 3b2ae6bc4a 90fdbb007e
commit f15301a7a0
13 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -28,7 +28,7 @@
<dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
<dependency id="MySql.Data" version="[6.6.5]" />
<dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
<dependency id="ClientDependency" version="[1.8.2.1, 2.0.0)" />
<dependency id="ClientDependency" version="[1.8.3.1, 2.0.0)" />
<dependency id="ClientDependency-Mvc" version="[1.8.0, 2.0.0)" />
<dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
<dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />

69
src/Umbraco.Web.UI.Client/src/less/gridview.less
View File

@@ -124,11 +124,12 @@ IFRAME {overflow:hidden;}
border: 1px dashed rgba(0,0,0,0);
}
.usky-grid .tb:hover .usky-row{
border-bottom:1px dashed rgba(182, 182, 182, 0.3);
.umb-grid .tb:hover .usky-row{
border-bottom:1px dashed rgba(182, 182, 182, 0) !important;
}
/*.usky-grid .selectedRow {
/*
.usky-grid .selectedRow {
border: 1px solid rgba(182, 182, 182, 0.3);
}*/
@@ -235,7 +236,7 @@ IFRAME {overflow:hidden;}
.usky-grid .usky-control:hover{
/*border: 1px solid rgba(182, 182, 182, 0.3);*/
//border-bottom: 1px solid rgba(182, 182, 182, 0.3);
/*border-bottom: 1px solid rgba(182, 182, 182, 0.3);*/
}
.usky-grid .usky-control-placeholder:hover{
@@ -251,6 +252,40 @@ IFRAME {overflow:hidden;}
border: 1px dashed @blue !important;
}
.usky-grid .warnhighlight > ins.item-label{border-color: @red; color: @red;}
.usky-grid .infohighlight > ins.item-label{border-color: @blue; color: @blue;}
.usky-grid ins.item-label {
position: absolute;
top: -22px;
left: -1px;
text-decoration: none;
padding: 0px 7px;
display:none;
font-size:0.8em;
background-color: white;
color: @grayLight;
border: 1px dashed @grayLight;
border-bottom: 1px solid white !important;
height: 20px;
overflow: hidden;
}
.usky-grid .usky-row-inner > ins.item-label{
top: -20px;
left: 0px;
}
.usky-grid .usky-control-inner.selectedControl , .usky-grid .usky-row-inner.selectedRow{
border: 1px dashed @grayLight;
> ins.item-label {
display: block;
z-index:100000;
}
}
// CONTROL PLACEHOLDER
@@ -502,6 +537,7 @@ IFRAME {overflow:hidden;}
/**************************************************************************************************/
.usky-grid .usky-cell{
padding-top: 5px;
padding-bottom: 15px;
}
@@ -524,35 +560,12 @@ IFRAME {overflow:hidden;}
padding: 5px;
margin-right: 45px;
margin-bottom: 15px;
border: 1px dashed transparent;
min-height: 60px;
position:relative;
}
.usky-grid .usky-control-inner > ins {
position: absolute;
top: -22px;
left: 0;
text-decoration: none;
padding: 0px 7px;
/*opacity: .8;*/
display:none;
font-size:0.8em;
background-color:@blueLight;
-moz-border-radius: 0px;
-webkit-border-radius: 5px 5px 0px 0px;
border-radius: 5px 5px 0px 0px;
}
.usky-grid .usky-control-inner:hover
{
border:@grayLighter solid 1px;
}
.usky-grid .usky-control-inner:hover > ins {
display:block;
z-index:100000;
}
/**************************************************************************************************/

12
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
View File

@@ -100,8 +100,14 @@
<!-- row container -->
<div class="{{row.cssClass}} mainContainer usky-row-inner"
ng-class="{last:$last,first:$first,warnhighlight:currentWarnhighlightRow == row, infohighlight:currentInfohighlightRow == row}">
ng-class="{last:$last,
first:$first,
warnhighlight:currentWarnhighlightRow == row,
infohighlight:currentInfohighlightRow == row,
selectedRow:currentRow == row && currentControl === null}">
<ins class="item-label">{{row.name}}</ins>
<div class="mainTb">
<div class="tb">
<div class="tr">
@@ -170,7 +176,9 @@
infohighlight:currentInfohighlightControl == control,
warnhighlight:currentWarnhighlightControl == control,
selectedControl:currentControl == control}">
<ins class="alert alert-info">{{control.editor.name}}</ins>
<ins class="item-label">{{control.editor.name}}</ins>
<!-- Redering the editor for specific control -->
<div ng-if="control && control.$editorPath"
ng-include="control.$editorPath"

6
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -115,9 +115,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.2.1, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll</HintPath>
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -2553,7 +2553,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>7230</DevelopmentServerPort>
<DevelopmentServerPort>7240</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:7300</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>

2
src/Umbraco.Web.UI/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
<package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
<package id="dotless" version="1.4.1.0" targetFramework="net45" />
<package id="Examine" version="0.1.61.2941" targetFramework="net45" />

2
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -106,7 +106,7 @@
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.2.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll</HintPath>
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/Umbraco.Web/packages.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
<package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
<package id="dotless" version="1.4.1.0" targetFramework="net45" />
<package id="Examine" version="0.1.61.2941" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" />

2
src/umbraco.cms/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net40" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

4
src/umbraco.cms/umbraco.cms.csproj
View File

@@ -106,9 +106,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ClientDependency.Core, Version=1.8.2.1, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll</HintPath>
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.6.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/umbraco.controls/packages.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
</packages>

4
src/umbraco.controls/umbraco.controls.csproj
View File

@@ -68,9 +68,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="ClientDependency.Core, Version=1.8.2.1, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll</HintPath>
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />

2
src/umbraco.editorControls/packages.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.8.2.1" targetFramework="net45" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net45" />
</packages>

2
src/umbraco.editorControls/umbraco.editorControls.csproj
View File

@@ -116,7 +116,7 @@
</ProjectReference>
<Reference Include="ClientDependency.Core, Version=1.8.2.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll</HintPath>
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>