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

Merge remote-tracking branch 'refs/remotes/umbraco/dev-v8' into dev-v8

Browse Source
This commit is contained in:
David Brendel
2016-03-22 21:52:03 +01:00
parent 69e53b6510 fb104004e0
commit 91ab84ef72
203 changed files with 977 additions and 8506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+136 -135
View File
@@ -1,135 +1,136 @@
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
.DS_Store
._.DS_Store
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
_ReSharper*/
_NCrunch_*/
*.ncrunchsolution
*.ncrunchsolution.user
*.ncrunchproject
*.crunchsolution.cache
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.suo
[sS]ource
[sS]andbox
umbraco.config
*.vs10x
App_Data/TEMP/*
[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
[Uu]mbraco/[Pp]resentation/[Ff]onts/*
[Uu]mbraco/[Pp]resentation/[Cc]ss/*
src/Umbraco.Web.UI/[Cc]ss/*
src/Umbraco.Web.UI/App_Code/*
src/Umbraco.Web.UI/App_Data/*
src/Umbraco.Tests/App_Data/*
src/Umbraco.Web.UI/[Mm]edia/*
src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
src/Umbraco.Web.UI/[Xx]slt/*
src/Umbraco.Web.UI/[Ii]mages/*
src/Umbraco.Web.UI/[Ss]cripts/*
src/Umbraco.Web.UI/Web.*.config.transformed
umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
_BuildOutput/*
*.ncrunchsolution
build/UmbracoCms.AllBinaries*zip
build/UmbracoCms.WebPI*zip
build/UmbracoCms*zip
build/UmbracoExamine.PDF*zip
build/*.nupkg
src/Umbraco.Tests/config/applications.config
src/Umbraco.Tests/config/trees.config
src/Umbraco.Web.UI/web.config
*.orig
src/Umbraco.Tests/config/404handlers.config
src/Umbraco.Web.UI/[Vv]iews/*.cshtml
src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
src/Umbraco.Web.UI/[Vv]iews/*
src/packages/
src/packages/repositories.config
src/Umbraco.Web.UI/[Ww]eb.config
*.transformed
webpihash.txt
node_modules
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI.Client/[Bb]uild/*
src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
build/_BuildOutput/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
tools/NDepend/
src/Umbraco.Web.UI/App_Plugins/*
src/*.psess
src/*.vspx
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
NDependOut/*
*.ndproj
QueryResult.htm
*.ndproj
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
src/Umbraco.Web.UI/umbraco/plugins/*
src/Umbraco.Web.UI/umbraco/js/init.js
build/ApiDocs/*
build/ApiDocs/Output/*
src/Umbraco.Web.UI.Client/bower_components/*
/src/Umbraco.Web.UI/Umbraco/preview
#Ignore Rule for output of generated documentation files from Grunt docserve
src/Umbraco.Web.UI.Client/docs/api
src/*.boltdata/
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
src/umbraco.sln.ide/*
build/UmbracoCms.*/
src/.vs/
src/Umbraco.Web.UI/umbraco/js/install.loader.js
src/Umbraco.Web.UI/js/*
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
.DS_Store
._.DS_Store
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
_ReSharper*/
_NCrunch_*/
*.ncrunchsolution
*.ncrunchsolution.user
*.ncrunchproject
*.crunchsolution.cache
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.suo
[sS]ource
[sS]andbox
umbraco.config
*.vs10x
App_Data/TEMP/*
[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
[Uu]mbraco/[Pp]resentation/[Ff]onts/*
[Uu]mbraco/[Pp]resentation/[Cc]ss/*
src/Umbraco.Web.UI/[Cc]ss/*
src/Umbraco.Web.UI/App_Code/*
src/Umbraco.Web.UI/App_Data/*
src/Umbraco.Tests/App_Data/*
src/Umbraco.Web.UI/[Mm]edia/*
src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
src/Umbraco.Web.UI/[Xx]slt/*
src/Umbraco.Web.UI/[Ii]mages/*
src/Umbraco.Web.UI/[Ss]cripts/*
src/Umbraco.Web.UI/Web.*.config.transformed
umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
_BuildOutput/*
*.ncrunchsolution
build/UmbracoCms.AllBinaries*zip
build/UmbracoCms.WebPI*zip
build/UmbracoCms*zip
build/UmbracoExamine.PDF*zip
build/*.nupkg
src/Umbraco.Tests/config/applications.config
src/Umbraco.Tests/config/trees.config
src/Umbraco.Web.UI/web.config
*.orig
src/Umbraco.Tests/config/404handlers.config
src/Umbraco.Web.UI/[Vv]iews/*.cshtml
src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
src/Umbraco.Web.UI/[Vv]iews/*
src/packages/
src/packages/repositories.config
src/Umbraco.Web.UI/[Ww]eb.config
*.transformed
webpihash.txt
node_modules
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI.Client/[Bb]uild/*
src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
build/_BuildOutput/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
tools/NDepend/
src/Umbraco.Web.UI/App_Plugins/*
src/*.psess
src/*.vspx
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
NDependOut/*
*.ndproj
QueryResult.htm
*.ndproj
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
src/Umbraco.Web.UI/umbraco/plugins/*
src/Umbraco.Web.UI/umbraco/js/init.js
build/ApiDocs/*
build/ApiDocs/Output/*
src/Umbraco.Web.UI.Client/bower_components/*
/src/Umbraco.Web.UI/Umbraco/preview
#Ignore Rule for output of generated documentation files from Grunt docserve
src/Umbraco.Web.UI.Client/docs/api
src/*.boltdata/
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
src/umbraco.sln.ide/*
build/UmbracoCms.*/
src/.vs/
src/Umbraco.Web.UI/umbraco/js/install.loader.js
src/Umbraco.Web.UI/js/*
src/Umbraco.Tests/media
build/NuSpecs/UmbracoCms.Core.nuspec
+9 -25
View File
@@ -21,7 +21,7 @@
<dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
<dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
<dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />
<dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
<dependency id="MiniProfiler" version="[3.2.0.157, 4.0.0)" />
<dependency id="HtmlAgilityPack" version="[1.4.9, 2.0.0)" />
<dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
<dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
@@ -29,44 +29,38 @@
<dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
<dependency id="ClientDependency" version="[1.8.4, 2.0.0)" />
<dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
<dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
<dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
<dependency id="AutoMapper" version="[4.2.1, 5.0.0)" />
<dependency id="LightInject" version="[4.0.8, 5.0.0)" />
<dependency id="LightInject.Mvc" version="[1.0.0.4, 2.0.0)" />
<dependency id="LightInject.Web" version="[1.0.0.7, 2.0.0)" />
<dependency id="LightInject.WebApi" version="[1.0.0.4, 2.0.0)" />
<dependency id="Newtonsoft.Json" version="[8.0.3, 9.0.0)" />
<dependency id="Examine" version="[0.1.68, 1.0.0)" />
<dependency id="ImageProcessor" version="[2.3.3, 3.0.0)" />
<dependency id="ImageProcessor.Web" version="[4.5.3, 5.0.0)" />
<dependency id="semver" version="[1.1.2, 2.0.0)" />
<dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />
<dependency id="Markdown" version="[1.14.4, 2.0.0)" />
<dependency id="Markdown" version="[1.14.4, 2.0.0)" />
<dependency id="log4net" version="[2.0.5, 3.0.0)" />
</dependencies>
</metadata>
<files>
<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
<file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\SQLCE4Umbraco.xml" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
@@ -76,24 +70,14 @@
<!-- Added to be able to produce a symbols package -->
<file src="..\_BuildOutput\bin\SQLCE4Umbraco.pdb" target="lib" />
<file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
<file src="..\_BuildOutput\bin\businesslogic.pdb" target="lib" />
<file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
<file src="..\_BuildOutput\bin\cms.pdb" target="lib" />
<file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
<file src="..\_BuildOutput\bin\controls.pdb" target="lib" />
<file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
<file src="..\_BuildOutput\bin\interfaces.pdb" target="lib" />
<file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
<file src="..\_BuildOutput\bin\Umbraco.Core.pdb" target="lib" />
<file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
<file src="..\_BuildOutput\bin\umbraco.DataLayer.pdb" target="lib" />
<file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
<file src="..\_BuildOutput\bin\umbraco.editorControls.pdb" target="lib" />
<file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
<file src="..\_BuildOutput\bin\umbraco.MacroEngines.pdb" target="lib" />
<file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
<file src="..\_BuildOutput\bin\umbraco.providers.pdb" target="lib" />
<file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
<file src="..\_BuildOutput\bin\umbraco.pdb" target="lib" />
<file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
<file src="..\_BuildOutput\bin\Umbraco.Web.UI.pdb" target="lib" />
src/SQLCE4Umbraco/app.config
+1 -1
View File
@@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
src/Umbraco.Core/Constants-Applications.cs
+5
View File
@@ -107,6 +107,11 @@
public const string Languages = "languages";
/// <summary>
/// alias for the user types tree.
/// </summary>
public const string UserTypes = "userTypes";
//TODO: Fill in the rest!
}
}
src/Umbraco.Core/CoreBootManager.cs
+13 -12
View File
@@ -28,6 +28,8 @@ using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Publishing;
using Umbraco.Core.Macros;
using Umbraco.Core.Manifest;
using Umbraco.Core.Models.Identity;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Services;
using Umbraco.Core.Sync;
using Umbraco.Core.Strings;
@@ -183,6 +185,9 @@ namespace Umbraco.Core
//Data Services/ServiceContext/etc...
container.RegisterFrom<ServicesCompositionRoot>();
//ModelMappers
container.RegisterFrom<CoreModelMappersCompositionRoot>();
container.RegisterSingleton<IServiceProvider, ActivatorServiceProvider>();
container.RegisterSingleton<PluginManager>(factory => PluginManager);
@@ -221,22 +226,18 @@ namespace Umbraco.Core
}
/// <summary>
/// This method allows for configuration of model mappers
/// </summary>
/// <remarks>
/// Model mappers MUST be defined on ApplicationEventHandler instances with the interface IMapperConfiguration.
/// This allows us to search for less types on startup.
/// </remarks>
/// This method initializes all of the model mappers registered in the container
/// </summary>
protected void InitializeModelMappers()
{
Mapper.Initialize(configuration =>
{
//foreach (var m in ApplicationEventsResolver.Current.ApplicationEventHandlers.OfType<IMapperConfiguration>())
foreach (var m in Container.GetAllInstances<ModelMapperConfiguration>())
{
//foreach (var m in ApplicationEventsResolver.Current.ApplicationEventHandlers.OfType<IMapperConfiguration>())
foreach (var m in _appStartupEvtContainer.GetAllInstances<IApplicationEventHandler>().OfType<IMapperConfiguration>())
{
m.ConfigureMappings(configuration, ApplicationContext);
}
});
m.ConfigureMappings(configuration, ApplicationContext);
}
});
}
/// <summary>
src/Umbraco.Core/DependencyInjection/CoreModelMappersCompositionRoot.cs
+13
View File
@@ -0,0 +1,13 @@
using LightInject;
using Umbraco.Core.Models.Identity;
namespace Umbraco.Core.DependencyInjection
{
public sealed class CoreModelMappersCompositionRoot : ICompositionRoot
{
public void Compose(IServiceRegistry container)
{
container.Register<IdentityModelMappings>();
}
}
}
src/Umbraco.Core/DependencyInjection/ServicesCompositionRoot.cs
+1
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using LightInject;
src/Umbraco.Core/ModelMapperHelper.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Umbraco.Core
/// </summary>
internal static class ModelMapperHelper
{
internal static IMappingExpression<TSource, TSource> SelfMap<TSource>(this IConfiguration config)
internal static IMappingExpression<TSource, TSource> SelfMap<TSource>(this IMapperConfiguration config)
{
return config.CreateMap<TSource, TSource>();
}
src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
+13 -5
View File
@@ -1,21 +1,20 @@
using System;
using System.Linq;
using AutoMapper;
using Umbraco.Core.Models.Mapping;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Security;
namespace Umbraco.Core.Models.Identity
{
public class IdentityModelMappings : MapperConfiguration
public class IdentityModelMappings : ModelMapperConfiguration
{
public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext)
public override void ConfigureMappings(IMapperConfiguration config, ApplicationContext applicationContext)
{
config.CreateMap<IUser, BackOfficeIdentityUser>()
.ForMember(user => user.Email, expression => expression.MapFrom(user => user.Email))
.ForMember(user => user.Id, expression => expression.MapFrom(user => user.Id))
.ForMember(user => user.LockoutEndDateUtc, expression => expression.MapFrom(user => user.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?)null))
.ForMember(user => user.LockoutEndDateUtc, expression => expression.MapFrom(user => user.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?) null))
.ForMember(user => user.UserName, expression => expression.MapFrom(user => user.Username))
.ForMember(user => user.PasswordHash, expression => expression.MapFrom(user => GetPasswordHash(user.RawPasswordValue)))
.ForMember(user => user.Culture, expression => expression.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)))
@@ -24,7 +23,16 @@ namespace Umbraco.Core.Models.Identity
.ForMember(user => user.StartContentId, expression => expression.MapFrom(user => user.StartContentId))
.ForMember(user => user.UserTypeAlias, expression => expression.MapFrom(user => user.UserType.Alias))
.ForMember(user => user.AccessFailedCount, expression => expression.MapFrom(user => user.FailedPasswordAttempts))
.ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()));
.ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()))
.ForMember(user => user.LockoutEnabled, expression => expression.Ignore())
.ForMember(user => user.Logins, expression => expression.Ignore())
.ForMember(user => user.LoginsChanged, expression => expression.Ignore())
.ForMember(user => user.EmailConfirmed, expression => expression.Ignore())
.ForMember(user => user.PhoneNumber, expression => expression.Ignore())
.ForMember(user => user.PhoneNumberConfirmed, expression => expression.Ignore())
.ForMember(user => user.TwoFactorEnabled, expression => expression.Ignore())
.ForMember(user => user.Roles, expression => expression.Ignore())
.ForMember(user => user.Claims, expression => expression.Ignore());
config.CreateMap<BackOfficeIdentityUser, UserData>()
.ConstructUsing((BackOfficeIdentityUser user) => new UserData(Guid.NewGuid().ToString("N"))) //this is the 'session id'
src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs
-22
View File
@@ -1,22 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
namespace Umbraco.Core.Models.Mapping
{
/// <summary>
/// This is used to explicitly decorate any ApplicationEventHandler class if there are
/// AutoMapper configurations defined.
/// </summary>
/// <remarks>
/// All automapper configurations are done during startup
/// inside an Automapper Initialize call which is better for performance
/// </remarks>
public interface IMapperConfiguration : IApplicationEventHandler
{
void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext);
}
}
src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs → src/Umbraco.Core/Models/Mapping/ModelMapperConfiguration.cs
+16 -16
View File
@@ -1,17 +1,17 @@
using AutoMapper;
namespace Umbraco.Core.Models.Mapping
{
/// <summary>
/// Used to declare a mapper configuration
/// </summary>
/// <remarks>
/// Use this class if your mapper configuration isn't also explicitly an ApplicationEventHandler.
/// </remarks>
public abstract class MapperConfiguration : ApplicationEventHandler, IMapperConfiguration
{
public abstract void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext);
}
using AutoMapper;
namespace Umbraco.Core.Models.Mapping
{
/// <summary>
/// Used to declare a mapper configuration
/// </summary>
/// <remarks>
/// Use this class if your mapper configuration isn't also explicitly an ApplicationEventHandler.
/// </remarks>
public abstract class ModelMapperConfiguration
{
public abstract void ConfigureMappings(IMapperConfiguration config, ApplicationContext applicationContext);
}
}
src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
+1
View File
@@ -174,6 +174,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Settings });
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Users });
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Forms });
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Translation });
}
private void CreateCmsPropertyTypeGroupData()
src/Umbraco.Core/Persistence/Repositories/Interfaces/INotificationsRepository.cs
+1
View File
@@ -13,5 +13,6 @@ namespace Umbraco.Core.Persistence.Repositories
int DeleteNotifications(IUser user, IEntity entity);
IEnumerable<Notification> GetEntityNotifications(IEntity entity);
IEnumerable<Notification> GetUserNotifications(IUser user);
IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions);
}
}
src/Umbraco.Core/Persistence/Repositories/NotificationsRepository.cs
+12
View File
@@ -36,6 +36,18 @@ namespace Umbraco.Core.Persistence.Repositories
return dtos.Select(d => new Notification(d.id, d.userId, d.action, d.nodeObjectType)).ToList();
}
public IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions)
{
var notifications = new List<Notification>();
using (var t = _unitOfWork.Database.GetTransaction())
{
DeleteNotifications(user, entity);
notifications.AddRange(actions.Select(action => CreateNotification(user, entity, action)));
t.Complete();
}
return notifications;
}
public IEnumerable<Notification> GetEntityNotifications(IEntity entity)
{
var sql = new Sql()
src/Umbraco.Core/Services/INotificationService.cs
+11
View File
@@ -72,6 +72,17 @@ namespace Umbraco.Core.Services
/// <param name="entity"></param>
void DeleteNotifications(IUser user, IEntity entity);
/// <summary>
/// Sets the specific notifications for the user and entity
/// </summary>
/// <param name="user"></param>
/// <param name="entity"></param>
/// <param name="actions"></param>
/// <remarks>
/// This performs a full replace
/// </remarks>
IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions);
/// <summary>
/// Creates a new notification
/// </summary>
src/Umbraco.Core/Services/NotificationService.cs
+16
View File
@@ -174,6 +174,22 @@ namespace Umbraco.Core.Services
repository.DeleteNotifications(user, entity);
}
/// <summary>
/// Sets the specific notifications for the user and entity
/// </summary>
/// <param name="user"></param>
/// <param name="entity"></param>
/// <param name="actions"></param>
/// <remarks>
/// This performs a full replace
/// </remarks>
public IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions)
{
var uow = _uowProvider.GetUnitOfWork();
var repository = _repositoryFactory.CreateNotificationsRepository(uow);
return repository.SetNotifications(user, entity, actions);
}
/// <summary>
/// Creates a new notification
/// </summary>
src/Umbraco.Core/Services/UserService.cs
+4 -3
View File
@@ -146,9 +146,10 @@ namespace Umbraco.Core.Services
IsLockedOut = false,
IsApproved = true
};
//adding default sections content and media
user.AddAllowedSection("content");
user.AddAllowedSection("media");
//adding default sections content, media + translation
user.AddAllowedSection(Constants.Applications.Content);
user.AddAllowedSection(Constants.Applications.Media);
user.AddAllowedSection(Constants.Applications.Translation);
if (SavingUser.IsRaisedEventCancelled(new SaveEventArgs<IUser>(user), this))
return user;
src/Umbraco.Core/Umbraco.Core.csproj
+8 -8
View File
@@ -37,8 +37,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
@@ -48,8 +48,8 @@
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="LightInject, Version=4.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.3\lib\net46\LightInject.dll</HintPath>
<Reference Include="LightInject, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.8\lib\net46\LightInject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -88,8 +88,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin">
@@ -288,6 +288,7 @@
<Compile Include="DateTimeExtensions.cs" />
<Compile Include="DelegateExtensions.cs" />
<Compile Include="DependencyInjection\ConfigurationCompositionRoot.cs" />
<Compile Include="DependencyInjection\CoreModelMappersCompositionRoot.cs" />
<Compile Include="DependencyInjection\RepositoryCompositionRoot.cs" />
<Compile Include="DependencyInjection\ServicesCompositionRoot.cs" />
<Compile Include="DictionaryExtensions.cs" />
@@ -684,8 +685,7 @@
<Compile Include="Models\PublishedContent\PublishedContentWrapped.cs" />
<Compile Include="Models\PublishedContent\PublishedContentType.cs" />
<Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
<Compile Include="Models\Mapping\IMapperConfiguration.cs" />
<Compile Include="Models\Mapping\MapperConfiguration.cs" />
<Compile Include="Models\Mapping\ModelMapperConfiguration.cs" />
<Compile Include="Models\Membership\EntityPermission.cs" />
<Compile Include="Models\IMember.cs" />
<Compile Include="Models\IMemberType.cs" />
src/Umbraco.Core/app.config
+1 -1
View File
@@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
src/Umbraco.Core/packages.config
+3 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="4.1.1" targetFramework="net461" />
<package id="AutoMapper" version="4.2.1" targetFramework="net461" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="LightInject" version="4.0.3" targetFramework="net461" />
<package id="LightInject" version="4.0.8" targetFramework="net461" />
<package id="log4net" version="2.0.5" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
@@ -12,7 +12,7 @@
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="MySql.Data" version="6.9.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="semver" version="1.1.2" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net4" />
src/Umbraco.Tests/App.config
+1 -1
View File
@@ -124,7 +124,7 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
-3
View File
@@ -60,9 +60,6 @@
<!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Providers -->
<providers/>
<!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Help -->
<help/>
<!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#WebRouting -->
<web.routing/>
src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs
-136
View File
@@ -1,136 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Moq;
using NUnit.Framework;
using umbraco.cms.businesslogic.macro;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Profiling;
using Umbraco.Core.Models;
namespace Umbraco.Tests.Macros
{
[TestFixture]
public class MacroEngineFactoryTests
{
[SetUp]
public void Initialize()
{
var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
//this ensures its reset
PluginManager.Current = new PluginManager(new ActivatorServiceProvider(), new NullCacheProvider(),
logger,
false)
{
AssembliesToScan = new[]
{
this.GetType().Assembly
}
};
//for testing, we'll specify which assemblies are scanned for the PluginTypeResolver
}
[TearDown]
public void TearDown()
{
PluginManager.Current = null;
}
[Test]
public void Get_All()
{
var engines = MacroEngineFactory.GetAll();
Assert.AreEqual(2, engines.Count);
}
[Test]
public void Get_Engine()
{
var engine1 = MacroEngineFactory.GetEngine("MacroEngine1");
Assert.IsNotNull(engine1);
}
[Test]
public void Get_By_Filename()
{
var engine1 = MacroEngineFactory.GetByFilename("test.me1");
var engine2 = MacroEngineFactory.GetByFilename("test.me2");
Assert.IsNotNull(engine1);
Assert.IsNotNull(engine2);
Assert.Throws<MacroEngineException>(() => MacroEngineFactory.GetByFilename("test.blah"));
}
[Test]
public void Get_By_Extension()
{
var engine1 = MacroEngineFactory.GetByExtension("me1");
var engine2 = MacroEngineFactory.GetByExtension("me2");
Assert.IsNotNull(engine1);
Assert.IsNotNull(engine2);
Assert.Throws<MacroEngineException>(() => MacroEngineFactory.GetByExtension("blah"));
}
#region Classes for tests
public class MacroEngine1 : IMacroEngine
{
public string Name
{
get { return "MacroEngine1"; }
}
public IEnumerable<string> SupportedExtensions
{
get { return new[] {"me1"}; }
}
public IEnumerable<string> SupportedUIExtensions
{
get { throw new NotImplementedException(); }
}
public bool Validate(string code, string tempFileName, IPublishedContent currentPage, out string errorMessage)
{
throw new NotImplementedException();
}
public string Execute(MacroModel macro, IPublishedContent currentPage)
{
throw new NotImplementedException();
}
}
public class MacroEngine2 : IMacroEngine
{
public string Name
{
get { return "MacroEngine2"; }
}
public IEnumerable<string> SupportedExtensions
{
get { return new[] { "me2" }; }
}
public IEnumerable<string> SupportedUIExtensions
{
get { throw new NotImplementedException(); }
}
public bool Validate(string code, string tempFileName, IPublishedContent currentPage, out string errorMessage)
{
throw new NotImplementedException();
}
public string Execute(MacroModel macro, IPublishedContent currentPage)
{
throw new NotImplementedException();
}
}
#endregion
}
}
src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs
+9 -6
View File
@@ -1,10 +1,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using AutoMapper;
using Moq;
using NUnit.Framework;
using Umbraco.Core.Logging;
using Umbraco.Core.Manifest;
using Umbraco.Core.PropertyEditors;
using Umbraco.Tests.TestHelpers;
@@ -20,14 +22,15 @@ namespace Umbraco.Tests.Models.Mapping
protected override void FreezeResolution()
{
Func<IEnumerable<Type>> typeListProducerList = Enumerable.Empty<Type>;
var propertyEditorResolver = new Mock<PropertyEditorResolver>(
//ctor args
Mock.Of<IServiceProvider>(),
Mock.Of<ILogger>(),
var propertyEditorResolver = new PropertyEditorResolver(
Container,
Logger,
typeListProducerList,
Umbraco.Core.CacheHelper.CreateDisabledCacheHelper().RuntimeCache);
new ManifestBuilder(
Core.CacheHelper.CreateDisabledCacheHelper().RuntimeCache,
new ManifestParser(Logger, new DirectoryInfo(TestHelper.CurrentAssemblyDirectory), Core.CacheHelper.CreateDisabledCacheHelper().RuntimeCache)));
PropertyEditorResolver.Current = propertyEditorResolver.Object;
PropertyEditorResolver.Current = propertyEditorResolver;
base.FreezeResolution();
}
src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
+8 -6
View File
@@ -30,6 +30,8 @@ using umbraco.BusinessLogic;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Events;
using Umbraco.Core.Models.Identity;
using Umbraco.Web.DependencyInjection;
using ObjectExtensions = Umbraco.Core.ObjectExtensions;
namespace Umbraco.Tests.TestHelpers
@@ -97,6 +99,10 @@ namespace Umbraco.Tests.TestHelpers
{
var settings = SettingsForTests.GetDefault();
//register mappers
Container.RegisterFrom<CoreModelMappersCompositionRoot>();
Container.RegisterFrom<WebModelMappersCompositionRoot>();
Container.Register<IServiceContainer>(factory => Container);
Container.Register<PluginManager>(factory => PluginManager.Current);
@@ -105,7 +111,7 @@ namespace Umbraco.Tests.TestHelpers
//register basic stuff that might need to be there for some container resolvers to work, we can
// add more to this in base classes in resolution freezing
Container.Register<ILogger>(factory => Logger);
Container.RegisterSingleton<ILogger>(factory => Logger);
Container.Register<CacheHelper>(factory => CacheHelper);
Container.Register<ProfilingLogger>(factory => ProfilingLogger);
Container.RegisterSingleton<IUmbracoSettingsSection>(factory => SettingsForTests.GetDefault());
@@ -157,11 +163,7 @@ namespace Umbraco.Tests.TestHelpers
{
Mapper.Initialize(configuration =>
{
var mappers = PluginManager.Current.FindAndCreateInstances<IMapperConfiguration>(
specificAssemblies: new[]
{
typeof(ContentModelMapper).Assembly
});
var mappers = Container.GetAllInstances<ModelMapperConfiguration>();
foreach (var mapper in mappers)
{
mapper.ConfigureMappings(configuration, ApplicationContext);
src/Umbraco.Tests/Umbraco.Tests.csproj
+6 -7
View File
@@ -51,8 +51,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Examine, Version=0.1.68.0, Culture=neutral, processorArchitecture=MSIL">
@@ -63,8 +63,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="LightInject, Version=4.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.3\lib\net46\LightInject.dll</HintPath>
<Reference Include="LightInject, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.8\lib\net46\LightInject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -90,8 +90,8 @@
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -509,7 +509,6 @@
<Compile Include="UmbracoExamine\TestContentService.cs" />
<Compile Include="UriExtensionsTests.cs" />
<Compile Include="UriUtilityTests.cs" />
<Compile Include="Macros\MacroEngineFactoryTests.cs" />
<Compile Include="Resolvers\PackageActionsResolverTests.cs" />
<Compile Include="Plugins\PluginManagerExtensions.cs" />
<Compile Include="Plugins\PluginManagerTests.cs" />
src/Umbraco.Tests/media/1001/sample.txt
-1
View File
@@ -1 +0,0 @@
TestContent
src/Umbraco.Tests/packages.config
+3 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
<package id="AutoMapper" version="4.1.1" targetFramework="net461" />
<package id="AutoMapper" version="4.2.1" targetFramework="net461" />
<package id="Examine" version="0.1.68.0" targetFramework="net45" />
<package id="LightInject" version="4.0.3" targetFramework="net461" />
<package id="LightInject" version="4.0.8" targetFramework="net461" />
<package id="log4net" version="2.0.5" targetFramework="net461" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
@@ -18,7 +18,7 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.32.0" targetFramework="net45" />
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+5 -59
View File
@@ -108,8 +108,8 @@
<Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
<Name>UmbracoExamine</Name>
</ProjectReference>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
@@ -193,8 +193,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin">
@@ -436,13 +436,6 @@
<Compile Include="Umbraco\Dialogs\ChangeDocType.aspx.designer.cs">
<DependentUpon>ChangeDocType.aspx</DependentUpon>
</Compile>
<Compile Include="Umbraco\Dialogs\MoveOrCopy.aspx.cs">
<DependentUpon>moveOrCopy.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Umbraco\Dialogs\MoveOrCopy.aspx.designer.cs">
<DependentUpon>moveOrCopy.aspx</DependentUpon>
</Compile>
<Compile Include="Umbraco\dialogs\Sort.aspx.cs">
<DependentUpon>sort.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -673,14 +666,12 @@
<Content Include="Umbraco\Images\Umbraco\settingView.gif" />
<Content Include="Umbraco\Settings\Views\EditView.aspx" />
<Content Include="Umbraco_Client\Application\Extensions.js" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.unobtrusive-ajax.min.js" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.validate.min.js" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.validate.unobtrusive.min.js" />
<Content Include="Umbraco_Client\Dialogs\SortDialog.css" />
<Content Include="Umbraco_client\Dialogs\SortDialog.js" />
<Content Include="Umbraco_Client\Dialogs\AssignDomain2.js" />
<Content Include="Umbraco_Client\Dialogs\AssignDomain2.css" />
<Content Include="Umbraco_Client\Dialogs\CreateDialog.css" />
<Content Include="Umbraco_Client\Dialogs\PublishDialog.css" />
<Content Include="Umbraco_Client\Dialogs\PublishDialog.js" />
<Content Include="Umbraco_Client\Dialogs\UmbracoField.js" />
@@ -692,6 +683,7 @@
<Content Include="Umbraco_Client\Editors\EditStyleSheet.js" />
<Content Include="Umbraco_Client\Editors\EditTemplate.js" />
<Content Include="Umbraco_Client\Editors\EditView.js" />
<Content Include="Umbraco_Client\PunyCode\punycode.min.js" />
<Content Include="Umbraco_Client\Splitbutton\InsertMacroSplitButton.js" />
<Content Include="Umbraco_Client\Tablesorting\img\asc.gif" />
<Content Include="Umbraco_Client\Tablesorting\img\desc.gif" />
@@ -723,8 +715,6 @@
<Content Include="Umbraco_Client\Ui\knockout.js" />
<Content Include="Umbraco_Client\Ui\knockout.mapping.js" />
<Content Include="Umbraco\endPreview.aspx" />
<Content Include="Umbraco_Client\Preview\previewModeBadge.png" />
<Content Include="Umbraco_Client\Preview\umbracoPreview.css" />
<Content Include="Umbraco\Xslt\Templates\Schema2\Breadcrumb.xslt" />
<Content Include="Umbraco\Xslt\Templates\Schema2\Clean.xslt" />
<Content Include="Umbraco\Xslt\Templates\Schema2\ListSubPagesAsThumbnails.xslt" />
@@ -766,7 +756,6 @@
<Content Include="Umbraco\Css\permissionsEditor.css" />
<Content Include="Umbraco\Dialogs\mediaPicker.aspx" />
<Content Include="Umbraco\Images\Editor\spellchecker.gif" />
<Content Include="Umbraco\Webservices\MacroContainerService.asmx" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.cookie.js" />
<Content Include="Umbraco_Client\Tablesorting\Img\bg.gif" />
<Content Include="Umbraco\Developer\Packages\proxy.htm" />
@@ -833,19 +822,15 @@
<Content Include="Umbraco\Developer\Packages\LoadNitros.ascx" />
<Content Include="Umbraco\Developer\Packages\SubmitPackage.aspx" />
<Content Include="Umbraco\Dialogs\about.aspx" />
<Content Include="Umbraco\Dialogs\AssignDomain.aspx" />
<Content Include="Umbraco\Dialogs\create.aspx" />
<Content Include="Umbraco\Dialogs\cruds.aspx" />
<Content Include="Umbraco\Dialogs\emptyTrashcan.aspx" />
<Content Include="Umbraco\Dialogs\exportDocumenttype.aspx" />
<Content Include="Umbraco\Dialogs\importDocumenttype.aspx" />
<Content Include="Umbraco\Dialogs\insertMacro.aspx" />
<Content Include="Umbraco\Dialogs\moveOrCopy.aspx" />
<Content Include="Umbraco\Dialogs\notifications.aspx" />
<Content Include="Umbraco\Developer\Packages\installer.aspx" />
<Content Include="Umbraco\Dialogs\protectPage.aspx" />
<Content Include="Umbraco\Dialogs\publish.aspx" />
<Content Include="Umbraco\Dialogs\RegexWs.aspx" />
<Content Include="Umbraco\Dialogs\rollBack.aspx" />
<Content Include="Umbraco\Dialogs\sendToTranslation.aspx" />
<Content Include="Umbraco\Dialogs\treePicker.aspx" />
@@ -990,7 +975,6 @@
<Content Include="Umbraco\Xslt\searchResult.xslt" />
<Content Include="Umbraco\Xslt\Templates\RelatedLinks.xslt" />
<Content Include="Umbraco\Xslt\Templates\RSSFeed.xslt" />
<Content Include="Umbraco_Client\Images\progressbar.gif" />
<Content Include="Umbraco\Images\sendToTranslate.png" />
<Content Include="Umbraco\Images\Tray\traySprites.png" />
<Content Include="Umbraco\Images\Umbraco\package.png" />
@@ -1219,7 +1203,6 @@
<Content Include="Umbraco\Members\EditMemberGroup.aspx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\publishStatus.aspx" />
<Content Include="Umbraco\Settings\EditDictionaryItem.aspx" />
<Content Include="Umbraco\Settings\editLanguage.aspx" />
<Content Include="Umbraco\Settings\editTemplate.aspx" />
@@ -1235,21 +1218,11 @@
<Content Include="Umbraco\Webservices\CacheRefresher.asmx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\Webservices\CMSNode.asmx" />
<Content Include="Umbraco\Webservices\codeEditorSave.asmx" />
<Content Include="Umbraco\Webservices\Developer.asmx" />
<Content Include="Umbraco\Webservices\legacyAjaxCalls.asmx" />
<Content Include="Umbraco\Webservices\nodeSorter.asmx" />
<Content Include="Umbraco\Webservices\progressStatus.asmx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\Webservices\publication.asmx" />
<Content Include="Umbraco\Webservices\Settings.asmx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\Webservices\templates.asmx" />
<Content Include="Umbraco\Webservices\trashcan.asmx" />
<Content Include="Umbraco\Webservices\wsdl.xslt" />
<Content Include="Umbraco\Xslt\macroGetCurrent.xsl" />
<Content Include="Umbraco\Xslt\macroGetSubs.xsl" />
<Content Include="Umbraco\Xslt\sqlNodeHierachy.xslt" />
@@ -1274,21 +1247,6 @@
<Content Include="Umbraco_Client\Menuicon\style.css" />
<Content Include="Umbraco_Client\Modal\modal.js" />
<Content Include="Umbraco_Client\Modal\style.css" />
<Content Include="Umbraco_Client\Panel\Images\panel_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxfooter_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxfooter_statusBar_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxfooter_statusBar_h2_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxhead_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxhead_h2_bg.gif" />
<Content Include="Umbraco_Client\Panel\style.css" />
<Content Include="Umbraco_Client\ProgressBar\Images\container_left.gif" />
<Content Include="Umbraco_Client\ProgressBar\Images\container_right.gif" />
<Content Include="Umbraco_Client\ProgressBar\Images\indicator.gif" />
<Content Include="Umbraco_Client\ProgressBar\javascript.js" />
<Content Include="Umbraco_Client\ProgressBar\style.css" />
<Content Include="Umbraco_Client\Propertypane\Images\propertyBackground.gif" />
<Content Include="Umbraco_Client\Propertypane\Images\proppane_bg.png" />
<Content Include="Umbraco_Client\Propertypane\style.css" />
<Content Include="Umbraco_Client\Scrollingmenu\Images\arrawBack.gif" />
<Content Include="Umbraco_Client\Scrollingmenu\Images\arrowForward.gif" />
<Content Include="Umbraco_Client\Scrollingmenu\Images\background.gif" />
@@ -1297,18 +1255,6 @@
<Content Include="Umbraco_Client\Scrollingmenu\javascript.js" />
<Content Include="Umbraco_Client\Scrollingmenu\style.css" />
<Content Include="Umbraco_Client\Tablesorting\tableDragAndDrop.js" />
<Content Include="Umbraco_Client\Tablesorting\tableFilterUtill.js" />
<Content Include="Umbraco_Client\Tablesorting\tableFilter.js" />
<Content Include="Umbraco_Client\Tabview\Images\background.gif" />
<Content Include="Umbraco_Client\Tabview\Images\bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\footer_bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\footer_statusBar_bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\footer_statusBar_h2_bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\left_both.gif" />
<Content Include="Umbraco_Client\Tabview\Images\right_both.gif" />
<Content Include="Umbraco_Client\Tabview\javascript.js" />
<Content Include="Umbraco_Client\Tabview\oldstyle.css" />
<Content Include="Umbraco_Client\Tabview\style.css" />
<Content Include="Umbraco_Client\Ui\default.css" />
<Content Include="Umbraco_Client\Ui\default.js" />
<Content Include="Umbraco_Client\Ui\jquery.js" />
src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+1
View File
@@ -963,6 +963,7 @@
<key alias="stylesheets">Stylopisy</key>
<key alias="templates">Šablony</key>
<key alias="xslt">XSLT soubory</key>
<key alias="userTypes">Typy Uživatelů</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nová aktualizace je připrvena</key>
src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+1
View File
@@ -928,6 +928,7 @@ Vennlig hilsen Umbraco roboten
<key alias="templates">Maler</key>
<key alias="xslt">XSLT Filer</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">Brukertyper typer</key>
</area>
<area alias="update">
<key alias="updateAvailable">Ny oppdatering er klar</key>
src/Umbraco.Web.UI/config/trees.Release.config
+6 -6
View File
@@ -11,16 +11,15 @@
<!--Settings-->
<add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
<add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
<add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="3" />
<add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
<add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
<add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
<add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
<add initialize="true" sortOrder="7" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add initialize="true" sortOrder="8" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<!--Developer-->
<add initialize="true" sortOrder="0" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
<add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
@@ -39,6 +38,7 @@
<add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" />
<!--Translation-->
<add application="translation" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
<add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
<add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />
src/Umbraco.Web.UI/config/trees.config
+6 -6
View File
@@ -6,18 +6,17 @@
<!--Media-->
<add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" />
<add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" />
<!--Settings-->
<!--Settings-->
<add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
<add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
<add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="3" />
<add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
<add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
<add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
<add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<add initialize="true" sortOrder="7" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add initialize="true" sortOrder="8" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<!--Developer-->
<add initialize="true" sortOrder="0" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
<add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
@@ -26,13 +25,14 @@
<add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
<!--Users-->
<add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
<add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
<add application="users" alias="userTypes" title="User Types" type="Umbraco.Web.Trees.UserTypesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
<add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
<!--Members-->
<add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
<add initialize="true" sortOrder="1" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
<add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" />
<!--Translation-->
<add application="translation" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
<add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
<add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />
<!-- Custom -->
src/Umbraco.Web.UI/packages.config
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="4.1.1" targetFramework="net461" />
<package id="AutoMapper" version="4.2.1" targetFramework="net461" />
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
<package id="Examine" version="0.1.68.0" targetFramework="net45" />
@@ -28,7 +28,7 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="MySql.Data" version="6.9.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+1 -1
View File
@@ -986,7 +986,6 @@ Mange hilsner fra Umbraco robotten
<key alias="memberTypes">Medlemstype</key>
<key alias="documentTypes">Dokumenttyper</key>
<key alias="relationTypes">Dokumenttyper</key>
<key alias="packager">Pakker</key>
<key alias="packages">Pakker</key>
<key alias="python">Python</key>
@@ -999,6 +998,7 @@ Mange hilsner fra Umbraco robotten
<key alias="templates">Skabeloner</key>
<key alias="xslt">XSLT-filer</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">Bruger Typer</key>
</area>
<area alias="update">
<key alias="updateAvailable">Ny opdatering er klar</key>
src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+1
View File
@@ -946,6 +946,7 @@ Ihr freundlicher Umbraco-Robot
<key alias="templates">Vorlagen</key>
<key alias="xslt">XSLT-Dateien</key>
<key alias="analytics">Auswertungen</key>
<key alias="userTypes">Benutzertypen</key>
</area>
<area alias="update">
<key alias="updateAvailable">Neues Update verfügbar</key>
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+1
View File
@@ -1188,6 +1188,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="templates">Templates</key>
<key alias="xslt">XSLT Files</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">User Types</key>
</area>
<area alias="update">
<key alias="updateAvailable">New update ready</key>
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+1
View File
@@ -1192,6 +1192,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="templates">Templates</key>
<key alias="xslt">XSLT Files</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">User Types</key>
</area>
<area alias="update">
<key alias="updateAvailable">New update ready</key>
src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+1
View File
@@ -850,6 +850,7 @@
<key alias="stylesheets">Hojas de estilo</key>
<key alias="templates">Plantillas</key>
<key alias="xslt">Archivos XSLT</key>
<key alias="userTypes">Tipos de Usuarios</key>
</area>
<area alias="update">
<key alias="updateAvailable">Existe una nueva actualización</key>
src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+1
View File
@@ -984,6 +984,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
<key alias="stylesheets">Feuilles de style</key>
<key alias="templates">Modèles</key>
<key alias="xslt">Fichiers XSLT</key>
<key alias="userTypes">Types d'utilisateurs</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nouvelle mise à jour prête</key>
src/Umbraco.Web.UI/umbraco/config/lang/he.xml
+1
View File
@@ -869,6 +869,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="stylesheets">גיליונות סגנון</key>
<key alias="templates">תבניות</key>
<key alias="xslt">קבצי XSLT</key>
<key alias="userTypes">משתמש מקליד</key>
</area>
<area alias="update">
<key alias="updateAvailable">עידכון חדש זמין</key>
src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+1
View File
@@ -842,6 +842,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
<key alias="stylesheets">Fogli di stile</key>
<key alias="templates">Templates</key>
<key alias="xslt">Files XSLT</key>
<key alias="userTypes">Tipi di Utente</key>
</area>
<area alias="update">
<key alias="updateAvailable"><![CDATA[Nuovo aggiornamento pronto]]></key>
src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
+1
View File
@@ -1172,6 +1172,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="templates">テンプレート</key>
<key alias="xslt">XSLT ファイル</key>
<key alias="analytics">アナリティクス</key>
<key alias="userTypes">ユーザータイプ</key>
</area>
<area alias="update">
<key alias="updateAvailable">新しい更新があります</key>
src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
+1
View File
@@ -846,6 +846,7 @@
<key alias="stylesheets">스타일시트</key>
<key alias="templates">템플릿</key>
<key alias="xslt">XSLT 파일</key>
<key alias="userTypes">사용자 유형</key>
</area>
<area alias="update">
<key alias="updateAvailable">새 업데이트가 준비되었습니다.</key>
src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+1
View File
@@ -951,6 +951,7 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
<key alias="stylesheets">Stylesheets</key>
<key alias="templates">Sjablonen</key>
<key alias="xslt">XSLT Bestanden</key>
<key alias="userTypes">Gebruiker Types</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nieuwe update beschikbaar</key>
src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+1
View File
@@ -742,6 +742,7 @@ Miłego dnia!]]></key>
<key alias="stylesheets">Arkusze stylów</key>
<key alias="templates">Szablony</key>
<key alias="xslt">Pliki XSLT</key>
<key alias="userTypes">Typy Użytkowników</key>
</area>
<area alias="update">
<key alias="updateAvailable">Aktualizacja jest gotowa</key>
src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
+1
View File
@@ -830,6 +830,7 @@ Para fechar a tarefa de tradução vá até os detalhes e clique no botão "Fech
<key alias="stylesheets">Stylesheets</key>
<key alias="templates">Modelos</key>
<key alias="xslt">Arquivos XSLT</key>
<key alias="userTypes">Tipos de Usuários</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nova atualização pronta</key>
src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+1
View File
@@ -1161,6 +1161,7 @@
<key alias="stylesheets">Стили CSS</key>
<key alias="templates">Шаблоны</key>
<key alias="xslt">Файлы XSLT</key>
<key alias="userTypes">Типы пользователей</key>
</area>
<area alias="update">
<key alias="updateAvailable">Доступны обновления</key>
src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+1
View File
@@ -851,6 +851,7 @@
<key alias="stylesheets">Stilmallar</key>
<key alias="templates">Sidmallar</key>
<key alias="xslt">XSLT-filer</key>
<key alias="userTypes">Användartyper</key>
</area>
<area alias="update">
<key alias="updateAvailable">Ny uppdatering tillgänglig</key>
src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+1
View File
@@ -920,6 +920,7 @@
<key alias="stylesheets">样式表</key>
<key alias="templates">模板</key>
<key alias="xslt">XSLT文件</key>
<key alias="userTypes">用户类型</key>
</area>
<area alias="update">
<key alias="updateAvailable">有可用更新</key>
src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
-1
View File
@@ -2,7 +2,6 @@
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
<umb:CssInclude ID="CssInclude3" runat="server" FilePath="Tree/menuIcons.css" PathNameAlias="UmbracoClient" Priority="11" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="Tree/Themes/umbraco/style.css" PathNameAlias="UmbracoClient" Priority="12" />
<umbClient:JsApplicationLib ID="JsUmbracoApplicationLib1" runat="server"/>
src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
-47
View File
@@ -1,47 +0,0 @@
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function doSubmit() { document.Form1["ok"].click(); }
var functionsFrame = this;
var tabFrame = this;
var isDialog = true;
var submitOnEnter = true;
</script>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<cc1:Feedback ID="FeedBackMessage" runat="server" />
<cc1:Pane runat="server" ID="pane_addnew">
<cc1:PropertyPanel runat="server" ID="prop_domain" Text="Domain">
<asp:TextBox ID="DomainName" runat="server" Width="252px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator" runat="server" Display="Dynamic" />
<asp:RegularExpressionValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator2" runat="server" Display="Dynamic" />
<br /><small><%= Services.TextService.Localize("assignDomain/domainHelp") %></small>
</cc1:PropertyPanel>
<cc1:PropertyPanel ID="prop_lang" runat="server" Text="language">
<asp:DropDownList ID="Languages" runat="server" />
<asp:RequiredFieldValidator ControlToValidate="Languages" ErrorMessage="*" ID="LanguageValidator" runat="server" Display="Dynamic" />
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text=" ">
<asp:Button ID="ok" runat="server" OnClick="SaveDomain"></asp:Button>
</cc1:PropertyPanel>
</cc1:Pane>
<cc1:Pane ID="pane_edit" runat="server">
<cc1:PropertyPanel runat="server">
<asp:Literal ID="allDomains" runat="server" />
</cc1:PropertyPanel>
</cc1:Pane>
<p>
<a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= Services.TextService.Localize("defaultdialogs/closeThisWindow")%></a>
</p>
</asp:Content>
src/Umbraco.Web.UI/umbraco/dialogs/MoveOrCopy.aspx.cs
-11
View File
@@ -1,11 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Umbraco.Web.UI.Umbraco.Dialogs
{
public partial class MoveOrCopy : global::umbraco.dialogs.moveOrCopy
{
}
}
src/Umbraco.Web.UI/umbraco/dialogs/MoveOrCopy.aspx.designer.cs
Generated
-15
View File
@@ -1,15 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Umbraco.Web.UI.Umbraco.Dialogs {
public partial class MoveOrCopy {
}
}
src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
-57
View File
@@ -1,57 +0,0 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="RegexWs.aspx.cs" Inherits="umbraco.presentation.dialogs.RegexWs" %>
<%@ Import Namespace="Umbraco.Web" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<asp:Content ContentPlaceHolderID="body" runat="server">
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot"/>
<cc1:Pane id="pane1" runat="server">
<cc1:PropertyPanel ID="pp_search" Text="Search" runat="server">
<asp:TextBox ID="searchField" style="width: 250px;" runat="server" /> <asp:Button ID="bt_search" runat="server" Text="search" OnClick="findRegex" />
<p>
<small><%= Services.TextService.Localize("defaultdialogs/regexSearchHelp")%> </small>
</p>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server">
<asp:Panel ID="regexPanel" Visible="false" runat="server">
<div class="diff">
<asp:Repeater id="results" runat="server" OnItemDataBound="onRegexBind">
<ItemTemplate>
<div class="match">
<h3><asp:Literal ID="header" runat="server" /></h3>
<p>
<asp:Literal ID="desc" runat="server" />
</p>
<p>
<pre><asp:Literal ID="regex" runat="server" /></pre>
</p>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
</asp:Panel>
</cc1:PropertyPanel>
</cc1:Pane>
</asp:Content>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function chooseRegex(regex) {
var target = top.right.document.getElementById('<%= Request.CleanForXss("target") %>');
target.value = regex;
UmbClientMgr.closeModalWindow();
}
</script>
<style type="text/css">
.diff{height: 357px; width: 98%; overflow: auto; font-family: verdana; font-size: 11px;}
.diff pre{display: block; width: 80%; background: #EFEFF5; margin: 10px; margin-left: 0px; padding: 10px; overflow: hidden;}
.match{border-bottom: 1px solid #ccc; padding: 5px; margin-left: 10px; margin-bottom: 10px;}
.match h3{font-size: 14px; padding-left: 0px; margin-left: 0px;}
</style>
</asp:Content>
src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
-83
View File
@@ -1,83 +0,0 @@
<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
<%@ Import Namespace="System.Globalization" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
var recycleBinType = '<%=BinType.ToString()%>';
var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)%>';
function emptyRecycleBin() {
jQuery('#formDiv').hide();
jQuery('#buttons').hide();
jQuery('#animation').show();
jQuery('#anim').attr("src","<%=umbraco.GlobalSettings.ClientPath%>/images/progressBar.gif");
// call the empty trashcan webservice
umbraco.presentation.webservices.trashcan.EmptyTrashcan(recycleBinType);
// wait one second to start the status update
setTimeout('updateStatus();', 1000);
}
function updateStatus() {
umbraco.presentation.webservices.trashcan.GetTrashStatus(updateStatusLabel, failure);
}
function failure(retVal) {
alert('error: ' + retVal);
}
function updateStatusLabel(retVal) {
jQuery('#statusLabel').html("<strong>" + retVal + " <%=Services.TextService.Localize("remaining")%></strong>");
if (retVal != '' && retVal != '0') {
setTimeout('updateStatus();', 500);
} else {
jQuery('#div_form').hide();
jQuery('#notification').show();
jQuery('#notification').html("<p><%=Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty")%> </p> <p><a href='#' onclick='UmbClientMgr.closeModalWindow()'><%= Services.TextService.Localize("defaultdialogs/closeThisWindow")%></a></p>");
UmbClientMgr.mainTree().reloadActionNode();
}
}
</script>
</asp:Content>
<asp:Content runat="server" ContentPlaceHolderID="body">
<div class="success" id="notification" style="display: none;"></div>
<div id="div_form">
<cc1:Pane id="pane_form" runat="server">
<cc1:PropertyPanel runat="server">
<div id="animation" align="center" style="display: none;">
<p><%= Services.TextService.Localize("defaultdialogs/recycleBinDeleting")%></p>
<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
<br />
<span class="guiDialogTiny" id="statusLabel"><%=Services.TextService.Localize("deleting")%></span>
</div>
<div id="formDiv">
<p><%= Services.TextService.Localize("defaultdialogs/recycleBinWarning")%></p>
<input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=Services.TextService.Localize("defaultdialogs/confirmEmptyTrashcan", new[] { umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)})%></label>
</div>
</cc1:PropertyPanel>
</cc1:Pane>
<br />
<div id="buttons">
<input type="button" ID="ok" value="<%=Services.TextService.Localize("actions/emptyTrashcan") %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />
<em><%= Services.TextService.Localize("or") %></em>
<a href="#" onclick="UmbClientMgr.closeModalWindow();">
<%=Services.TextService.Localize("cancel")%>
</a>
</div>
</div>
</asp:Content>
src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
-92
View File
@@ -1,92 +0,0 @@
<%@ Page Language="c#" CodeBehind="moveOrCopy.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.MoveOrCopy" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Import Namespace="Umbraco.Web" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function dialogHandler(id) {
document.getElementById("copyTo").value = id;
document.getElementById("<%= ok.ClientID %>").disabled = false;
// Get node name by xmlrequest
if (id > 0)
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
else{
//document.getElementById("pageNameContent").innerHTML = "'<strong><%=Services.TextService.Localize(Request.CleanForXss("app"))%></strong>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>";
jQuery("#pageNameContent").html("<strong><%=Services.TextService.Localize(Request.CleanForXss("app"))%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>");
jQuery("#pageNameHolder").attr("class","success");
}
}
var actionIsValid = true;
function updateName(result) {
if(actionIsValid)
{
jQuery("#pageNameContent").html("'<strong>" + result + "</strong>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>");
jQuery("#pageNameHolder").attr("class","success");
}
}
function notValid()
{
jQuery("#pageNameHolder").attr("class", "error");
jQuery("#pageNameContent").html("<%= Services.TextService.Localize("moveOrCopy/notValid") %>");
actionIsValid = false;
}
</script>
<style type="text/css">
.propertyItemheader
{
width: 180px !important;
}
</style>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot"/>
<input type="hidden" id="copyTo" name="copyTo" />
<cc1:Feedback ID="feedback" runat="server" />
<cc1:Pane ID="pane_form" runat="server" Visible="false">
<cc1:PropertyPanel runat="server" Style="overflow: auto; height: 220px;position: relative;">
<umbraco:TreeControl runat="server" ID="JTree" App='<%#Request.CleanForXss("app") %>'
IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
Height="200"></umbraco:TreeControl>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" ID="pp_relate" Text="relateToOriginal">
<asp:CheckBox runat="server" ID="RelateDocuments" Checked="false" />
</cc1:PropertyPanel>
</cc1:Pane>
<asp:PlaceHolder ID="pane_form_notice" runat="server" Visible="false">
<div class="notice" id="pageNameHolder" style="margin-top: 10px;">
<p id="pageNameContent">
<%= Services.TextService.Localize("moveOrCopy/noNodeSelected") %></p>
</div>
</asp:PlaceHolder>
<cc1:Pane ID="pane_settings" runat="server" Visible="false">
<cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Master Document Type">
<asp:ListBox ID="masterType" runat="server" CssClass="bigInput" Rows="1" SelectionMode="Single"></asp:ListBox>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Name">
<asp:TextBox ID="rename" runat="server" Style="width: 350px;" CssClass="bigInput"></asp:TextBox><asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
</cc1:Pane>
<asp:Panel ID="panel_buttons" runat="server">
<p>
<asp:Button ID="ok" runat="server" CssClass="guiInputButton" OnClick="HandleMoveOrCopy" UseSubmitBehavior="false" OnClientClick="this.disabled = 'disabled';"></asp:Button>
&nbsp; <em>
<%=Services.TextService.Localize("general/or")%></em> &nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
<%=Services.TextService.Localize("general/cancel")%></a>
</p>
</asp:Panel>
</asp:Content>
src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
+4 -4
View File
@@ -5,11 +5,11 @@
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function updateLoginId() {
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl(true,"content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl("content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
if (treePicker != undefined) {
document.getElementById("loginId").value = treePicker;
if (treePicker > 0) {
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateLoginTitle);
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=Security.CurrentUser.Id%>', treePicker, updateLoginTitle);
} else
document.getElementById("loginTitle").innerHTML = "<strong><%=Services.TextService.Localize("content")%></strong>";
}
@@ -20,11 +20,11 @@
}
function updateErrorId() {
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl(true,"content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl("content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
if (treePicker != undefined) {
document.getElementById("errorId").value = treePicker;
if (treePicker > 0) {
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateErrorTitle);
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=Security.CurrentUser.Id%>', treePicker, updateErrorTitle);
} else
document.getElementById("errorTitle").innerHTML = "<strong><%=Services.TextService.Localize("content")%></strong>";
}
src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Language="c#" Codebehind="rollBack.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master"AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master"AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
+1 -1
View File
@@ -9,7 +9,7 @@
.gridItem{border-color: #D9D7D7;}
</style>
<umb:CssInclude ID="CssInclude3" runat="server" FilePath="Tree/menuIcons.css" PathNameAlias="UmbracoClient" Priority="11" />
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
src/Umbraco.Web.UI/umbraco/publishStatus.aspx
-18
View File
@@ -1,18 +0,0 @@
<%@ Page language="c#" Codebehind="publishStatus.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.publishStatus" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<HTML>
<HEAD>
<title>publishStatus</title>
<meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
<meta name="CODE_LANGUAGE" Content="C#">
<meta name="vs_defaultClientScript" content="JavaScript">
<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
</HEAD>
<body MS_POSITIONING="GridLayout">
<form id="Form1" method="post" runat="server">
<cc1:UmbracoPanel id="Panel1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 19px" runat="server"
Width="379px" Height="202px"></cc1:UmbracoPanel>
</form>
</body>
</HTML>
src/Umbraco.Web.UI/umbraco/webservices/CMSNode.asmx
-1
View File
@@ -1 +0,0 @@
<%@ WebService Language="C#" CodeBehind="CMSNode.asmx.cs" Class="umbraco.presentation.webservices.CMSNode" %>
src/Umbraco.Web.UI/umbraco/webservices/MacroContainerService.asmx
-1
View File
@@ -1 +0,0 @@
<%@ WebService Language="C#" CodeBehind="MacroContainerService.asmx.cs" Class="umbraco.presentation.webservices.MacroContainerService" %>
src/Umbraco.Web.UI/umbraco/webservices/Settings.asmx
-1
View File
@@ -1 +0,0 @@
<%@ WebService Language="c#" Codebehind="Settings.asmx.cs" Class="umbraco.webservices.Settings" %>
src/Umbraco.Web.UI/umbraco/webservices/progressStatus.asmx
-1
View File
@@ -1 +0,0 @@
<%@ WebService Language="c#" Codebehind="progressStatus.asmx.cs" Class="presentation.umbraco.webservices.progressStatus" %>
src/Umbraco.Web.UI/umbraco/webservices/publication.asmx
-1
View File
@@ -1 +0,0 @@
<%@ WebService Language="c#" Codebehind="publication.asmx.cs" Class="umbraco.webservices.publication" %>
src/Umbraco.Web.UI/umbraco/webservices/trashcan.asmx
-1
View File
@@ -1 +0,0 @@
<%@ WebService Language="C#" CodeBehind="trashcan.asmx.cs" Class="umbraco.presentation.webservices.trashcan" %>
src/Umbraco.Web.UI/umbraco/webservices/wsdl.xslt
-178
View File
@@ -1,178 +0,0 @@
<?xml version="1.0" ?>
<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
xmlns:msxsl="urn:schemas-microsoft-com:xslt"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:s="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
>
<!--
// wsdl.xslt
// The WSDL to JavaScript transformation.
// Copyright by Matthias Hertel, http://www.mathertel.de
// This work is licensed under a Creative Commons Attribution 2.0 Germany License.
// See http://creativecommons.org/licenses/by/2.0/de/
// - - - - -
// 19.07.2005 optional documentation
// 20.07.2005 more datatypes and XML Documents
// 20.07.2005 more datatypes and XML Documents fixed
// 03.12.2005 compatible to axis and bea WebServices. Thanks to Thomas Rudin
// 07.03.2006 Now this xslt is independent of the alias used for the namespace of XMLSchema in the wsdl.
// Thanks to António Cruz for this great trick.
// 31.03.2006 Bug on xml types fixed.
// 19.11.2006 supporting (old) RPC encoding.
-->
<xsl:strip-space elements="*" />
<xsl:output method="text" version="4.0" />
<xsl:param name="alias">
<xsl:value-of select="wsdl:definitions/wsdl:service/@name" />
</xsl:param>
<xsl:variable name="XSDPrefix" select="name(//namespace::*[.='http://www.w3.org/2001/XMLSchema'])" />
<xsl:template match="/">
// javascript proxy for SOAP based web services
// by Matthias Hertel
/* <xsl:value-of select="wsdl:definitions/wsdl:documentation" /> */
<xsl:for-each select="/wsdl:definitions/wsdl:service/wsdl:port[soap:address]">
<xsl:call-template name="soapport" />
</xsl:for-each>
</xsl:template>
<xsl:template name="soapport">
proxies.<xsl:value-of select="$alias" /> = {
url: "<xsl:value-of select="soap:address/@location" />",
ns: "<xsl:value-of select="/wsdl:definitions/wsdl:types/s:schema/@targetNamespace" />"
} // proxies.<xsl:value-of select="$alias" />
<xsl:text>&#x000D;&#x000A;</xsl:text>
<xsl:for-each select="/wsdl:definitions/wsdl:binding[@name = substring-after(current()/@binding, ':')]">
<xsl:call-template name="soapbinding11" />
</xsl:for-each>
</xsl:template>
<xsl:template name="soapbinding11">
<xsl:variable name="portTypeName" select="substring-after(current()/@type, ':')" />
<xsl:for-each select="wsdl:operation">
<xsl:variable name="inputMessageName" select="substring-after(/wsdl:definitions/wsdl:portType[@name = $portTypeName]/wsdl:operation[@name = current()/@name]/wsdl:input/@message, ':')" />
<xsl:variable name="outputMessageName" select="substring-after(/wsdl:definitions/wsdl:portType[@name = $portTypeName]/wsdl:operation[@name = current()/@name]/wsdl:output/@message, ':')" />
/* inputMessageName='<xsl:value-of select="$inputMessageName" />', outputMessageName='<xsl:value-of select="$outputMessageName" />' */
<xsl:for-each select="/wsdl:definitions/wsdl:portType[@name = $portTypeName]/wsdl:operation[@name = current()/@name]/wsdl:documentation">
/** <xsl:value-of select="." /> */
</xsl:for-each>
proxies.<xsl:value-of select="$alias" />.<xsl:value-of select="@name" /> = function () { return(proxies.callSoap(arguments)); }
proxies.<xsl:value-of select="$alias" />.<xsl:value-of select="@name" />.fname = "<xsl:value-of select="@name" />";
proxies.<xsl:value-of select="$alias" />.<xsl:value-of select="@name" />.service = proxies.<xsl:value-of select="$alias" />;
proxies.<xsl:value-of select="$alias" />.<xsl:value-of select="@name" />.action = "\"<xsl:value-of select="soap:operation/@soapAction" />\"";
proxies.<xsl:value-of select="$alias" />.<xsl:value-of select="@name" />.params = [<xsl:for-each select="/wsdl:definitions/wsdl:message[@name = $inputMessageName]">
<xsl:call-template name="soapMessage" />
</xsl:for-each>];
proxies.<xsl:value-of select="$alias" />.<xsl:value-of select="@name" />.rtype = [<xsl:for-each select="/wsdl:definitions/wsdl:message[@name = $outputMessageName]">
<xsl:call-template name="soapMessage" />
</xsl:for-each>];
</xsl:for-each>
</xsl:template>
<xsl:template name="soapElem">
<xsl:param name="type"/>
<xsl:param name="name"/>
<!-- An annotation to comparisation of the types:
In XPath 1.0 there is no built in function to check if a string matches a specific type declaration.
The trick with $XSDPrefix and the 2 following variables help out of this.
Thanks to António Cruz for this great trick.
This condition works on ASP.NET with ms - extensions available:
when test="msxsl:namespace-uri($type)='http://www.w3.org/2001/XMLSchema' and msxsl:local-name($type)='boolean'"
This condition works with XPath 2.0 functions available:, (see http://www.w3.org/TR/xpath-functions/#func-namespace-uri-from-QName)
when test="namespace-uri-from-QName($type)='http://www.w3.org/2001/XMLSchema' and local-name-from-QName($type)='boolean'"
-->
<xsl:variable name="pre" select="substring-before($type, ':')" />
<xsl:variable name="post" select="substring-after($type, ':')" />
<xsl:choose>
<xsl:when test="$pre != '' and $pre!=$XSDPrefix and $pre!='tns'">
"<xsl:value-of select="$name" />"
</xsl:when>
<xsl:when test="$post='string'">
"<xsl:value-of select="$name" />"
</xsl:when>
<xsl:when test="$post='int' or $post='unsignedInt' or $post='short' or $post='unsignedShort'
or $post='unsignedLong' or $post='long'">
"<xsl:value-of select="$name" />:int"
</xsl:when>
<xsl:when test="$post='double' or $post='float'">
"<xsl:value-of select="$name" />:float"
</xsl:when>
<xsl:when test="$post='dateTime'">
"<xsl:value-of select="$name" />:date"
</xsl:when>
<xsl:when test="$post='boolean'">
"<xsl:value-of select="$name" />:bool"
</xsl:when>
<!-- arrays !-->
<xsl:when test="$type='tns:ArrayOfString'">
"<xsl:value-of select="$name" />:s[]"
</xsl:when>
<xsl:when test="$type='tns:ArrayOfInt' or $type='tns:ArrayOfUnsignedInt' or $type='tns:ArrayOfShort' or $type='tns:ArrayOfUnsignedShort' or $type='tns:ArrayOfLong' or $type='tns:ArrayOfUnsignedLong'">
"<xsl:value-of select="$name" />:int[]"
</xsl:when>
<xsl:when test="$type='tns:ArrayOfFloat'">
"<xsl:value-of select="$name" />:float[]"
</xsl:when>
<xsl:when test="$type='tns:ArrayOfBoolean'">
"<xsl:value-of select="$name" />:bool[]"
</xsl:when>
<!-- ASP.NET datasets-->
<xsl:when test="count(./s:complexType/s:sequence/*) > 1">
"<xsl:value-of select="$name" />:ds"
</xsl:when>
<!-- XML Documents -->
<xsl:when test="./s:complexType/s:sequence/s:any">
"<xsl:value-of select="$name" />:x"
</xsl:when>
<xsl:otherwise>
"<xsl:value-of select="$name" />"
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="soapMessage">
<xsl:choose>
<xsl:when test="wsdl:part[@type]">
<!-- SOAP RPC encoding -->
<xsl:for-each select="wsdl:part">
<xsl:call-template name="soapElem">
<xsl:with-param name="name" select="@name" />
<xsl:with-param name="type" select="@type" />
</xsl:call-template>
<xsl:if test="position()!=last()">,</xsl:if>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<!-- SOAP Document encoding -->
<xsl:variable name="inputElementName" select="substring-after(wsdl:part/@element, ':')" />
<xsl:for-each select="/wsdl:definitions/wsdl:types/s:schema/s:element[@name=$inputElementName]//s:element">
<xsl:call-template name="soapElem">
<xsl:with-param name="name" select="@name" />
<xsl:with-param name="type" select="@type" />
</xsl:call-template>
<xsl:if test="position()!=last()">,</xsl:if>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>
src/Umbraco.Web.UI/umbraco_client/Application/JQuery/jquery.unobtrusive-ajax.min.js
Vendored
-5
View File
@@ -1,5 +0,0 @@
/*
** Unobtrusive Ajax support library for jQuery
** Copyright (C) Microsoft Corporation. All rights reserved.
*/
(function(a){var b="unobtrusiveAjaxClick",g="unobtrusiveValidation";function c(d,b){var a=window,c=(d||"").split(".");while(a&&c.length)a=a[c.shift()];if(typeof a==="function")return a;b.push(d);return Function.constructor.apply(null,b)}function d(a){return a==="GET"||a==="POST"}function f(b,a){!d(a)&&b.setRequestHeader("X-HTTP-Method-Override",a)}function h(c,b,e){var d;if(e.indexOf("application/x-javascript")!==-1)return;d=(c.getAttribute("data-ajax-mode")||"").toUpperCase();a(c.getAttribute("data-ajax-update")).each(function(f,c){var e;switch(d){case"BEFORE":e=c.firstChild;a("<div />").html(b).contents().each(function(){c.insertBefore(this,e)});break;case"AFTER":a("<div />").html(b).contents().each(function(){c.appendChild(this)});break;default:a(c).html(b)}})}function e(b,e){var j,k,g,i;j=b.getAttribute("data-ajax-confirm");if(j&&!window.confirm(j))return;k=a(b.getAttribute("data-ajax-loading"));i=b.getAttribute("data-ajax-loading-duration")||0;a.extend(e,{type:b.getAttribute("data-ajax-method")||undefined,url:b.getAttribute("data-ajax-url")||undefined,beforeSend:function(d){var a;f(d,g);a=c(b.getAttribute("data-ajax-begin"),["xhr"]).apply(this,arguments);a!==false&&k.show(i);return a},complete:function(){k.hide(i);c(b.getAttribute("data-ajax-complete"),["xhr","status"]).apply(this,arguments)},success:function(a,e,d){h(b,a,d.getResponseHeader("Content-Type")||"text/html");c(b.getAttribute("data-ajax-success"),["data","status","xhr"]).apply(this,arguments)},error:c(b.getAttribute("data-ajax-failure"),["xhr","status","error"])});e.data.push({name:"X-Requested-With",value:"XMLHttpRequest"});g=e.type.toUpperCase();if(!d(g)){e.type="POST";e.data.push({name:"X-HTTP-Method-Override",value:g})}a.ajax(e)}function i(c){var b=a(c).data(g);return!b||!b.validate||b.validate()}a("a[data-ajax=true]").live("click",function(a){a.preventDefault();e(this,{url:this.href,type:"GET",data:[]})});a("form[data-ajax=true] input[type=image]").live("click",function(c){var g=c.target.name,d=a(c.target),f=d.parents("form")[0],e=d.offset();a(f).data(b,[{name:g+".x",value:Math.round(c.pageX-e.left)},{name:g+".y",value:Math.round(c.pageY-e.top)}]);setTimeout(function(){a(f).removeData(b)},0)});a("form[data-ajax=true] :submit").live("click",function(c){var e=c.target.name,d=a(c.target).parents("form")[0];a(d).data(b,e?[{name:e,value:c.target.value}]:[]);setTimeout(function(){a(d).removeData(b)},0)});a("form[data-ajax=true]").live("submit",function(d){var c=a(this).data(b)||[];d.preventDefault();if(!i(this))return;e(this,{url:this.action,type:this.method||"GET",data:c.concat(a(this).serializeArray())})})})(jQuery);
src/Umbraco.Web.UI/umbraco_client/Dialogs/CreateDialog.css
-19
View File
@@ -1,19 +0,0 @@
.umbracoDialog a {
color: blue;
}
.umbracoDialog div {
margin-top: 10px;
}
input[type=text] {
width: 350px;
}
input[type=submit] {
width: 90px;
}
.submit-footer {
margin-top: 15px;
}
src/Umbraco.Web.UI/umbraco_client/Panel/images/panel_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 98 B

src/Umbraco.Web.UI/umbraco_client/Panel/images/panel_boxfooter_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 B

src/Umbraco.Web.UI/umbraco_client/Panel/images/panel_boxfooter_statusBar_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 162 B

src/Umbraco.Web.UI/umbraco_client/Panel/images/panel_boxfooter_statusBar_h2_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 164 B

src/Umbraco.Web.UI/umbraco_client/Panel/images/panel_boxhead_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 194 B

src/Umbraco.Web.UI/umbraco_client/Panel/images/panel_boxhead_h2_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 193 B

src/Umbraco.Web.UI/umbraco_client/Panel/style.css
-101
View File
@@ -1,101 +0,0 @@
.panel {
margin: 0 auto; /* center for now */
background: url(images/panel_bg.gif) top repeat-x;
font-size: 100%;
padding: 0px;
display: block;
border: 0px;
position: relative;
}
.panelstatus {
margin: 0 auto; /* center for now */
width: 17em; /* ems so it will grow */
font-size: 100%;
}
.panel .boxhead {
background: url(images/panel_boxhead_bg.gif) top left no-repeat;
margin: 0px;
padding: 0px;
text-align: center;
display: block;
width: auto;
border: 0px;
position: relative;
}
.panel .boxhead h2, .panel .boxfooter h2 {
background: url(images/panel_boxhead_h2_bg.gif) top right no-repeat;
margin: 0px;
padding: 3px 0px 1px 10px;
font-weight: bold;
text-align: left;
font-family: "Trebuchet MS", verdana, arial;
font-size: 10px; color: #378080;
display: block;
height: 14px;
width: auto;
}
.panel .boxbody {
border-top: 1px solid #cac9c9;
border-right: 1px solid #cac9c9;
background: url(images/panel_boxfooter_bg.gif) bottom left repeat-y #fff;
padding: 0px;
margin: 0px;
position: relative;
}
.panel .boxfooter {
height: 12px;
margin: 0;
padding: 0px;
background: url(images/panel_boxfooter_bg.gif) 11px 11px repeat-x #fff;
}
.panel .boxfooter .statusBar{height: 12px; margin: 0px; background: url(images/panel_boxfooter_statusBar_bg.gif) top left no-repeat;}
.panel .boxfooter .statusBar h2{display: block; height: 12px; margin: 0px; padding: 0px; background: url(images/panel_boxfooter_statusBar_h2_bg.gif) top right no-repeat;}
.panelstatus .boxfooter {
font-size: 9px;
color: #999;
height: 15px;
margin: 0;
padding: 5px 0 8px 15px;
}
.panel .content {
overflow: auto;
padding: 0px 10px 0px 10px;
margin:0px;
position: relative;
width: auto !Important;
width: 10em;
}
.panel .content .innerContent{padding: 0px; margin: 0px; width: 100%;}
#treeWindow .innerContent{height: 100%;}
.panel .menubar_panel {
background-image: url(../tabView/images/background.gif);
height:32px;
display: block;
border-bottom:1px solid #CAC9C9;
border-left:1px solid #CAC9C9;
border-right:1px solid #CAC9C9 !Important;
overflow:hidden;
padding: 0px;
margin: 0px;
}
.guiDialogTinyMark {
font-family: "Trebuchet MS", verdana, arial;
font-size: 10px; color: #606057;
}
src/Umbraco.Web.UI/umbraco_client/Preview/previewModeBadge.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

src/Umbraco.Web.UI/umbraco_client/Preview/umbracoPreview.css
-4
View File
@@ -1,4 +0,0 @@
#umbracoPreviewBadge
{
position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background-image: url(previewModeBadge.png) no-repeat;
}
src/Umbraco.Web.UI/umbraco_client/PunyCode/punycode.min.js
Vendored
+2
View File
@@ -0,0 +1,2 @@
/*! https://mths.be/punycode v1.3.2 by @mathias */
!function (a) { function b(a) { throw RangeError(E[a]) } function c(a, b) { for (var c = a.length, d = []; c--;) d[c] = b(a[c]); return d } function d(a, b) { var d = a.split("@"), e = ""; d.length > 1 && (e = d[0] + "@", a = d[1]), a = a.replace(D, "."); var f = a.split("."), g = c(f, b).join("."); return e + g } function e(a) { for (var b, c, d = [], e = 0, f = a.length; f > e;) b = a.charCodeAt(e++), b >= 55296 && 56319 >= b && f > e ? (c = a.charCodeAt(e++), 56320 == (64512 & c) ? d.push(((1023 & b) << 10) + (1023 & c) + 65536) : (d.push(b), e--)) : d.push(b); return d } function f(a) { return c(a, function (a) { var b = ""; return a > 65535 && (a -= 65536, b += H(a >>> 10 & 1023 | 55296), a = 56320 | 1023 & a), b += H(a) }).join("") } function g(a) { return 10 > a - 48 ? a - 22 : 26 > a - 65 ? a - 65 : 26 > a - 97 ? a - 97 : t } function h(a, b) { return a + 22 + 75 * (26 > a) - ((0 != b) << 5) } function i(a, b, c) { var d = 0; for (a = c ? G(a / x) : a >> 1, a += G(a / b) ; a > F * v >> 1; d += t) a = G(a / F); return G(d + (F + 1) * a / (a + w)) } function j(a) { var c, d, e, h, j, k, l, m, n, o, p = [], q = a.length, r = 0, w = z, x = y; for (d = a.lastIndexOf(A), 0 > d && (d = 0), e = 0; d > e; ++e) a.charCodeAt(e) >= 128 && b("not-basic"), p.push(a.charCodeAt(e)); for (h = d > 0 ? d + 1 : 0; q > h;) { for (j = r, k = 1, l = t; h >= q && b("invalid-input"), m = g(a.charCodeAt(h++)), (m >= t || m > G((s - r) / k)) && b("overflow"), r += m * k, n = x >= l ? u : l >= x + v ? v : l - x, !(n > m) ; l += t) o = t - n, k > G(s / o) && b("overflow"), k *= o; c = p.length + 1, x = i(r - j, c, 0 == j), G(r / c) > s - w && b("overflow"), w += G(r / c), r %= c, p.splice(r++, 0, w) } return f(p) } function k(a) { var c, d, f, g, j, k, l, m, n, o, p, q, r, w, x, B = []; for (a = e(a), q = a.length, c = z, d = 0, j = y, k = 0; q > k; ++k) p = a[k], 128 > p && B.push(H(p)); for (f = g = B.length, g && B.push(A) ; q > f;) { for (l = s, k = 0; q > k; ++k) p = a[k], p >= c && l > p && (l = p); for (r = f + 1, l - c > G((s - d) / r) && b("overflow"), d += (l - c) * r, c = l, k = 0; q > k; ++k) if (p = a[k], c > p && ++d > s && b("overflow"), p == c) { for (m = d, n = t; o = j >= n ? u : n >= j + v ? v : n - j, !(o > m) ; n += t) x = m - o, w = t - o, B.push(H(h(o + x % w, 0))), m = G(x / w); B.push(H(h(m, 0))), j = i(d, r, f == g), d = 0, ++f } ++d, ++c } return B.join("") } function l(a) { return d(a, function (a) { return B.test(a) ? j(a.slice(4).toLowerCase()) : a }) } function m(a) { return d(a, function (a) { return C.test(a) ? "xn--" + k(a) : a }) } var n = "object" == typeof exports && exports && !exports.nodeType && exports, o = "object" == typeof module && module && !module.nodeType && module, p = "object" == typeof global && global; (p.global === p || p.window === p || p.self === p) && (a = p); var q, r, s = 2147483647, t = 36, u = 1, v = 26, w = 38, x = 700, y = 72, z = 128, A = "-", B = /^xn--/, C = /[^\x20-\x7E]/, D = /[\x2E\u3002\uFF0E\uFF61]/g, E = { overflow: "Overflow: input needs wider integers to process", "not-basic": "Illegal input >= 0x80 (not a basic code point)", "invalid-input": "Invalid input" }, F = t - u, G = Math.floor, H = String.fromCharCode; if (q = { version: "1.3.2", ucs2: { decode: e, encode: f }, decode: j, encode: k, toASCII: m, toUnicode: l }, "function" == typeof define && "object" == typeof define.amd && define.amd) define("punycode", function () { return q }); else if (n && o) if (module.exports == n) o.exports = q; else for (r in q) q.hasOwnProperty(r) && (n[r] = q[r]); else a.punycode = q }(this);
src/Umbraco.Web.UI/umbraco_client/images/progressbar.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

src/Umbraco.Web.UI/umbraco_client/progressBar/images/container_left.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 314 B

src/Umbraco.Web.UI/umbraco_client/progressBar/images/container_right.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 102 B

src/Umbraco.Web.UI/umbraco_client/progressBar/images/indicator.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 113 B

src/Umbraco.Web.UI/umbraco_client/progressBar/javascript.js
-25
View File
@@ -1,25 +0,0 @@
var step = 8;
var padding = 10;
function progressBarUpdate(id, percent) {
var total = document.getElementById("progressBar" + id).style.width;
total = Math.round(total.substring(0, total.length-2))-padding;
var onePercent = total / 100;
var progress = Math.round(onePercent*percent);
if (progress % step == 0 || percent > 99) {
document.getElementById("progressBar" + id + "_indicator").style.width = progress;
}
}
function progressBarUpdateLabel(id, text) {
document.getElementById("progressBar" + id + "_text").innerHTML = text;
}
function progressBarTest(id, percent) {
progressBarUpdate(id, percent);
progressBarUpdateLabel(id, percent + '%');
if (percent < 100) {
percent++;
setTimeout("progressBarTest('" + id + "', " + percent + ")", 100);
}
}
src/Umbraco.Web.UI/umbraco_client/progressBar/style.css
-27
View File
@@ -1,27 +0,0 @@
.progressIndicator {
background: url(images/indicator.gif) repeat-x;
height: 8px;
}
.progressContainerLeft {
background: url(images/container_left.gif) repeat-x;
padding: 3px 0px 2px 5px;
float: left;
margin: 0px;
height: 13px;
}
.progressContainerRight {
background: url(images/container_right.gif) no-repeat;
padding: 0px;
width: 4px;
margin: 0px;
float: left;
height: 13px;
}
.progressBar {
margin: 0px;
padding: 0px;
display: block;
}
src/Umbraco.Web.UI/umbraco_client/propertypane/images/propertyBackground.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.8 KiB

src/Umbraco.Web.UI/umbraco_client/propertypane/images/proppane_bg.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 554 B

src/Umbraco.Web.UI/umbraco_client/propertypane/style.css
-103
View File
@@ -1,103 +0,0 @@
.propertypane {
_width: 95%;
position: relative;
display: block;
line-height: 1.1;
background: #fff url(images/propertyBackground.gif) top repeat-x;
padding: 5px;
margin:7px 0px 0px 0px;
border: 1px solid #d9d7d7;
text-align:left;
clear: both;
float: none;
}
.propertypane th
{
vertical-align: top;
text-align:left;
font-weight:bold;
font-family: Trebuchet MS, Lucida Grande, verdana, arial;
font-size:12px;
width: 16%;
}
.propertypane,.propertypane td
{
font-family: Trebuchet MS, Lucida Grande, verdana, arial;
font-size:12px;
}
.propertypane small
{
font-weight: normal;
color: #666;
font-size: .9em;
}
.propertypane small strong {
color: #000;
}
.propertypane div.propertyItem{
padding-bottom: 5px;
clear: both;
font-family: Trebuchet MS, Lucida Grande, verdana, arial;
font-size:12px;
}
.propertypane div.propertyItem .propertyItemheader{
width: 16%;
padding-right: 1%;
padding-bottom: 10px;
float: left;
clear: left;
font-weight:bold;
}
.propertypane div.propertyItem .propertyItemContent{
float: left;
padding-bottom: 5px;
clear: right;
}
.propertypane div.propertyItem .propertyItemContent #body_NameTxt
{
width: 400px;
}
h2.propertypaneTitel{font-size: 14px; color: #999;margin: 7px 0px 0px 0px; padding-bottom: 0px; line-height: 14px;}
div.propertyPaneFooter{clear: both; height: 1px; overflow: hidden; color: #fff;}
/* table styles for members section */
.members_table
{
width:100%;
border:0;
border-collapse:collapse;
}
.members_table th,
.members_table td
{
padding:.5em;
}
.members_table th
{
border-bottom:2px solid #D9D7D7;
}
.members_table td
{
border-bottom:1px solid #ccc;
}
.members_table .alt
{
background:#efefef;
}
src/Umbraco.Web.UI/umbraco_client/tablesorting/tableFilter.js
-523
View File
@@ -1,523 +0,0 @@
(function($) {
$.extend({
tablesorter: new function() {
var parsers = [], widgets = [];
this.defaults = { cssHeader: "header", cssAsc: "headerSortUp", cssDesc: "headerSortDown", sortInitialOrder: "asc", sortMultiSortKey: "shiftKey", sortForce: null, sortAppend: null, textExtraction: "simple", parsers: {}, widgets: [], widgetZebra: { css: ["even", "odd"] }, headers: {}, widthFixed: false, cancelSelection: true, sortList: [], headerList: [], dateFormat: "us", decimal: '.', debug: false };
function benchmark(s, d) { log(s + "," + (new Date().getTime() - d.getTime()) + "ms"); }
this.benchmark = benchmark;
function log(s) {
if (typeof console != "undefined" && typeof console.debug != "undefined") {
console.log(s);
}
else {
alert(s);
}
}
function buildParserCache(table, $headers) {
if (table.config.debug) {
var parsersDebug = "";
}
var rows = table.tBodies[0].rows;
if (table.tBodies[0].rows[0]) {
var list = [], cells = rows[0].cells, l = cells.length;
for (var i = 0; i < l; i++) {
var p = false;
if ($.metadata && ($($headers[i]).metadata() && $($headers[i]).metadata().sorter)) {
p = getParserById($($headers[i]).metadata().sorter);
}
else if ((table.config.headers[i] && table.config.headers[i].sorter)) {
p = getParserById(table.config.headers[i].sorter);
}
if (!p) {
p = detectParserForColumn(table, cells[i]);
}
if (table.config.debug) {
parsersDebug += "column:" + i + " parser:" + p.id + "\n";
}
list.push(p);
}
}
if (table.config.debug) {
log(parsersDebug);
}
return list;
}
;
function detectParserForColumn(table, node) {
var l = parsers.length;
for (var i = 1; i < l; i++) {
if (parsers[i].is($.trim(getElementText(table.config, node)), table, node)) {
return parsers[i];
}
}
return parsers[0];
}
function getParserById(name) {
var l = parsers.length;
for (var i = 0; i < l; i++) {
if (parsers[i].id.toLowerCase() == name.toLowerCase()) {
return parsers[i];
}
}
return false;
}
function buildCache(table) {
if (table.config.debug) {
var cacheTime = new Date();
}
var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0, totalCells = (table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length) || 0, parsers = table.config.parsers, cache = { row: [], normalized: [] };
for (var i = 0; i < totalRows; ++i) {
var c = table.tBodies[0].rows[i], cols = [];
cache.row.push($(c));
for (var j = 0; j < totalCells; ++j) {
cols.push(parsers[j].format(getElementText(table.config, c.cells[j]), table, c.cells[j]));
}
cols.push(i);
cache.normalized.push(cols);
cols = null;
}
;
if (table.config.debug) {
benchmark("Building cache for " + totalRows + " rows:", cacheTime);
}
return cache;
}
;
function getElementText(config, node) {
if (!node) return "";
var t = "";
if (config.textExtraction == "simple") {
if (node.childNodes[0] && node.childNodes[0].hasChildNodes()) {
t = node.childNodes[0].innerHTML;
}
else {
t = node.innerHTML;
}
}
else {
if (typeof(config.textExtraction) == "function") {
t = config.textExtraction(node);
}
else {
t = $(node).text();
}
}
return t;
}
function appendToTable(table, cache) {
if (table.config.debug) {
var appendTime = new Date();
}
var c = cache, r = c.row, n = c.normalized, totalRows = n.length, checkCell = (n[0].length - 1), tableBody = $(table.tBodies[0]), rows = [];
for (var i = 0; i < totalRows; i++) {
rows.push(r[n[i][checkCell]]);
if (!table.config.appender) {
var o = r[n[i][checkCell]];
var l = o.length;
for (var j = 0; j < l; j++) {
tableBody[0].appendChild(o[j]);
}
}
}
if (table.config.appender) {
table.config.appender(table, rows);
}
rows = null;
if (table.config.debug) {
benchmark("Rebuilt table:", appendTime);
}
applyWidget(table);
setTimeout(function() { $(table).trigger("sortEnd"); }, 0);
}
;
function buildHeaders(table) {
if (table.config.debug) {
var time = new Date();
}
var meta = ($.metadata) ? true : false, tableHeadersRows = [];
for (var i = 0; i < table.tHead.rows.length; i++) {
tableHeadersRows[i] = 0;
}
;
$tableHeaders = $("thead th", table);
$tableHeaders.each(function(index) {
this.count = 0;
this.column = index;
this.order = formatSortingOrder(table.config.sortInitialOrder);
if (checkHeaderMetadata(this) || checkHeaderOptions(table, index)) this.sortDisabled = true;
if (!this.sortDisabled) {
$(this).addClass(table.config.cssHeader);
}
table.config.headerList[index] = this;
});
if (table.config.debug) {
benchmark("Built headers:", time);
log($tableHeaders);
}
return $tableHeaders;
}
;
function checkCellColSpan(table, rows, row) {
var arr = [], r = table.tHead.rows, c = r[row].cells;
for (var i = 0; i < c.length; i++) {
var cell = c[i];
if (cell.colSpan > 1) {
arr = arr.concat(checkCellColSpan(table, headerArr, row++));
}
else {
if (table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row + 1])) {
arr.push(cell);
}
}
}
return arr;
}
;
function checkHeaderMetadata(cell) {
if (($.metadata) && ($(cell).metadata().sorter === false)) {
return true;
}
;
return false;
}
function checkHeaderOptions(table, i) {
if ((table.config.headers[i]) && (table.config.headers[i].sorter === false)) {
return true;
}
;
return false;
}
function applyWidget(table) {
var c = table.config.widgets;
var l = c.length;
for (var i = 0; i < l; i++) {
getWidgetById(c[i]).format(table);
}
}
function getWidgetById(name) {
var l = widgets.length;
for (var i = 0; i < l; i++) {
if (widgets[i].id.toLowerCase() == name.toLowerCase()) {
return widgets[i];
}
}
}
;
function formatSortingOrder(v) {
var i;
if (typeof v != "number") {
i = (v.toLowerCase() == "desc") ? 1 : 0;
}
else {
i = (v == (0 || 1)) ? v : 0;
}
return i;
}
function isValueInArray(v, a) {
var l = a.length;
for (var i = 0; i < l; i++) {
if (a[i][0] == v) {
return true;
}
}
return false;
}
function setHeadersCss(table, $headers, list, css) {
$headers.removeClass(css[0]).removeClass(css[1]);
var h = [];
$headers.each(function(offset) {
if (!this.sortDisabled) {
h[this.column] = $(this);
}
});
var l = list.length;
for (var i = 0; i < l; i++) {
h[list[i][0]].addClass(css[list[i][1]]);
}
}
function fixColumnWidth(table, $headers) {
var c = table.config;
if (c.widthFixed) {
var colgroup = $('<colgroup>');
$("tr:first td", table.tBodies[0]).each(function() { colgroup.append($('<col>').css('width', $(this).width())); });
$(table).prepend(colgroup);
}
;
}
function updateHeaderSortCount(table, sortList) {
var c = table.config, l = sortList.length;
for (var i = 0; i < l; i++) {
var s = sortList[i], o = c.headerList[s[0]];
o.count = s[1];
o.count++;
}
}
function multisort(table, sortList, cache) {
if (table.config.debug) {
var sortTime = new Date();
}
var dynamicExp = "var sortWrapper = function(a,b) {", l = sortList.length;
for (var i = 0; i < l; i++) {
var c = sortList[i][0];
var order = sortList[i][1];
var s = (getCachedSortType(table.config.parsers, c) == "text") ? ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ? "sortNumeric" : "sortNumericDesc");
var e = "e" + i;
dynamicExp += "var " + e + " = " + s + "(a[" + c + "],b[" + c + "]); ";
dynamicExp += "if(" + e + ") { return " + e + "; } ";
dynamicExp += "else { ";
}
var orgOrderCol = cache.normalized[0].length - 1;
dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];";
for (var i = 0; i < l; i++) {
dynamicExp += "}; ";
}
dynamicExp += "return 0; ";
dynamicExp += "}; ";
eval(dynamicExp);
cache.normalized.sort(sortWrapper);
if (table.config.debug) {
benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time:", sortTime);
}
return cache;
}
;
function sortText(a, b) { return ((a < b) ? -1 : ((a > b) ? 1 : 0)); }
;
function sortTextDesc(a, b) { return ((b < a) ? -1 : ((b > a) ? 1 : 0)); }
;
function sortNumeric(a, b) { return a - b; }
;
function sortNumericDesc(a, b) { return b - a; }
;
function getCachedSortType(parsers, i) { return parsers[i].type; }
;
this.construct = function(settings) {
return this.each(function() {
if (!this.tHead || !this.tBodies) return;
var $this, $document, $headers, cache, config, shiftDown = 0, sortOrder;
this.config = {};
config = $.extend(this.config, $.tablesorter.defaults, settings);
$this = $(this);
$headers = buildHeaders(this);
this.config.parsers = buildParserCache(this, $headers);
cache = buildCache(this);
var sortCSS = [config.cssDesc, config.cssAsc];
fixColumnWidth(this);
$headers.click(function(e) {
$this.trigger("sortStart");
var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0;
if (!this.sortDisabled && totalRows > 0) {
var $cell = $(this);
var i = this.column;
this.order = this.count++ % 2;
if (!e[config.sortMultiSortKey]) {
config.sortList = [];
if (config.sortForce != null) {
var a = config.sortForce;
for (var j = 0; j < a.length; j++) {
if (a[j][0] != i) {
config.sortList.push(a[j]);
}
}
}
config.sortList.push([i, this.order]);
}
else {
if (isValueInArray(i, config.sortList)) {
for (var j = 0; j < config.sortList.length; j++) {
var s = config.sortList[j], o = config.headerList[s[0]];
if (s[0] == i) {
o.count = s[1];
o.count++;
s[1] = o.count % 2;
}
}
}
else {
config.sortList.push([i, this.order]);
}
}
;
setTimeout(function() {
setHeadersCss($this[0], $headers, config.sortList, sortCSS);
appendToTable($this[0], multisort($this[0], config.sortList, cache));
}, 1);
return false;
}
}).mousedown(function() {
if (config.cancelSelection) {
this.onselectstart = function() { return false };
return false;
}
});
$this.bind("update", function() {
this.config.parsers = buildParserCache(this, $headers);
cache = buildCache(this);
}).bind("sorton", function(e, list) {
$(this).trigger("sortStart");
config.sortList = list;
var sortList = config.sortList;
updateHeaderSortCount(this, sortList);
setHeadersCss(this, $headers, sortList, sortCSS);
appendToTable(this, multisort(this, sortList, cache));
}).bind("appendCache", function() { appendToTable(this, cache); }).bind("applyWidgetId", function(e, id) { getWidgetById(id).format(this); }).bind("applyWidgets", function() { applyWidget(this); });
if ($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) {
config.sortList = $(this).metadata().sortlist;
}
if (config.sortList.length > 0) {
$this.trigger("sorton", [config.sortList]);
}
applyWidget(this);
});
};
this.addParser = function(parser) {
var l = parsers.length, a = true;
for (var i = 0; i < l; i++) {
if (parsers[i].id.toLowerCase() == parser.id.toLowerCase()) {
a = false;
}
}
if (a) {
parsers.push(parser);
}
;
};
this.addWidget = function(widget) { widgets.push(widget); };
this.formatFloat = function(s) {
var i = parseFloat(s);
return (isNaN(i)) ? 0 : i;
};
this.formatInt = function(s) {
var i = parseInt(s);
return (isNaN(i)) ? 0 : i;
};
this.isDigit = function(s, config) {
var DECIMAL = '\\' + config.decimal;
var exp = '/(^[+]?0(' + DECIMAL + '0+)?$)|(^([-+]?[1-9][0-9]*)$)|(^([-+]?((0?|[1-9][0-9]*)' + DECIMAL + '(0*[1-9][0-9]*)))$)|(^[-+]?[1-9]+[0-9]*' + DECIMAL + '0+$)/';
return RegExp(exp).test($.trim(s));
};
this.clearTableBody = function(table) {
if ($.browser.msie) {
function empty() { while (this.firstChild) this.removeChild(this.firstChild); }
empty.apply(table.tBodies[0]);
}
else {
table.tBodies[0].innerHTML = "";
}
};
}
});
$.fn.extend({ tablesorter: $.tablesorter.construct });
var ts = $.tablesorter;
ts.addParser({ id: "text", is: function(s) { return true; }, format: function(s) { return $.trim(s.toLowerCase()); }, type: "text" });
ts.addParser({
id: "digit",
is: function(s, table) {
var c = table.config;
return $.tablesorter.isDigit(s, c);
},
format: function(s) { return $.tablesorter.formatFloat(s); },
type: "numeric"
});
ts.addParser({ id: "currency", is: function(s) { return /^[£$€?.]/.test(s); }, format: function(s) { return $.tablesorter.formatFloat(s.replace(new RegExp(/[^0-9.]/g), "")); }, type: "numeric" });
ts.addParser({
id: "ipAddress", is: function(s) { return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s); },
format: function(s) {
var a = s.split("."), r = "", l = a.length;
for (var i = 0; i < l; i++) {
var item = a[i];
if (item.length == 2) {
r += "0" + item;
}
else {
r += item;
}
}
return $.tablesorter.formatFloat(r);
},
type: "numeric"
});
ts.addParser({ id: "url", is: function(s) { return /^(https?|ftp|file):\/\/$/.test(s); }, format: function(s) { return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), '')); }, type: "text" });
ts.addParser({ id: "isoDate", is: function(s) { return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s); }, format: function(s) { return $.tablesorter.formatFloat((s != "") ? new Date(s.replace(new RegExp(/-/g), "/")).getTime() : "0"); }, type: "numeric" });
ts.addParser({ id: "percent", is: function(s) { return /\%$/.test($.trim(s)); }, format: function(s) { return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g), "")); }, type: "numeric" });
ts.addParser({ id: "usLongDate", is: function(s) { return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)); }, format: function(s) { return $.tablesorter.formatFloat(new Date(s).getTime()); }, type: "numeric" });
ts.addParser({
id: "shortDate", is: function(s) { return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s); },
format: function(s, table) {
var c = table.config;
s = s.replace(/\-/g, "/");
if (c.dateFormat == "us") {
s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2");
}
else if (c.dateFormat == "uk") {
s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1");
}
else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") {
s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3");
}
return $.tablesorter.formatFloat(new Date(s).getTime());
},
type: "numeric"
});
ts.addParser({ id: "time", is: function(s) { return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s); }, format: function(s) { return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime()); }, type: "numeric" });
ts.addParser({
id: "metadata", is: function(s) { return false; },
format: function(s, table, cell) {
var c = table.config, p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName;
return $(cell).metadata()[p];
},
type: "numeric"
});
ts.addWidget({
id: "zebra",
format: function(table) {
if (table.config.debug) {
var time = new Date();
}
$("tr:visible", table.tBodies[0]).filter(':even').removeClass(table.config.widgetZebra.css[1]).addClass(table.config.widgetZebra.css[0]).end().filter(':odd').removeClass(table.config.widgetZebra.css[0]).addClass(table.config.widgetZebra.css[1]);
if (table.config.debug) {
$.tablesorter.benchmark("Applying Zebra widget", time);
}
}
});
})(jQuery);
src/Umbraco.Web.UI/umbraco_client/tablesorting/tableFilterUtill.js
-353
View File
@@ -1,353 +0,0 @@
//
// @author daemach
//
daemach = function() {
this.name = "Daemach's Toolbox";
this.version = "2.0";
this.debug = false;
// load extensions
this.cw = new colorWeasel(this);
this.cm = new cssMonkey(this);
};
jQuery.extend(daemach, {
prototype: {
log: function() {
if (!top.window.console || !top.window.console.log || !this.debug) {
return;
} else {
top.window.console.log([].join.call(arguments, ''));
};
},
time: function() {
if (!top.window.console || !top.window.console.time || !this.debug) {
return;
} else {
top.window.console.time([].join.call(arguments, ''));
};
},
timeEnd: function() {
if (!top.window.console || !top.window.console.timeEnd || !this.debug) {
return;
} else {
top.window.console.timeEnd([].join.call(arguments, ''));
};
},
profile: function() {
if (!top.window.console || !top.window.console.profile || !this.debug) {
return;
} else {
top.window.console.profile([].join.call(arguments, ''));
};
},
profileEnd: function() {
if (!top.window.console || !top.window.console.profileEnd || !this.debug) {
return;
} else {
top.window.console.profileEnd([].join.call(arguments, ''));
};
},
delay: function(condition, callback, scope, interval, done, i) {
interval = interval || 15;
if (typeof done === "undefined") {
var done = false;
i = setInterval(function() { $d.delay(condition, callback, scope, interval, done, i); }, interval)
} else {
var con = condition.apply(scope);
console.log(con);
if (con) {
clearInterval(i);
callback.call(scope);
}
}
}
}
});
//
// ==============================================================================================
// ColorWeasel v1.4
// ==============================================================================================
//
colorWeasel = function(root) {
this.name = "colorWeasel";
this.version = "1.4";
this.root = root;
};
jQuery.extend(colorWeasel, {
prototype: {
rgb2hsl: function(rgb) {
rgb = this.rgb2hex(rgb);
var r = parseInt(rgb.substr(0, 2), 16) / 255;
var g = parseInt(rgb.substr(2, 2), 16) / 255;
var b = parseInt(rgb.substr(4, 2), 16) / 255;
var max = Math.max(r, g, b),
min = Math.min(r, g, b),
delta = (max - min),
l = (max + min) / 2,
h = 0,
s = 0,
dR, dG, dB;
if (max != min) {
s = (l < .5) ? (max - min) / (max + min) : (max - min) / (2 - max - min);
dR = (((max - r) / 6) + (delta / 2)) / delta;
dG = (((max - g) / 6) + (delta / 2)) / delta;
dB = (((max - b) / 6) + (delta / 2)) / delta;
h = (max != r) ? (max != g) ? ((2 / 3) + dG - dR) : ((1 / 3) + dR - dB) : (dB - dG);
};
if (h < 0) { h += 1; };
if (h > 1) { h -= 1; };
h *= 360;
return [h, s, l];
},
hsl2rgb: function(h, s, l) { // H as degrees 0..360, S L as decimals, 0..1.
if (typeof h == "object" && h.constructor == Array) {
l = h[2];
s = h[1];
h = h[0];
};
h /= 360;
var y = (l > .5) ? (l + s) - (l * s) : l * (s + 1),
x = l * 2 - y,
r = Math.round(255 * _hue2Rgb(x, y, h + (1 / 3))),
g = Math.round(255 * _hue2Rgb(x, y, h)),
b = Math.round(255 * _hue2Rgb(x, y, h - (1 / 3)));
function _hue2Rgb(x, y, h) {
if (h < 0) {
h += 1;
} else if (h > 1) {
h -= 1;
};
return ((h * 6) < 1) ? (x + (y - x) * h * 6) : ((h * 2) < 1) ? y : ((h * 3) < 2) ? (x + (y - x) * ((2 / 3) - h) * 6) : x;
}
return this.zeroPad(r.toString(16)).toUpperCase() + this.zeroPad(g.toString(16)).toUpperCase() + this.zeroPad(b.toString(16)).toUpperCase();
},
zeroPad: function(num) {
var str = '0' + num;
return str.substring(str.length - 2);
},
rgb2hex: function(rgb) {
if (!rgb.match(/(rgb\()[^\)]+(\))/)) {
return rgb;
};
var t = /(rgb\()([^\)]+)(\))/.exec(rgb);
t = t[2].replace(/\s+/g, "").split(",");
var r = this.zeroPad(parseInt(t[0]).toString(16).toUpperCase());
var g = this.zeroPad(parseInt(t[1]).toString(16).toUpperCase());
var b = this.zeroPad(parseInt(t[2]).toString(16).toUpperCase());
return r + g + b;
},
ccLighter: function(rgb, perc) {
var hsl = this.rgb2hsl(rgb);
hsl[2] += (hsl[2] *= perc);
hsl[2] = (hsl[2] >= 1) ? 1 : hsl[2];
rgb = this.hsl2rgb(hsl);
return rgb;
},
ccDarker: function(rgb, perc) {
var hsl = this.rgb2hsl(rgb);
hsl[2] -= (hsl[2] *= perc);
hsl[2] = (hsl[2] <= 0) ? 0 : hsl[2];
rgb = this.hsl2rgb(hsl);
return rgb;
},
ccComplementary: function(rgb) {
var hsl = this.rgb2hsl(rgb);
hsl[0] += 180;
hsl[0] = (hsl[0] > 360) ? hsl[0] - 360 : hsl[0];
rgb = this.hsl2rgb(hsl);
return rgb;
}
}
});
//
// ==============================================================================================
// CSSMonkey v1.2
// ==============================================================================================
//
//
// @author daemach
//
cssMonkey = function(root) {
this.name = "cssMonkey";
this.version = "1.2";
this.root = root;
this.sheets = [];
if (document.styleSheets) {
this.parseStyles();
} else {
return false;
}
};
jQuery.extend(cssMonkey, {
prototype: {
parseStyles: function() {
var media, mediaType, styleSheet;
if (document.styleSheets.length > 0) {
for (var i = 0; i < document.styleSheets.length; i++) {
if (document.styleSheets[i].disabled) {
continue;
}
media = document.styleSheets[i].media;
mediaType = typeof media;
if (mediaType == "string") {
if (media == "" || media.indexOf("screen") != -1) {
styleSheet = document.styleSheets[i];
}
} else if (mediaType == "object") {
if (media.mediaText == "" || media.mediaText.indexOf("screen") != -1) {
styleSheet = document.styleSheets[i];
}
}
if (typeof styleSheet != "undefined") {
this.sheets.push(styleSheet);
}
}
}
},
toggleSheet: function(disable, id) {
var s = this.sheets;
id = (typeof id === "undefined") ? null : id;
disable = (typeof disable === "undefined") ? null : disable;
for (var i = 0; i < s.length; i++) {
if (id === null || i == id || s[i].href.indexOf(id) >= 0) {
s[i].disabled = (disable || (disable === null && !s[i].disabled)) ? true : false;
}
}
},
getRule: function(s, a) {
var rules, matches = [], sObj = [];
for (var i = this.sheets.length - 1; i >= 0; i--) {
rules = (this.sheets[i].cssRules) ? this.sheets[i].cssRules : this.sheets[i].rules;
if (!rules.length) {
return matches;
}
s = s.toLowerCase();
for (var r = rules.length - 1; r >= 0; r--) {
if (typeof rules[r].selectorText != "undefined" && rules[r].selectorText.toLowerCase() == s) {
a = (typeof a == "undefined") ? null : rules[r].style[this.camelCase(a)];
matches.push([rules[r], i, r, a]);
}
}
}
return matches;
},
_findStyle: function(cssText, attr) {
var n = (attr.indexOf(":") >= 0) ? attr.split(":")[0].trim() : attr;
if (n.length) {
for (var i = 0; i < cssText.length; i++) {
if (cssText[i].indexOf(n) >= 0) { return i; }
}
}
return -1;
},
camelCase: function(s) {
if (s == "float") { return "cssFloat"; };
for (var str = /-([a-z])/; str.test(s); s = s.replace(str, RegExp.$1.toUpperCase()));
return s;
},
getComputedStyle: function(ele, attr) {
attr = this.camelCase(attr);
if (ele.currentStyle) {
return ele.currentStyle[attr];
} else if (window.getComputedStyle) {
return window.getComputedStyle(ele, null)[attr];
}
return null;
},
getRootStyle: function(ele, attr) {
attr = this.camelCase(attr);
var tmpAttr = this.getComputedStyle(ele, attr), tmpEle = ele;
if (attr.indexOf("Color") >= 0) {
tmpAttr = this.root.cw.rgb2hex(tmpAttr);
while (tmpEle !== "body" && tmpAttr == "transparent") {
tmpEle = tmpEle.parentNode;
tmpAttr = this.root.cw.rgb2hex(this.getComputedStyle(tmpEle, attr));
}
tmpAttr = (tmpAttr == "transparent") ? "000000" : tmpAttr;
}
return tmpAttr;
},
setRule: function(selector, styles, index) {
var rules = this.getRule(selector), oCSS, nCSS, o, s, rCSS;
if (rules.length) {
nCSS = styles.split(";");
if (!nCSS[nCSS.length - 1].trim().length) { nCSS.pop(); }
for (var i = 0; i < rules.length; i++) {
oCSS = rules[i][0].style.cssText.split(";");
for (var x = 0; x < nCSS.length; x++) {
s = this._findStyle(oCSS, nCSS[x]);
if (s >= 0) {
oCSS[s] = nCSS[x];
} else {
oCSS.push(nCSS[x]);
}
}
rules[i][0].style.cssText = oCSS.join(";");
}
} else {
var sheet = this.sheets[this.sheets.length - 1];
var rules = sheet.cssRules ? sheet.cssRules : sheet.rules;
if (index == undefined) {
index = rules.length;
}
this._insertRule(sheet, selector, styles, index)
}
},
_insertRule: function(sheet, selector, styles, index) {
if (sheet.insertRule) {
sheet.insertRule(selector + "{" + styles + "}", index);
} else if (sheet.addRule) {
sheet.addRule(selector, styles, index);
}
},
deleteRule: function(s) {
var rules = this.getRule(s), sheet;
for (var i = rules.length - 1; i >= 0; i--) {
sheet = this.sheets[rules[i][1]];
if (sheet.deleteRule) {
sheet.deleteRule(rules[i][2]);
} else if (sheet.removeRule) {
sheet.removeRule(rules[i][2]);
}
}
}
}
});
//
// ==============================================================================================
// Light it up...
// ==============================================================================================
//
if (typeof $daemach == "undefined") {
var $daemach = new daemach();
}
var $d = $daemach;
src/Umbraco.Web.UI/umbraco_client/tabview/images/background.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 169 B

src/Umbraco.Web.UI/umbraco_client/tabview/images/bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 B

src/Umbraco.Web.UI/umbraco_client/tabview/images/footer_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 B

src/Umbraco.Web.UI/umbraco_client/tabview/images/footer_statusBar_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 162 B

src/Umbraco.Web.UI/umbraco_client/tabview/images/footer_statusBar_h2_bg.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 164 B

src/Umbraco.Web.UI/umbraco_client/tabview/images/left_both.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

src/Umbraco.Web.UI/umbraco_client/tabview/images/right_both.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

src/Umbraco.Web.UI/umbraco_client/tabview/javascript.js
-102
View File
@@ -1,102 +0,0 @@
/// <reference path="../Application/NamespaceManager.js" />
Umbraco.Sys.registerNamespace('Umbraco.Controls');
Umbraco.Controls.TabView = (function () {
var onChangeEvents = [];
var obj = {
setActiveTab: function (tabviewid, tabid, tabs) {
for (var i = 0; i < tabs.length; i++) {
jQuery("#" + tabs[i]).attr("class", "tabOff");
jQuery("#" + tabs[i] + "layer").hide();
}
var activeTab = jQuery("#" + tabid).attr("class", "tabOn");
jQuery("#" + tabid + "layer").show();
jQuery("#" + tabviewid + '_activetab').val(tabid);
// show first tinymce toolbar
jQuery(".tinymceMenuBar").hide();
jQuery(document).ready(function () {
jQuery("#" + tabid + "layer .tinymceMenuBar:first").show();
});
for (var i = 0; i < onChangeEvents.length; i++) {
var fn = onChangeEvents[i];
fn.apply(activeTab, [tabviewid, tabid, tabid]);
}
},
onActiveTabChange: function (fn) {
onChangeEvents.push(fn);
},
resizeTabViewTo: function (TabPageArr, TabViewName, tvHeight, tvWidth) {
if (!tvHeight) {
tvHeight = jQuery(window).height(); //getViewportHeight();
if (document.location) {
tvHeight = tvHeight - 10;
}
}
if (!tvWidth) {
tvWidth = jQuery(window).width(); // getViewportWidth();
if (document.location) {
tvWidth = tvWidth - 10;
}
}
var tabviewHeight = tvHeight - 12;
jQuery("#" + TabViewName).width(tvWidth);
jQuery("#" + TabViewName).height(tabviewHeight);
for (i = 0; i < TabPageArr.length; i++) {
scrollwidth = tvWidth - 30;
jQuery("#" + TabPageArr[i] + "layer_contentlayer").height((tabviewHeight - 67));
//document.getElementById(TabPageArr[i] +"layer_contentlayer").style.border = "2px solid #fff";
jQuery("#" + TabPageArr[i] + "layer_contentlayer").width((tvWidth - 2));
jQuery("#" + TabPageArr[i] + "layer_menu").width((scrollwidth));
jQuery("#" + TabPageArr[i] + "layer_menu_slh").width((scrollwidth));
}
},
tabSwitch: function (direction) {
var preFix = "TabView1";
var currentTab = jQuery("#" + preFix + "_activetab").val();
currentTab = currentTab.substr(preFix.length + 4, currentTab.length - preFix.length - 4);
var nextTab = Math.round(currentTab) + direction;
if (nextTab < 10)
nextTab = "0" + nextTab;
// Try to grab the next one!
if (nextTab != "00") {
if (jQuery("#" + preFix + '_tab' + nextTab) != null) {
setActiveTab(preFix, preFix + '_tab' + nextTab, eval(preFix + '_tabs'));
}
}
}
};
return obj;
})();
function setActiveTab(tabviewid, tabid, tabs) {
Umbraco.Controls.TabView.setActiveTab(tabviewid, tabid, tabs);
}
function resizeTabView(TabPageArr, TabViewName) {
Umbraco.Controls.TabView.resizeTabViewTo(TabPageArr, TabViewName);
}
function resizeTabViewTo(TabPageArr, TabViewName, tvHeight, tvWidth) {
Umbraco.Controls.TabView.resizeTabViewTo(TabPageArr, TabViewName, tvHeight, tvWidth);
}
function tabSwitch(direction) {
Umbraco.Controls.TabView.tabSwitch(direction);
}
src/Umbraco.Web.UI/umbraco_client/tabview/oldstyle.css
-76
View File
@@ -1,76 +0,0 @@
.header {
float:left;
width:100%;
background:#DAE0D2 url("bg.gif") repeat-x bottom;
font-size:93%;
line-height:normal;
}
.header ul {
margin:0;
padding:10px 10px 0;
list-style:none;
}
li.tabOff, li.tabOn {
float:left;background:url("left_both.gif") no-repeat left top;
margin:0;
padding:0 0 0 9px;
border-bottom:1px solid #765;
color:#000;
}
a.tabOff, a.tabOn {
float:left;
display:block;
width:.1em;
background:url("right_both.gif") no-repeat right top;
padding:5px 15px 4px 6px;
text-decoration:none;
font-weight:bold;
color:#765;
}
.header > ul a {width:auto;}
#header a:hover {
color:#333;
}
.header li:hover, .header li:hover a {
background-position:0% -150px;
color:#333;
}
.header li:hover a {
background-position:100% -150px;
}
li.tabOn {
background-position:0 -150px;
border-width:0;
}
li.tabOn a {
background-position:100% -150px;
padding-bottom:5px;
color:#333;
}
.layer {
display:none;
}
.menubar {
background:#F5F5F5;
height:32px;
width:100%;
float:left;
border-bottom:1px solid #919B9C;
}
.tabpagecontainer {
border-bottom:1px solid #919B9C;
border-left:1px solid #919B9C;
border-right:1px solid #919B9C;
height:99%;
}

Some files were not shown because too many files have changed in this diff Show More