swcs/OurUmbraco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 7.2.5

Browse Source
This commit is contained in:
Sebastiaan Janssen
2015-06-01 17:58:24 +02:00
parent 2c547fde10
commit 83bb4087ca
131 changed files with 6170 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marketplace/packages.config
+5 -4
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="3.0.0" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net451" />
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net451" />
<package id="Examine" version="0.1.60.2941" targetFramework="net451" />
<package id="Examine" version="0.1.63.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net451" />
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net451" />
@@ -16,11 +16,12 @@
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
<package id="MiniProfiler" version="2.1.0" targetFramework="net451" />
<package id="MySql.Data" version="6.6.5" targetFramework="net451" />
<package id="MySql.Data" version="6.9.6" targetFramework="net451" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net451" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.2" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.5" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
</packages>
Marketplace/uProject.csproj
+65 -57
View File
@@ -56,24 +56,25 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
</Reference>
<Reference Include="businesslogic, Version=1.0.5529.18523, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core">
<HintPath>..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll</HintPath>
<Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
</Reference>
<Reference Include="cms, Version=1.0.5529.18524, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5529.18525, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -82,9 +83,9 @@
<Reference Include="Elmah">
<HintPath>..\dependencies\Our\Elmah.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.60.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.60.2941\lib\Examine.dll</HintPath>
<Reference Include="Examine, Version=0.1.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Examine.0.1.63.0\lib\Examine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.6.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -102,13 +103,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
</Reference>
<Reference Include="interfaces, Version=1.0.5529.18522, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net">
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
@@ -142,8 +143,8 @@
<HintPath>..\dependencies\MarketPlace\MarketPlace.Webservices.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure">
@@ -158,17 +159,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5529.18524, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -176,12 +177,12 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\System.Data.SqlServerCe.dll</HintPath>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -234,49 +235,49 @@
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Xml.Linq" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="uForum, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\forigndlls\uForum.dll</HintPath>
</Reference>
<Reference Include="umbraco, Version=1.0.5529.18525, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5610.18898, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5529.18522, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5529.18523, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Ecommerce">
<HintPath>..\dependencies\Our\Umbraco.Ecommerce.dll</HintPath>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5529.18526, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5529.18526, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5529.18525, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Support">
<HintPath>..\dependencies\Our\Umbraco.Support.dll</HintPath>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5529.18527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5610.18901, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.18524, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbracoMemberControls">
<HintPath>..\dependencies\Our\umbracoMemberControls.dll</HintPath>
@@ -285,8 +286,8 @@
<HintPath>..\forigndlls\uPowers.dll</HintPath>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.2\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="uVersion">
<HintPath>..\forigndlls\uVersion.dll</HintPath>
@@ -382,6 +383,13 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Content Include="web.config" />
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
</None>
<None Include="web.Release.config">
<DependentUpon>web.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<WebReferences Include="Web References\" />
Notification/Notification.csproj
+58 -62
View File
@@ -49,33 +49,33 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
</Reference>
<Reference Include="businesslogic, Version=1.0.5462.37510, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll</HintPath>
<Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
</Reference>
<Reference Include="cms, Version=1.0.5462.37511, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5462.37515, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.60.2941, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.60.2941\lib\Examine.dll</HintPath>
<Reference Include="Examine, Version=0.1.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Examine.0.1.63.0\lib\Examine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.6.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -93,25 +93,21 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
</Reference>
<Reference Include="interfaces, Version=1.0.5462.37501, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.Web.Helpers.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
@@ -125,17 +121,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5462.37514, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -144,12 +140,12 @@
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll</HintPath>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -192,44 +188,44 @@
</Reference>
<Reference Include="System.Xml" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.5462.37518, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5610.18898, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5462.37503, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5462.37509, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5462.37523, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5462.37525, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5462.37516, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5462.37527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5610.18901, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.37513, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Notification/packages.config
+5 -4
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="3.0.0" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net451" />
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net451" />
<package id="Examine" version="0.1.60.2941" targetFramework="net451" />
<package id="Examine" version="0.1.63.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net451" />
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net451" />
@@ -16,11 +16,12 @@
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
<package id="MiniProfiler" version="2.1.0" targetFramework="net451" />
<package id="MySql.Data" version="6.6.5" targetFramework="net451" />
<package id="MySql.Data" version="6.9.6" targetFramework="net451" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net451" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.1" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.5" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
</packages>
NotificationsWeb/NotificationsWeb.csproj
+58 -60
View File
@@ -49,31 +49,33 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
</Reference>
<Reference Include="businesslogic, Version=1.0.5462.37510, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core">
<HintPath>..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll</HintPath>
<Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
</Reference>
<Reference Include="cms, Version=1.0.5462.37511, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5462.37515, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
</Reference>
<Reference Include="Examine">
<HintPath>..\packages\Examine.0.1.60.2941\lib\Examine.dll</HintPath>
<Reference Include="Examine, Version=0.1.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Examine.0.1.63.0\lib\Examine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.6.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -91,25 +93,21 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
</Reference>
<Reference Include="interfaces, Version=1.0.5462.37501, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.Web.Helpers.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
@@ -123,28 +121,28 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5462.37514, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll</HintPath>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -197,44 +195,44 @@
<Reference Include="System.Web.Mobile" />
<Reference Include="System.Xml.Linq" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.5462.37518, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5610.18898, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5462.37503, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5462.37509, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5462.37523, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5462.37525, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5462.37516, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5462.37527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5610.18901, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.37513, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
NotificationsWeb/packages.config
+5 -4
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="3.0.0" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net451" />
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net451" />
<package id="Examine" version="0.1.60.2941" targetFramework="net451" />
<package id="Examine" version="0.1.63.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net451" />
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net451" />
@@ -16,11 +16,12 @@
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
<package id="MiniProfiler" version="2.1.0" targetFramework="net451" />
<package id="MySql.Data" version="6.6.5" targetFramework="net451" />
<package id="MySql.Data" version="6.9.6" targetFramework="net451" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net451" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.1" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.5" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
</packages>
OurUmbraco.Site/Global.asax
+1 -1
View File
@@ -1 +1 @@
<%@ Application Codebehind="Global.asax.cs" Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %>
<%@ Application Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %>
OurUmbraco.Site/OurUmbraco.Site.csproj
+58 -56
View File
@@ -51,24 +51,25 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
</Reference>
<Reference Include="businesslogic, Version=1.0.5462.37510, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core">
<HintPath>..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll</HintPath>
<Reference Include="ClientDependency.Core, Version=1.8.3.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
</Reference>
<Reference Include="cms, Version=1.0.5462.37511, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5462.37515, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -81,8 +82,9 @@
<HintPath>..\packages\EasyHttp.1.6.29.0\lib\net40\EasyHttp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Examine">
<HintPath>..\packages\Examine.0.1.60.2941\lib\Examine.dll</HintPath>
<Reference Include="Examine, Version=0.1.63.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Examine.0.1.63.0\lib\Examine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FergusonMoriyama.ConfigFormRenderer">
<HintPath>..\dependencies\Our\FergusonMoriyama.ConfigFormRenderer.dll</HintPath>
@@ -115,17 +117,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll</HintPath>
</Reference>
<Reference Include="interfaces, Version=1.0.5462.37501, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="JsonFx, Version=2.0.1209.2802, Culture=neutral, PublicKeyToken=315052dd637f8a52, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\JsonFx.2.0.1209.2802\lib\net40\JsonFx.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -147,8 +149,8 @@
<HintPath>..\dependencies\MarketPlace\Marketplace.Umbraco.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -167,9 +169,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -190,18 +192,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dependencies\Our\SignalR.dll</HintPath>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5462.37514, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll</HintPath>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -256,53 +258,53 @@
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Xml.Linq" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.5462.37518, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5610.18898, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5462.37503, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5610.18894, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5462.37509, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5610.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Ecommerce">
<HintPath>..\dependencies\Our\Umbraco.Ecommerce.dll</HintPath>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5462.37523, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5462.37525, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5610.18900, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.presentation.xslt.Exslt">
<HintPath>..\dependencies\Our\umbraco.presentation.xslt.Exslt.dll</HintPath>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5462.37516, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5610.18897, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Support">
<HintPath>..\dependencies\Our\Umbraco.Support.dll</HintPath>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5462.37527, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5610.18901, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.37513, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="YouTrackSharp">
<HintPath>..\packages\YouTrackSharp.2.0.11.0\lib\net40\YouTrackSharp.dll</HintPath>
OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml
+2 -2
View File
@@ -65,7 +65,7 @@
if(cfg != null)
foreach (JProperty property in cfg.Properties()) {
attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
attrs.Add(property.Name + "=\"" + property.Value.ToString() + "\"");
}
JObject style = contentItem.styles;
@@ -76,7 +76,7 @@
cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
if (cssVals.Any())
attrs.Add("style='" + string.Join(" ", cssVals) + "'");
attrs.Add("style=\"" + string.Join(" ", cssVals) + "\"");
}
return new MvcHtmlString(string.Join(" ", attrs));
OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml
+2 -2
View File
@@ -65,7 +65,7 @@
if(cfg != null)
foreach (JProperty property in cfg.Properties()) {
attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
attrs.Add(property.Name + "=\"" + property.Value.ToString() + "\"");
}
JObject style = contentItem.styles;
@@ -76,7 +76,7 @@
cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
if (cssVals.Any())
attrs.Add("style='" + string.Join(" ", cssVals) + "'");
attrs.Add("style=\"" + string.Join(" ", cssVals) + "\"");
}
return new MvcHtmlString(string.Join(" ", attrs));
OurUmbraco.Site/config/umbracoSettings.config
+16 -1
View File
@@ -12,6 +12,12 @@
<errors>
<error404>1</error404>
<!--
The value for error pages can be:
* A content item's integer ID (example: 1234)
* A content item's GUID ID (example: 26C1D84F-C900-4D53-B167-E25CC489DAC8)
* An XPath statement (example: //errorPages[@nodeName='My cool error']
-->
<!--
<error404>
<errorPage culture="default">1</errorPage>
@@ -180,10 +186,19 @@
finder or by the alt. template. Set this option to true to preserve the template set by the finder
or by the alt. template, in case of an internal redirect.
(false by default, and in fact should remain false unless you know what you're doing)
@disableAlternativeTemplates
By default you can add a altTemplate querystring or append a template name to the current URL which
will make Umbraco render the content on the current page with the template you requested, for example:
http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
"About Us" page with a template with the alias Home. Setting this setting to true stops that behavior
@disableFindContentByIdPath
By default you can call any content Id in the url and show the content with that id, for example:
http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting
this setting to true stops that behavior
-->
<web.routing
trySkipIisCustomErrors="false"
internalRedirectPreservesTemplate="false">
internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false">
</web.routing>
</settings>
OurUmbraco.Site/packages.config
+5 -4
View File
@@ -2,9 +2,9 @@
<packages>
<package id="AspNetMvc" version="3.0.20105.1" targetFramework="net40" />
<package id="AutoMapper" version="3.0.0" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3" targetFramework="net451" />
<package id="ClientDependency" version="1.8.3.1" targetFramework="net451" />
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net451" />
<package id="Examine" version="0.1.60.2941" targetFramework="net451" />
<package id="Examine" version="0.1.63.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.6" targetFramework="net451" />
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net451" />
@@ -19,14 +19,15 @@
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net451" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net451" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
<package id="microsoft-web-helpers" version="1.0" targetFramework="net40" />
<package id="MiniProfiler" version="2.1.0" targetFramework="net451" />
<package id="MySql.Data" version="6.6.5" targetFramework="net451" />
<package id="MySql.Data" version="6.9.6" targetFramework="net451" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net451" />
<package id="RestSharp" version="104.1" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.1" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.2.5" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
<package id="YouTrackSharp" version="2.0.11.0" targetFramework="net40" />
</packages>
OurUmbraco.Site/umbraco/Install/Views/Index.cshtml
+1 -1
View File
@@ -54,7 +54,7 @@
"umbracoBaseUrl": "@ViewBag.UmbracoBaseFolder"
};
</script>
<script src="lib/lazyload/lazyload.min.js"></script>
<script src="lib/rgrove-lazyload/lazyload.js"></script>
<script src="js/install.loader.js"></script>
</body>
</html>
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml
+7 -5
View File
@@ -1,19 +1,21 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
This snippet makes a breadcrumb of parents using an unordred html list.
This snippet makes a breadcrumb of parents using an unordered html list.
How it works:
- It uses the Ancestors() method to get all parents and then generates links so the visitor get go back
- It uses the Ancestors() method to get all parents and then generates links so the visitor can go back
- Finally it outputs the name of the current page (without a link)
*@
@if (CurrentPage.Ancestors().Any())
@{ var selection = CurrentPage.Ancestors(); }
@if (selection.Any())
{
<ul class="breadcrumb">
@* For each page in the ancestors collection which have been ordered by Level (so we start with the highest top node first) *@
@foreach (var page in CurrentPage.Ancestors().OrderBy("Level"))
@foreach (var item in selection.OrderBy("Level"))
{
<li><a href="@page.Url">@page.Name</a> <span class="divider">/</span></li>
<li><a href="@item.Url">@item.Name</a> <span class="divider">/</span></li>
}
@* Display the current page as the last item in the list *@
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/Gallery.cshtml
+40 -21
View File
@@ -1,31 +1,50 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
Macro to display a gallery from a media folder. Add the below parameter to the macro
and use it to point the macro at a specific media folder to display it's content as
a simple list.
Macro to display a gallery of images from media the media section.
Works with either a 'Single Media Picker' or a 'Multiple Media Picker' macro parameter (see below).
Macro Parameters To Create, for this macro to work:
Alias:mediaId Name:Media Folder ID Type:Single Media Picker
How it works:
- Confirm the macro parameter has been passed in with a value
- Loop through all the media Id's passed in (might be a single item, might be many)
- Display any individual images, as well as any folders of images
Macro Parameters To Create, for this macro to work:
Alias:mediaIds Name:Select folders and/or images Type: Multiple Media Picker
Type: (note: you can use a Single Media Picker if that's more appropriate to your needs)
*@
@if (Model.MacroParameters["mediaId"] != null)
@{ var mediaIds = Model.MacroParameters["mediaIds"]; }
@if (mediaIds != null)
{
@* Get the media folder as a dynamic node *@
var mediaFolder = Umbraco.Media(Model.MacroParameters["mediaId"]);
<ul class="thumbnails">
@foreach (var mediaId in mediaIds.ToString().Split(','))
{
var media = Umbraco.Media(mediaId);
if (mediaFolder.Children.Any())
{
<ul class="thumbnails">
@* for each item in children of the selected media folder *@
@foreach (var mediaItem in mediaFolder.Children)
@* a single image *@
if (media.DocumentTypeAlias == "Image")
{
<li class="span2">
<a href="@mediaItem.umbracoFile" class="thumbnail">
<img src="@mediaItem.umbracoFile" alt="@mediaItem.Name" />
</a>
</li>
@Render(media);
}
</ul>
}
@* a folder with images under it *@
if (media.Children("Image").Any())
{
foreach (var image in media.Children("Image"))
{
@Render(image);
}
}
}
</ul>
}
@helper Render(dynamic item)
{
<li class="span2">
<a href="@item.umbracoFile" class="thumbnail">
<img src="@item.umbracoFile" alt="@item.Name" />
</a>
</li>
}
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
+14 -6
View File
@@ -1,16 +1,24 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
This snippet makes a list of links to the of parents of the current page using an unordered html list.
@* Check the current page has ancestors *@
@if (CurrentPage.Ancestors().Any())
{
How it works:
- It uses the Ancestors() method to get all parents and then generates links so the visitor can go back
- Finally it outputs the name of the current page (without a link)
*@
@{ var selection = CurrentPage.Ancestors(); }
@if (selection.Any())
{
<ul>
@* For each page in the ancestors collection which have been ordered by Level (so we start with the highest top node first) *@
@foreach (var page in CurrentPage.Ancestors().OrderBy("Level"))
@foreach (var item in selection.OrderBy("Level"))
{
<li><a href="@page.Url">@page.Name</a> &raquo;</li>
<li><a href="@item.Url">@item.Name</a> &raquo;</li>
}
@* Display the current page as the last item in the list *@
<li>@CurrentPage.Name</li>
</ul>
}
}
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
+23 -11
View File
@@ -1,21 +1,33 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
=== Macro Parameters To Create ===
Alias:nodeId Name:Node ID Type:Content Picker
Macro to list all child pages under a specific page in the content tree.
How it works:
- Confirm the startNodeId macro parameter has been passed in with a value
- Loop through all child pages
- Display a list of link to those pages, sorted by the value of the propertyAlias
Macro Parameters To Create, for this macro to work:
Alias:startNodeId Name:Select starting page Type:Content Picker
*@
@if (Model.MacroParameters["startNodeID"] != null)
@{ var startNodeId = Model.MacroParameters["startNodeId"]; }
@if (startNodeId != null)
{
@* Get the start node as a dynamic node *@
var startNode = Umbraco.Content(Model.MacroParameters["startNodeID"]);
if (startNode.Children.Where("Visible").Any())
@* Get the starting page *@
var startNode = Umbraco.Content(startNodeId);
var selection = startNode.Children.Where("Visible");
if (selection.Any())
{
<ul>
@foreach (var page in startNode.Children.Where("Visible"))
{
<li><a href="@page.Url">@page.Name</a></li>
@foreach (var item in selection)
{
<li>
<a href="@item.Url">@item.Name</a>
</li>
}
</ul>
}
}
}
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml
+6 -6
View File
@@ -1,14 +1,14 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@* Ensure that the Current Page has children, where the property umbracoNaviHide is not True *@
@if (CurrentPage.Children.Where("Visible").Any())
@{ var selection = CurrentPage.Children.Where("Visible"); }
@if (selection.Any())
{
<ul>
@* For each child page under the root node, where the property umbracoNaviHide is not True *@
@foreach (var childPage in CurrentPage.Children.Where("Visible"))
<ul>
@foreach (var item in selection)
{
<li>
<a href="@childPage.Url">@childPage.Name</a>
<a href="@item.Url">@item.Name</a>
</li>
}
</ul>
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
+6 -5
View File
@@ -1,10 +1,11 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@{ var selection = CurrentPage.Children.Where("Visible").OrderBy("CreateDate desc"); }
@* OrderBy() takes the property to sort by and optionally order desc/asc *@
<ul>
@* OrderBy() takes the property to sort by and optionally order desc/asc *@
@foreach (var page in CurrentPage.Children.Where("Visible").OrderBy("CreateDate desc"))
{
<li><a href="@page.Url">@page.Name</a></li>
@foreach (var item in selection)
{
<li><a href="@item.Url">@item.Name</a></li>
}
</ul>
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
+7 -4
View File
@@ -1,8 +1,11 @@
@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
@{ var selection = CurrentPage.Children.Where("Visible").OrderBy("Name"); }
@* OrderBy() takes the property to sort by *@
<ul>
@* OrderBy() takes the property to sort by *@
@foreach (var page in CurrentPage.Children.Where("Visible").OrderBy("Name"))
{
<li><a href="@page.Url">@page.Name</a></li>
@foreach (var item in selection)
{
<li><a href="@item.Url">@item.Name</a></li>
}
</ul>
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
+20 -12
View File
@@ -1,18 +1,26 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
Macro parameter to be set on the macro
Macro to list all child pages with a specific property, sorted by the value of that property.
How it works:
- Confirm the propertyAlias macro parameter has been passed in with a value
- Loop through all child pages that have the propertyAlias
- Display a list of link to those pages, sorted by the value of the propertyAlias
Macro Parameters To Create, for this macro to work:
Alias:propertyAlias Name:Property Alias Type:Textbox
*@
*@
@{
@* Get the property alias we want to filter on from the macro parameter *@
var propertyAlias = Model.MacroParameters["propertyAlias"];
@{ var propertyAlias = Model.MacroParameters["propertyAlias"]; }
@if (propertyAlias != null)
{
var selection = CurrentPage.Children.Where("Visible").OrderBy(propertyAlias);
}
<ul>
@foreach (var page in selection)
{
<li><a href="@page.Url">@page.Name</a></li>
}
</ul>
<ul>
@foreach (var item in selection)
{
<li><a href="@item.Url">@item.Name</a></li>
}
</ul>
}
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
+18 -23
View File
@@ -1,30 +1,25 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
This snippet shows how simple it is to fetch only children of a certain Document Type using Razor. Instead of
calling .Children, simply call .AliasOfDocumentType in plural.
For instance .Textpages or .NewsArticles (you can find the alias of your Document Type by editing it in the
Settings section).
This snippet shows how simple it is to fetch only children of a certain Document Type using Razor.
Be sure to change "DocumentTypeAlias" below to match your needs, such as "TextPage" or "NewsItems".
(You can find the alias of your Document Type by editing it in the Settings section)
*@
@{
@*Build a query and return the visible items *@
var selection= CurrentPage.Textpages.Where("Visible");
@*
Example of more querying, if you have a true/false property with the alias of shouldBeFeatured:
var selection= Model.Textpages.Where("shouldBeFeatured == true").Where("Visible");
*@
}
@*Determine if there are any nodes in the selection, then render list *@
@if(selection.Any()){
<ul>
@foreach(var page in selection){
<li><a href="@page.Url">@page.Name</a></li>
}
</ul>
@{ var selection = CurrentPage.Children("DocumentTypeAlias").Where("Visible"); }
@*
As an example of more querying, if you have a true/false property with the alias of shouldBeFeatured:
var selection= CurrentPage.Children("DocumentTypeAlias").Where("shouldBeFeatured == true").Where("Visible");
*@
@if (selection.Any())
{
<ul>
@foreach (var item in selection)
{
<li><a href="@item.Url">@item.Name</a></li>
}
</ul>
}
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml
+31 -24
View File
@@ -1,24 +1,31 @@
@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
@* Ensure that the Current Page has children, where the property umbracoNaviHide is not True *@
@if (CurrentPage.Children.Where("Visible").Any())
@*
This snippet creates links for every single page (no matter how deep) below
the page currently being viewed by the website visitor, displayed as nested unordered html lists.
*@
@{ var selection = CurrentPage.Children.Where("Visible"); }
@* Ensure that the Current Page has children *@
@if (selection.Any())
{
@* Get the first page in the children, where the property umbracoNaviHide is not True *@
var naviLevel = CurrentPage.Children.Where("Visible").First().Level;
var naviLevel = CurrentPage.FirstChild().Where("Visible").Level;
@* Add in level for a CSS hook *@
<ul class="level-@naviLevel">
@* For each child page under the root node, where the property umbracoNaviHide is not True *@
@foreach (var childPage in CurrentPage.Children.Where("Visible"))
<ul class="level-@naviLevel">
@* For each child page where the property umbracoNaviHide is not True *@
@foreach (var item in selection)
{
<li>
<a href="@childPage.Url">@childPage.Name</a>
<a href="@item.Url">@item.Name</a>
@* if the current page has any children, where the property umbracoNaviHide is not True *@
@if (childPage.Children.Where("Visible").Any())
{
@* if this child page has any children, where the property umbracoNaviHide is not True *@
@if (item.Children.Where("Visible").Any())
{
@* Call our helper to display the children *@
@childPages(childPage.Children)
@childPages(item.Children)
}
</li>
}
@@ -26,26 +33,26 @@
}
@helper childPages(dynamic pages)
{
@helper childPages(dynamic selection)
{
@* Ensure that we have a collection of pages *@
if (pages.Any())
if (selection.Any())
{
@* Get the first page in pages and get the level *@
var naviLevel = pages.First().Level;
var naviLevel = selection.First().Level;
@* Add in level for a CSS hook *@
<ul class="level-@(naviLevel)">
@foreach (var page in pages.Where("Visible"))
@foreach (var item in selection.Where("Visible"))
{
<li>
<a href="@page.Url">@page.Name</a>
@* if the current page has any children, where the property umbracoNaviHide is not True *@
@if (page.Children.Where("Visible").Any())
{
<a href="@item.Url">@item.Name</a>
@* if the this page has any children, where the property umbracoNaviHide is not True *@
@if (item.Children.Where("Visible").Any())
{
@* Call our helper to display the children *@
@childPages(page.Children)
@childPages(item.Children)
}
</li>
}
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
+20 -10
View File
@@ -1,23 +1,33 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
Macro to display a series of images from a media folder.
How it works:
- Confirm the macro parameter has been passed in with a value
- Loop through all the media Id's passed in (might be a single item, might be many)
- Display any individual images, as well as any folders of images
Macro Parameters To Create, for this macro to work:
Alias:mediaId Name:Media Folder ID Type:Single Media Picker
Alias:mediaId Name:Select folder with images Type:Single Media Picker
*@
@if (Model.MacroParameters["mediaId"] != null)
@{ var mediaId = Model.MacroParameters["mediaId"]; }
@if (mediaId != null)
{
@* Get the media folder as a dynamic node *@
var mediaFolder = Umbraco.Media(Model.MacroParameters["mediaId"]);
if (mediaFolder.Children.Any())
@* Get all the media item associated with the id passed in *@
var media = Umbraco.Media(mediaId);
var selection = media.Children("Image");
if (selection.Any())
{
<ul>
@* for each item in children of the selected media folder *@
@foreach (var mediaItem in mediaFolder.Children)
@foreach (var item in selection)
{
<li><img src="@mediaItem.umbracoFile" alt="@mediaItem.Name" /></li>
<li>
<img src="@item.umbracoFile" alt="@item.Name" />
</li>
}
</ul>
}
}
}
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml
+13 -12
View File
@@ -1,20 +1,21 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
Macro to list nodes from a Multinode tree picker, using the pickers default settings.
Content Values stored as xml.
This snippet lists the items from a Multinode tree picker, using the pickers default settings.
Content Values stored as xml.
To get it working with any site's data structure, simply set the selection equal to the property which has the
multinode treepicker (so: replace "PropertyWithPicker" with the alias of your property).
To get it working with any site's data structure, set the selection equal to the property which has the
multinode treepicker (so: replace "PropertyWithPicker" with the alias of your property).
*@
@* Lists each selected value from the picker as a link *@
@{ var selection = CurrentPage.PropertyWithPicker.Split(','); }
<ul>
@foreach(var id in CurrentPage.PropertyWithPicker.Split(',')){
@*For each link, get the node, and display its name and url*@
var content = Umbraco.Content(id);
<li><a href="@content.Url">@content.Name</a></li>
}
@foreach (var id in selection)
{
var item = Umbraco.Content(id);
<li>
<a href="@item.Url">@item.Name</a>
</li>
}
</ul>
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/Navigation.cshtml
+7 -10
View File
@@ -1,21 +1,18 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@*
Macro to display child pages below the root page of a standard website.
Also highlights the current active page/section in the navigation with
the css class "current".
This snippet displays a list of links of the pages immediately under the top-most page in the content tree.
This is the home page for a standard website.
It also highlights the current active page/section in the navigation with the css class "current".
*@
@{
@* Get the root of the website *@
var root = CurrentPage.AncestorOrSelf(1);
}
@{ var selection = CurrentPage.Site().Children.Where("Visible"); }
<ul>
@foreach (var page in root.Children.Where("Visible"))
@foreach (var item in selection)
{
<li class="@(page.IsAncestorOrSelf(CurrentPage) ? "current" : null)">
<a href="@page.Url">@page.Name</a>
<li class="@(item.IsAncestorOrSelf(CurrentPage) ? "current" : null)">
<a href="@item.Url">@item.Name</a>
</li>
}
</ul>
OurUmbraco.Site/umbraco/PartialViewMacros/Templates/SiteMap.cshtml
+17 -7
View File
@@ -1,29 +1,39 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@* Render the sitemap by passing the root node to the traverse helper *@
@*
This snippet makes a list of links of all visible pages of the site, as nested unordered html lists.
How it works:
- It uses a custom Razor helper called Traverse() to select and display the markup and links.
*@
@{ var selection = CurrentPage.Site(); }
<div class="sitemap">
@Traverse(CurrentPage.AncestorOrSelf())
@* Render the sitemap by passing the root node to the traverse helper, below *@
@Traverse(selection)
</div>
@* Helper method to travers through all descendants *@
@helper Traverse(dynamic node)
{
@* Update the level to reflect how deep you want the sitemap to go *@
var maxLevelForSitemap = 4;
@* Select visible children *@
var items = node.Children.Where("Visible").Where("Level <= " + maxLevelForSitemap);
var selection = node.Children.Where("Visible").Where("Level <= " + maxLevelForSitemap);
@* If any items are returned, render a list *@
if (items.Any())
if (selection.Any())
{
<ul>
@foreach (var item in items)
@foreach (var item in selection)
{
<li class="level-@item.Level">
<a href="@item.Url">@item.Name</a>
@* Run the traverse helper again *@
@* Run the traverse helper again for any child pages *@
@Traverse(item)
</li>
}
OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml
+1 -1
View File
@@ -54,7 +54,7 @@
</script>
@*And finally we can load in our angular app*@
<script type="text/javascript" src="lib/lazyload/lazyload.min.js"></script>
<script type="text/javascript" src="lib/rgrove-lazyload/lazyload.js"></script>
<script type="text/javascript" src="@Url.GetUrlWithCacheBust("Application", "BackOffice")"></script>
</body>
OurUmbraco.Site/umbraco/Views/Default.cshtml
+5 -1
View File
@@ -20,6 +20,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="robots" content="noindex, nofollow">
<title ng-bind="$root.locationTitle">Umbraco</title>
@@ -57,12 +58,15 @@
"umbracoUrls": {
"authenticationApiBaseUrl": "@(Url.GetUmbracoApiServiceBaseUrl<AuthenticationController>(controller => controller.PostLogin(null)))",
"serverVarsJs": '@Url.GetUrlWithCacheBust("ServerVariables", "BackOffice")'
},
"application": {
"applicationPath" : "@Context.Request.ApplicationPath"
}
};
</script>
@*And finally we can load in our angular app*@
<script type="text/javascript" src="lib/lazyload/lazyload.min.js"></script>
<script type="text/javascript" src="lib/rgrove-lazyload/lazyload.js"></script>
<script type="text/javascript" src="@Url.GetUrlWithCacheBust("Application", "BackOffice")"></script>
@{
OurUmbraco.Site/umbraco/Views/common/dialogs/mediapicker.html
+131 -134
View File
@@ -1,150 +1,147 @@
<form ng-controller="Umbraco.Dialogs.MediaPickerController" id="fileupload" method="POST" enctype="multipart/form-data"
data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
<form ng-controller="Umbraco.Dialogs.MediaPickerController" id="fileupload"
method="POST"
enctype="multipart/form-data"
umb-image-upload="options">
<div class="umb-panel umb-dialogs-mediapicker" ng-if="target">
<div class="umb-panel-body no-header with-footer compact">
<umb-pane>
<umb-control-group ng-if="target.url">
<div class="clearfix">
<umb-image-gravity
src="target.url"
center="target.focalPoint" />
</div>
<div class="umb-panel umb-dialogs-mediapicker" ng-if="target">
<div class="umb-panel-body no-header with-footer compact">
<umb-pane>
<umb-control-group ng-if="target.url">
<div ng-if="cropSize">
<h5>Preview</h5>
<umb-image-thumbnail
center="target.focalPoint"
src="target.url"
height="{{cropSize.height}}"
width="{{cropSize.width}}"
max-size="400"/>
</div>
<div class="clearfix">
<umb-image-gravity src="target.url"
center="target.focalPoint" />
</div>
<div ng-if="cropSize">
<h5>Preview</h5>
<umb-image-thumbnail center="target.focalPoint"
src="target.url"
height="{{cropSize.height}}"
width="{{cropSize.width}}"
max-size="400" />
</div>
</umb-control-group>
</umb-control-group>
<umb-control-group label="@general_url">
<input type="text"
localize="placeholder"
placeholder="@general_url"
class="umb-editor umb-textstring"
ng-model="target.url"
ng-disabled="target.id"/>
</umb-control-group>
<umb-control-group label="@general_url">
<input type="text"
localize="placeholder"
placeholder="@general_url"
class="umb-editor umb-textstring"
ng-model="target.url"
ng-disabled="target.id" />
</umb-control-group>
<umb-control-group label="@content_altTextOptional">
<input type="text"
class="umb-editor umb-textstring"
ng-model="target.altText" />
</umb-control-group>
</umb-pane>
</div>
<div class="umb-panel-footer" >
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<a href ng-click="exitDetails()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<button
class="btn btn-primary"
ng-click="submit(target)">
<localize key="general_insert">Insert</localize>
</button>
</div>
</div>
</div>
</div>
<div class="umb-panel umb-dialogs-mediapicker" ng-hide="target">
<div class="umb-panel-header">
<div class="umb-el-wrap umb-panel-buttons">
<div class="span5">
<div class="form-search">
<i class="icon-search"></i>
<input type="text"
ng-model="searchTerm"
class="umb-search-field search-query"
placeholder="Filter...">
</div>
</div>
<div class="pull-right">
<span class="btn fileinput-button" ng-class="{disabled: disabled}">
<i class="icon-page-up"></i>
<input type="file" name="files[]" multiple ng-disabled="disabled">
</span>
</div>
</div>
<div class="row">
<ul class="breadcrumb span12">
<li ng-hide="startNodeId != -1">
<a href ng-click="gotoFolder()" prevent-default>Media</a> / </li>
<li ng-repeat="item in path">
<a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a> /
</li>
<li>
<a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
<i class="icon icon-add small"></i>
</a>
<input type="text"
class="input-foldername input-mini inline"
ng-show="showFolderInput"
ng-model="newFolderName"
ng-keydown="submitFolder($event)"
on-blur="showFolderInput = false">
</li>
</ul>
</div>
</div>
<div class="umb-panel-body with-footer">
<div class="umb-loader-wrapper" ng-hide="active() == 0">
<div class="umb-loader"></div>
<umb-control-group label="@content_altTextOptional">
<input type="text"
class="umb-editor umb-textstring"
ng-model="target.altText" />
</umb-control-group>
</umb-pane>
</div>
<umb-photo-folder
min-height="105"
min-width="150"
max-height="250"
ideal-items-per-row="3"
on-click="clickHandler"
ng-model="images"
images-only="{{onlyImages}}"
filter-by="searchTerm"/>
</div>
<div class="umb-panel-footer">
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<a href ng-click="exitDetails()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary"
ng-click="submit(target)">
<localize key="general_insert">Insert</localize>
</button>
</div>
</div>
</div>
</div>
<div class="umb-panel-footer" >
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<div class="umb-panel umb-dialogs-mediapicker browser" ng-hide="target" ng-style="{opacity: dropping == true ? '0.25' : '1.0'}">
<div class="umb-panel-header">
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<div class="umb-el-wrap umb-panel-buttons">
<div class="span5">
<div class="form-search">
<i class="icon-search"></i>
<input type="text"
ng-model="searchTerm"
class="umb-search-field search-query"
placeholder="Filter...">
</div>
</div>
<button
class="btn btn-primary"
ng-show="multiPicker"
ng-click="submit(dialogData.selection)">
<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
</button>
<div class="pull-right">
<span class="btn fileinput-button" ng-class="{disabled: disabled}">
<i class="icon-page-up"></i>
<input type="file" name="files[]" multiple ng-disabled="disabled" class="uploader">
<localize key="general_upload">Upload</localize>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<ul class="breadcrumb span12">
<li ng-hide="startNodeId != -1">
<a href ng-click="gotoFolder()" prevent-default>Media</a> /
</li>
<li ng-repeat="item in path">
<a href ng-click="gotoFolder(item)" prevent-default>{{item.name}}</a> /
</li>
<li>
<a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
<i class="icon icon-add small"></i>
</a>
<input type="text"
class="input-foldername input-mini inline"
ng-show="showFolderInput"
ng-model="newFolderName"
ng-keydown="submitFolder($event)"
on-blur="showFolderInput = false">
</li>
</ul>
</div>
</div>
<div class="umb-panel-body with-footer">
<umb-image-upload-progress ng-show="filesUploading > 0"></umb-image-upload-progress>
<umb-photo-folder min-height="105"
min-width="150"
max-height="250"
ideal-items-per-row="3"
on-click="clickHandler"
ng-model="images"
images-only="{{onlyImages}}"
filter-by="searchTerm" />
</div>
<div class="umb-panel-footer">
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary"
ng-show="multiPicker"
ng-click="submit(dialogData.selection)">
<localize key="buttons_select">Select</localize>({{dialogData.selection.length}})
</button>
</div>
</div>
</div>
</div>
</form>
OurUmbraco.Site/umbraco/Views/content/edit.html
+20 -22
View File
@@ -4,68 +4,66 @@
ng-submit="save()"
val-form-manager>
<umb-panel ng-class="'editor-breadcrumb'">
<umb-panel ng-class="{'editor-breadcrumb': ancestors && ancestors.length > 0}">
<umb-header tabs="content.tabs">
<div class="span7">
<umb-content-name
placeholder="@placeholders_entername"
ng-model="content.name"/>
<umb-content-name placeholder="@placeholders_entername"
ng-model="content.name" />
</div>
<div class="span5">
<div class="span5">
<div class="btn-toolbar pull-right umb-btn-toolbar">
<div class="btn-group" ng-animate="'fade'" ng-show="formStatus">
<p class="btn btn-link umb-status-label">{{formStatus}}</p>
</div>
<umb-options-menu ng-show="currentNode"
current-node="currentNode"
current-section="{{currentSection}}">
current-node="currentNode"
current-section="{{currentSection}}">
</umb-options-menu>
</div>
</div>
</div>
</div>
</umb-header>
<umb-tab-view>
<umb-tab id="tab{{tab.id}}" rel="{{tab.id}}" ng-repeat="tab in content.tabs">
<div class="umb-pane">
<umb-property
property="property"
ng-repeat="property in tab.properties">
<umb-property property="property"
ng-repeat="property in tab.properties">
<umb-editor model="property"></umb-editor>
</umb-property>
<div class="umb-tab-buttons" detect-fold ng-class="{'umb-dimmed': busy}">
<div class="btn-group" ng-show="listViewPath">
<a class="btn" href="#{{listViewPath}}">
<localize key="buttons_returnToList">Return to list</localize>
</a>
</div>
<div class="btn-group" ng-show="content.template && !isNew">
<div class="btn-group" ng-show="!isNew">
<a class="btn" ng-click="preview(content)">
<localize key="buttons_showPage">Preview page</localize>
</a>
</div>
<div class="btn-group dropup" ng-if="defaultButton" >
<div class="btn-group dropup" ng-if="defaultButton">
<!-- primary button -->
<a class="btn btn-success" href="#" ng-click="performAction(defaultButton)" prevent-default>
<localize key="{{defaultButton.labelKey}}">{{defaultButton.labelKey}}</localize>
<localize key="{{defaultButton.labelKey}}">{{defaultButton.labelKey}}</localize>
</a>
<a class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-if="subButtons.length > 0">
<span class="caret"></span>
</a>
<a href="#">Return to list</a>
<!-- sub buttons -->
<ul class="dropdown-menu bottom-up" role="menu" aria-labelledby="dLabel" ng-if="subButtons.length > 0">
<ul class="dropdown-menu bottom-up" role="menu" aria-labelledby="dLabel" ng-if="subButtons.length > 0">
<li ng-repeat="btn in subButtons">
<a href="#" ng-click="performAction(btn)" prevent-default>
<localize key="{{btn.labelKey}}">{{btn.labelKey}}</localize>
@@ -73,14 +71,14 @@
</li>
</ul>
</div>
</div>
</div>
</div>
</umb-tab>
</umb-tab-view>
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="content.parentId">
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="ancestors && ancestors.length > 0">
<li ng-repeat="ancestor in ancestors">
<a href="#/content/content/edit/{{ancestor.id}}">{{ancestor.name}}</a>
</li>
OurUmbraco.Site/umbraco/Views/content/recyclebin.html
+1 -1
View File
@@ -1,4 +1,4 @@
<umb-panel ng-controller="Umbraco.Dashboard.RecycleBinController">
<umb-panel ng-controller="Umbraco.Editors.Content.RecycleBinController">
<umb-header>
<div class="umb-headline-editor-wrapper span12">
<h1><localize key="general_recycleBin">Recycle Bin</localize></h1>
OurUmbraco.Site/umbraco/Views/dashboard/ChangePassword.html
-1
View File
@@ -4,7 +4,6 @@
val-form-manager>
<h3>Change password</h3>
<p>Enter your current password, then repeat your new password to change it</p>
<umb-pane>
OurUmbraco.Site/umbraco/Views/dashboard/media/mediafolderbrowser.html
+4 -25
View File
@@ -1,26 +1,5 @@
<form ng-controller="Umbraco.Dashboard.MediaFolderBrowserDashboardController" id="fileupload"
style="width: 100%"
method="POST" enctype="multipart/form-data"
class="umb-editor umb-folderbrowser"
data-file-upload="options"
data-file-upload-progress=""
data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
<div ng-controller="Umbraco.Dashboard.MediaFolderBrowserDashboardController">
<umb-image-folder node-id="{{nodeId}}"
on-upload-complete="onUploadComplete"></umb-image-folder>
</div>
<span class="fileinput-button umb-upload-button-big"
ng-class="{disabled: disabled}">
<i class="icon icon-page-up"></i>
<p><localize key="media_clickToUpload">Click to upload</localize></p>
<input type="file" name="files[]" multiple ng-disabled="disabled">
</span>
<umb-upload-dropzone dropping="dropping" files="filesUploading">
</umb-upload-dropzone>
<umb-photo-folder
min-height="220"
min-width="220"
on-click="clickHandler"
ng-model="images"
/>
</form>
OurUmbraco.Site/umbraco/Views/directives/html/umb-photo-folder.html
+8 -5
View File
@@ -12,14 +12,17 @@
<div ng-style="img.style" class="umb-non-thumbnail" ng-if="!img.thumbnail">
<i class="icon large {{img.icon}}"></i>
{{img.name}}
</div>
<div ng-if="img.thumbnail" class="umb-photo" ng-style="img.thumbStyle" alt="{{img.name}}">
</div>
<div ng-if="img.thumbnail" class="umb-photo" ng-style="img.thumbStyle" alt="{{img.name}}"></div>
</a>
<a href ng-click="clickHandler(img, $event, true)"
ng-if="img.isFolder" class="selector-overlay">
<localize key="buttons_select">Select</localize>
<a href ng-click="clickHandler(img, $event, true)" class="selector-overlay">
<localize key="buttons_select" ng-if="img.isFolder">Select</localize>
<span ng-if="!img.isFolder">{{img.name}}</span>
</a>
</div>
</div>
OurUmbraco.Site/umbraco/Views/directives/html/umb-upload-dropzone.html
+3 -8
View File
@@ -1,13 +1,8 @@
<div class="umb-upload-drop-zone" ng-show="dropping || files.length">
<div class="info" ng-show="dropping">
<div class="umb-upload-drop-zone">
<div class="info">
<i class="icon icon-parachute-drop"></i>
<p>
<localize key="media_dropFilesHere">Drop your files here...</localize>
<localize key="media_dropFilesHere">Drop your files here...</localize>
</p>
</div>
<div ng-show="files.length">
<div class="umb-photo-proview" ng-repeat="file in files" umb-upload-preview="file">
</div>
</div>
</div>
OurUmbraco.Site/umbraco/Views/directives/imaging/umb-image-folder.html
+34
View File
@@ -0,0 +1,34 @@
<form style="width: 100%" method="POST" enctype="multipart/form-data" class="umb-editor umb-folderbrowser"
umb-image-upload="blueimpOptions">
<div class="drop-zone">
<div class="fileinput-button umb-upload-button-big" ng-hide="dropping || uploading">
<i class="icon icon-page-up"></i>
<p><localize key="media_clickToUpload">Click to upload</localize></p>
<input type="file" name="files[]" multiple ng-disabled="disabled" class="uploader">
</div>
<umb-upload-dropzone ng-show="dropping && !uploading"></umb-upload-dropzone>
<div ng-if="uploading">
<umb-image-upload-progress></umb-image-upload-progress>
<div class="umb-photo-preview"
ng-repeat="file in files"
ng-style="{opacity: file.completed == true ? '0.25' : '1.0'}"
umb-upload-preview="file">
</div>
</div>
</div>
<umb-photo-folder ng-show="files.length == 0"
min-height="105"
min-width="220"
on-click="clickHandler"
ng-model="images" />
</form>
OurUmbraco.Site/umbraco/Views/directives/umb-content-name.html
-1
View File
@@ -6,7 +6,6 @@
name="name"
localize="placeholder"
class="umb-headline"
localize="placeholder"
select-on-focus
placeholder="{{placeholder}}"
ng-model="model"
OurUmbraco.Site/umbraco/Views/directives/umb-sections.html
+1 -1
View File
@@ -16,7 +16,7 @@
</a>
</li>
<li class="expand" ng-show="needTray">
<li class="expand" ng-class="{ 'open': showTray === true }" ng-show="needTray">
<a href ng-click="trayClick()">
<i class="icon icon-arrow-right"></i>
</a>
OurUmbraco.Site/umbraco/Views/install/user.html
+1 -1
View File
@@ -18,7 +18,7 @@
<div class="control-group">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="email" id="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" />
<input type="text" id="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" val-email />
<small class="inline-help">Your email will be used as your login</small>
</div>
</div>
OurUmbraco.Site/umbraco/Views/media/edit.html
+13 -15
View File
@@ -3,14 +3,13 @@
ng-show="loaded"
ng-submit="save()"
val-form-manager>
<umb-panel ng-class="'editor-breadcrumb'">
<umb-panel ng-class="{'editor-breadcrumb': ancestors && ancestors.length > 0}">
<umb-header tabs="content.tabs">
<div class="span7">
<umb-content-name
placeholder="@placeholders_entername"
ng-model="content.name"/>
</div>
<umb-content-name placeholder="@placeholders_entername"
ng-model="content.name" />
</div>
<div class="span5">
<div class="btn-toolbar pull-right umb-btn-toolbar">
@@ -19,8 +18,8 @@
</div>
<umb-options-menu ng-show="currentNode"
current-node="currentNode"
current-section="{{currentSection}}">
current-node="currentNode"
current-section="{{currentSection}}">
</umb-options-menu>
</div>
</div>
@@ -30,21 +29,20 @@
<umb-tab id="tab{{tab.id}}" rel="{{tab.id}}" ng-repeat="tab in content.tabs">
<div class="umb-pane">
<umb-property
property="property"
ng-repeat="property in tab.properties">
<umb-property property="property"
ng-repeat="property in tab.properties">
<umb-editor model="property"></umb-editor>
</umb-property>
<div class="umb-tab-buttons" detect-fold ng-class="{'umb-dimmed': busy}">
<div class="btn-group" ng-show="listViewPath">
<a class="btn" href="#{{listViewPath}}">
<localize key="buttons_returnToList">Return to list</localize>
</a>
</div>
<div class="btn-group">
<button type="submit" data-hotkey="ctrl+s" class="btn btn-success">
<localize key="buttons_save">Save</localize>
@@ -56,7 +54,7 @@
</umb-tab>
</umb-tab-view>
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="content.parentId">
<ul class="umb-panel-footer-nav nav nav-pills" ng-if="ancestors && ancestors.length > 0">
<li ng-repeat="ancestor in ancestors">
<a href="#/media/media/edit/{{ancestor.id}}">{{ancestor.name}}</a>
</li>
OurUmbraco.Site/umbraco/Views/media/recyclebin.html
+1 -1
View File
@@ -1,4 +1,4 @@
<umb-panel ng-controller="Umbraco.Dashboard.RecycleBinController">
<umb-panel ng-controller="Umbraco.Editors.Media.RecycleBinController">
<umb-header>
<div class="umb-headline-editor-wrapper span12">
<h1><localize key="general_recycleBin">Recycle Bin</localize></h1>
OurUmbraco.Site/umbraco/Views/propertyeditors/changepassword/changepassword.html
+4 -4
View File
@@ -14,7 +14,7 @@
<input type="checkbox" ng-model="$parent.model.value.reset"
id="Checkbox1"
name="resetPassword"
val-server="resetPassword"/>
val-server="resetPassword" no-dirty-check/>
<span class="help-inline" val-msg-for="resetPassword" val-toggle-msg="valServer"></span>
</umb-control-group>
@@ -23,7 +23,7 @@
<input type="text" name="oldPassword" ng-model="$parent.model.value.oldPassword"
class="input-large umb-textstring textstring"
ng-required="$parent.showOldPass()"
val-server="oldPassword" />
val-server="oldPassword" no-dirty-check/>
<span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="valServer"></span>
</umb-control-group>
@@ -33,7 +33,7 @@
class="input-large umb-textstring textstring"
ng-required="!$parent.model.value.reset"
val-server="value"
ng-minlength="{{$parent.model.config.minPasswordLength}}" />
ng-minlength="{{$parent.model.config.minPasswordLength}}" no-dirty-check/>
<span class="help-inline" val-msg-for="password" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="password" val-toggle-msg="minlength">Minimum {{$parent.model.config.minPasswordLength}} characters</span>
<span class="help-inline" val-msg-for="password" val-toggle-msg="valServer"></span>
@@ -42,7 +42,7 @@
<umb-control-group alias="confirmpassword" label="Confirm password" ng-show="$parent.showConfirmPass()">
<input type="text" name="confirmpassword" ng-model="$parent.model.confirm"
class="input-large umb-textstring textstring"
val-compare="password" />
val-compare="password" no-dirty-check/>
<span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">Passwords must match</span>
</umb-control-group>
OurUmbraco.Site/umbraco/Views/propertyeditors/colorpicker/colorpicker.html
+2
View File
@@ -12,4 +12,6 @@
</li>
</ul>
<input type="hidden" name="modelValue" ng-model="model.value" val-property-validator="validateMandatory"/>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/contentpicker/contentpicker.html
+1 -1
View File
@@ -16,7 +16,7 @@
{{node.name}}
</a>
<div ng-if="!dialogEditor && model.config.showEditButton">
<small><a href umb-launch-mini-editor="node">Edit</a></small>
<small><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
</div>
</li>
</ul>
OurUmbraco.Site/umbraco/Views/propertyeditors/email/email.html
+3 -2
View File
@@ -1,13 +1,14 @@
<div>
<input type="email" name="textbox"
<input type="text" name="textbox"
ng-model="model.value"
id="{{model.alias}}"
class="umb-editor umb-textstring textstring"
val-email
ng-required="model.config.IsRequired || model.validation.mandatory"
val-server="value" />
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="required">Required</span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="email">Invalid email</span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="valEmail">Invalid email</span>
<span class="help-inline" val-msg-for="textbox" val-toggle-msg="valServer"></span>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/fileupload/fileupload.html
+4 -1
View File
@@ -25,4 +25,7 @@
<li ng-repeat="file in files">{{file.file.name}}</li>
</ul>
</div>
</div>
<input type="hidden" name="fileCount" ng-model="files.length" val-property-validator="validateMandatory"/>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/folderbrowser/folderbrowser.html
+5 -29
View File
@@ -1,29 +1,5 @@
<form ng-controller="Umbraco.PropertyEditors.FolderBrowserController" id="fileupload"
style="width: 100%"
method="POST" enctype="multipart/form-data"
class="umb-editor umb-folderbrowser"
data-file-upload="options"
data-file-upload-progress=""
ng-hide="creating"
data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
<span class="fileinput-button umb-upload-button-big"
style="margin-bottom: 5px;"
ng-hide="dropping"
ng-class="{disabled: disabled}">
<i class="icon icon-page-up"></i>
<p><localize key="media_clickToUpload">Click to upload</localize></p>
<input type="file" name="files[]" multiple ng-disabled="disabled">
</span>
<umb-upload-dropzone dropping="dropping" files="filesUploading">
</umb-upload-dropzone>
<umb-photo-folder
min-height="105"
min-width="220"
on-click="clickHandler"
ng-model="images" />
</form>
<div ng-controller="Umbraco.PropertyEditors.FolderBrowserController">
<umb-image-folder ng-if="creating == null"
node-id="{{nodeId}}"
on-upload-complete="onUploadComplete"></umb-image-folder>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/layoutconfig.html
+3 -3
View File
@@ -19,12 +19,12 @@
ng-class="{last:$last, selected:section==currentSection}"
ng-repeat="section in currentLayout.sections"
ng-click="configureSection(section, currentLayout)"
style="width:{{ percentage(section.grid) }}%">
ng-style="{width: percentage(section.grid) +'%'}">
</a>
<a class="td uSky-templates-column add" ng-if="availableLayoutSpace > 0"
ng-click="configureSection(undefined, currentLayout)"
style="width:{{ percentage(availableLayoutSpace) }}%">
ng-style="{width: percentage(availableLayoutSpace) + '%'}">
<i class="icon icon-add"></i>
</a>
@@ -113,4 +113,4 @@
</div>
</div>
</div>
</div>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowconfig.html
+14 -4
View File
@@ -1,11 +1,17 @@
<div class="umb-panel usky-grid usky-grid-configuration"
ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
<div class="umb-panel-body no-header with-footer">
<div class="umb-forms-settings">
<h5><localize key="grid_addRowConfiguration" /></h5>
<p><localize key="grid_addRowConfigurationDetail" /></p>
<div class="alert alert-warn ng-scope" ng-show="nameChanged">
Modifying a row configuration name will result in loss of
data for any existing content that is based on this configuration.
</div>
<umb-control-group label="@general_name">
<input type="text" ng-model="currentRow.name" />
</umb-control-group>
@@ -20,12 +26,12 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
ng-class="{last:$last, selected:cell==currentCell}"
ng-repeat="cell in currentRow.areas"
ng-click="configureCell(cell, currentRow)"
style="width:{{ percentage(cell.grid) }}%">
ng-style="{width: percentage(cell.grid) + '%'}">
</a>
<a class="td uSky-templates-column add"
ng-click="configureCell(undefined, currentRow)"
style="width:{{ percentage(availableRowSpace) }}%">
ng-style="{width: percentage(availableRowSpace) + '%'}">
<i class="icon icon-add"></i>
</a>
</div>
@@ -35,7 +41,7 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
<div ng-if="currentCell" style="padding-bottom: 50px;">
<umb-control-group label="@general_width">
<div class="grid-size-scaler" >
<div class="grid-size-scaler" >
<div class="grid-size-scaler">
<a href ng-click="scaleDown(currentCell)">
<i class="icon icon-remove"></i>
@@ -83,7 +89,11 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
<div class="umb-panel-footer">
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar pull-right">
<a href="" ng-click="close()" class="btn btn-primary">
<a href ng-click="close()" class="btn btn-link">
<localize key="general_cancel">Cancel</localize>
</a>
<a href ng-click="complete()" class="btn btn-primary">
<localize key="general_ok" class="ng-isolate-scope ng-scope">Done</localize>
</a>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowdeleteconfirm.html
+26
View File
@@ -0,0 +1,26 @@
<div>
<div class="umb-panel-body no-header with-footer compact">
<umb-pane>
<h3 class="alert alert-warn ng-scope">Warning!</h3>
<p>
You are deleting the row configuration '<strong>{{dialogData.rowName}}</strong>'
</p>
<p>
Modifying a row configuration name will result in loss of
data for any existing content that is based on this configuration.
</p>
<p>
<localize key="general_areyousure">Are you sure?</localize>
</p>
</umb-pane>
</div>
<div class="umb-panel-footer">
<umb-confirm on-confirm="submit" on-cancel="close">
</umb-confirm>
</div>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/embed.html
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="usky-editor-placeholder" ng-click="setEmbed()" ng-if="control.value === null">
<i class="icon icon-movie-alt"></i>
<div class="help-text">Click to embed</div>
<div class="help-text"><localize key="grid_clickToEmbed">Click to embed</localize></div>
</div>
<div ng-if="control.value" ng-bind-html-unsafe="control.value"></div>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/error.html
+2
View File
@@ -0,0 +1,2 @@
<p class="red">Something went wrong with this editor, below is the data stored:</p>
<pre>{{control | json}}</pre>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/media.html
+2 -2
View File
@@ -2,7 +2,7 @@
<div class="usky-editor-placeholder" ng-click="setImage()" ng-if="control.value === null">
<i class="icon icon-picture"></i>
<div ng-id="!control.$inserted" class="help-text">Click to insert image</div>
<div ng-id="!control.$inserted" class="help-text"><localize key="grid_clickToInsertImage">Click to insert image</localize></div>
</div>
<div ng-if="control.value">
@@ -11,6 +11,6 @@
ng-click="setImage()"
ng-src="{{url}}"
class="fullSizeImage" />
<input type="text" class="caption" ng-model="control.value.caption" placeholder="Image caption..."/>
<input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
</div>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/textstring.html
+1 -1
View File
@@ -5,5 +5,5 @@
umb-auto-focus
class="textstring input-block-level" id="{{control.uniqueId}}_text"
ng-model="control.value"
ng-attr-style="{{control.editor.config.style}}" placeholder="Write here..."></textarea>
ng-attr-style="{{control.editor.config.style}}" localize="placeholder" placeholder="@grid_placeholderWriteHere"></textarea>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.html
+32 -20
View File
@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.PropertyEditors.GridController" class="usky-grid" id="usky-grid">
<div ng-controller="Umbraco.PropertyEditors.GridController" class="usky-grid umb-editor umb-grid" id="usky-grid">
<div ng-if="contentReady">
@@ -57,21 +57,23 @@
ng-mouseleave="disableCurrentRow()">
<!-- Row tool -->
<div class="row-tools" ng-animate="'fade'" ng-if="currentRow === row && currentControl === null">
<div class="row-tools" ng-animate="'fade'"
ng-if="currentRow === row && currentControl === null">
<!-- delete row -->
<div class="cell-tools-remove">
<div class="iconBox"
ng-click="deletePrompt = true"
ng-click="showPrompt(row)"
ng-mouseover="setWarnighlightRow(row)"
ng-mouseleave="disableWarnhighlightRow(row)">
<span ng-if="deletePrompt">
<localize key="general_areyousure"/>
<a href style="text-decoration: underline" ng-click="removeRow(section, $index)"><localize key="general_yes"/></a>
<span class="prompt" ng-if="row.deletePrompt">
<localize key="general_areyousure" />
<a href ng-click="removeRow(section, $index)"><localize key="general_yes" /></a>
<a href ng-click="clearPrompt(row, $event)"><localize key="general_no" /></a>
</span>
<i ng-if="!deletePrompt" class="icon icon-trash"></i>
<i ng-if="!row.deletePrompt" class="icon icon-trash" title="@general_delete" localize="title"></i>
</div>
</div>
@@ -80,7 +82,7 @@
ng-mouseover="setInfohighlightRow(row)"
ng-mouseleave="disableInfohighlightRow(row)"
href>
<i class="icon icon-navigation"></i>
<i class="icon icon-navigation" title="@general_move" localize="title"></i>
</a>
</div>
@@ -90,7 +92,7 @@
ng-mouseleave="disableInfohighlightRow(row)"
ng-click="editGridItemSettings(row, 'row')"
href>
<i class="icon icon-settings"></i>
<i class="icon icon-settings" title="@grid_settings" localize="title"></i>
</a>
</div>
@@ -98,8 +100,14 @@
<!-- row container -->
<div class="{{row.cssClass}} mainContainer usky-row-inner"
ng-class="{last:$last,first:$first,warnhighlight:currentWarnhighlightRow == row, infohighlight:currentInfohighlightRow == row}">
ng-class="{last:$last,
first:$first,
warnhighlight:currentWarnhighlightRow == row,
infohighlight:currentInfohighlightRow == row,
selectedRow:currentRow == row && currentControl === null}">
<ins class="item-label">{{row.name}}</ins>
<div class="mainTb">
<div class="tb">
<div class="tr">
@@ -120,22 +128,24 @@
<!-- Filled cell tools -->
<div class="cell-tools"
ng-class="{'with-prompt': control.deletePrompt}"
ng-animate="'fade'"
ng-show="control && (currentControl == control)">
ng-if="control && (currentControl == control)">
<!-- delete control -->
<div class="cell-tools-remove">
<div class="iconBox"
ng-click="deletePrompt = true"
ng-click="showPrompt(control)"
ng-mouseover="setWarnhighlightControl(control)"
ng-mouseleave="disableWarnhighlightControl(control)">
<span ng-show="deletePrompt">
<localize key="general_areyousure"/>
<a href style="text-decoration: underline" ng-click="removeControl(area, $index)"><localize key="general_yes"/></a>
<span class="prompt" ng-if="control.deletePrompt">
<localize key="general_areyousure" />
<a href ng-click="removeControl(area, $index)"><localize key="general_yes" /></a>
<a href ng-click="clearPrompt(control, $event)"><localize key="general_no" /></a>
</span>
<i ng-show="!deletePrompt" class="icon icon-trash"></i>
<i ng-if="!control.deletePrompt" class="icon icon-trash" title="@general_delete" localize="title"></i>
</div>
</div>
@@ -145,7 +155,7 @@
ng-mouseover="setInfohighlightControl(control)"
ng-mouseleave="disableInfohighlightControl(control)"
href>
<i class="icon icon-navigation"></i>
<i class="icon icon-navigation" title="@general_move" localize="title"></i>
</a>
</div>
@@ -156,7 +166,7 @@
ng-mouseleave="disableInfohighlightArea(area)"
ng-click="editGridItemSettings(area, 'cell')"
href>
<i class="icon icon-settings"></i>
<i class="icon icon-settings" title="@grid_settings" localize="title"></i>
</a>
</div>
@@ -166,6 +176,9 @@
infohighlight:currentInfohighlightControl == control,
warnhighlight:currentWarnhighlightControl == control,
selectedControl:currentControl == control}">
<ins class="item-label">{{control.editor.name}}</ins>
<!-- Redering the editor for specific control -->
<div ng-if="control && control.$editorPath"
ng-include="control.$editorPath"
@@ -188,7 +201,7 @@
ng-animate="'fade'">
<a class="iconBox" href ng-click="addItemOverlay($event, area, 0, area.$uniqueId);">
<i class=" icon icon-add"></i>
<i class=" icon icon-add" title="@general_add" localize="title"></i>
</a>
<div ng-if="overlayMenu.show && overlayMenu.key == area.$uniqueId" ng-include="'views/propertyeditors/grid/dialogs/additem.html'"></div>
@@ -234,7 +247,6 @@
</div> <!-- .templates-preview-rows -->
<p>
<span class="help-text"><localize key="grid_addRows" /></span>
</p>
OurUmbraco.Site/umbraco/Views/propertyeditors/imagecropper/imagecropper.html
+2 -2
View File
@@ -29,7 +29,7 @@
<a href style="margin:auto; text-align: center; font-size: 11px;" class="btn btn-link red"
ng-click="currentCrop.coordinates = undefined; done()">
Reset
<localize key="imagecropper_reset">Reset</localize>
</a>
</div>
</div>
@@ -57,7 +57,7 @@
</li>
</ul>
<a href class="btn btn-link" ng-click="clear()"><i class="icon-delete red"></i> Remove file</a>
<a href class="btn btn-link" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></a>
</div>
</div>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/integer/integer.html
+2 -2
View File
@@ -1,8 +1,8 @@
<div class="umb-editor">
<input name="integerField" type="number" class="umb-editor umb-number"
<input name="integerField" type="number" class="umb-editor umb-number "
ng-model="model.value"
val-server="value"
fix-number />
fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" />
<span class="help-inline" val-msg-for="integerField" val-toggle-msg="number">Not a number</span>
<span class="help-inline" val-msg-for="integerField" val-toggle-msg="valServer">{{propertyForm.requiredField.errorMsg}}</span>
OurUmbraco.Site/umbraco/Views/propertyeditors/listview/listview.html
+4 -4
View File
@@ -50,14 +50,14 @@
<td>
<a href="#" ng-click="sort('Name', true)" prevent-default class="sortable">
<localize key="general_name">Name</localize>
<i class="icon" ng-class="{'icon-navigation-down': isSortDirection('Name', 'asc'), 'icon-navigation-up': isSortDirection('Name', 'desc')}"></i>
<i class="icon" ng-class="{'icon-navigation-up': isSortDirection('Name', 'asc'), 'icon-navigation-down': isSortDirection('Name', 'desc')}"></i>
</a>
</td>
<td ng-repeat="column in options.includeProperties">
<a href="#" ng-click="sort(column.alias, column.allowSorting)" ng-class="{'sortable':column.allowSorting}" prevent-default>
<span ng-bind="column.header"></span>
<i class="icon" ng-class="{'icon-navigation-down': isSortDirection(column.alias, 'asc'), 'icon-navigation-up': isSortDirection(column.alias, 'desc')}"></i>
<i class="icon" ng-class="{'icon-navigation-up': isSortDirection(column.alias, 'asc'), 'icon-navigation-down': isSortDirection(column.alias, 'desc')}"></i>
</a>
</td>
@@ -72,7 +72,7 @@
<tbody ng-show="listViewResultSet.totalItems === 0">
<tr>
<td colspan="5">
<td colspan="{{options.includeProperties.length + 3}}">
<p><localize key="content_listViewNoItems">There are no items show in the list.</localize></p>
</td>
</tr>
@@ -135,4 +135,4 @@
</tfoot>
</table>
</div>
</div>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/multipletextbox/multipletextbox.html
+14 -11
View File
@@ -1,17 +1,20 @@
<div class="umb-editor umb-multiple-textbox" ng-controller="Umbraco.PropertyEditors.MultipleTextBoxController">
<div class="control-group" ng-repeat="item in model.value">
<input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" />
<a prevent-default href="" title="Remove this text box"
ng-show="model.value.length > model.config.min"
ng-click="remove($index)">
<i class="icon icon-remove"></i>
</a>
<div ui-sortable="sortableOptions" ng-model="model.value">
<div class="control-group" ng-repeat="item in model.value">
<i class="icon icon-navigation handle"></i>
<input type="text" name="item_{{$index}}" ng-model="item.value" class="umb-editor" />
<a prevent-default href="" title="Remove this text box"
ng-show="model.value.length > model.config.min"
ng-click="remove($index)">
<i class="icon icon-remove"></i>
</a>
</div>
</div>
<a prevent-default href="" title="Add another text box"
ng-show="model.config.max <= 0 || model.value.length < model.config.max"
ng-click="add()">
ng-show="model.config.max <= 0 || model.value.length < model.config.max"
ng-click="add()">
<i class="icon icon-add"></i>
</a>
</div>
</div>
OurUmbraco.Site/umbraco/Views/propertyeditors/relatedlinks/relatedlinks.html
+17 -17
View File
@@ -1,11 +1,12 @@
<div class="umb-editor umb-relatedlinks" ng-controller="Umbraco.PropertyEditors.RelatedLinksController">
<table class="table table-striped">
<thead>
<tr>
<td></td>
<td>Caption</td>
<td>Link</td>
<td>New window</td>
<td><localize key="relatedlinks_caption">Caption</localize></td>
<td><localize key="relatedlinks_link">Link</localize></td>
<td><localize key="relatedlinks_newWindow">New window</localize></td>
<td></td>
</tr>
</thead>
@@ -26,12 +27,12 @@
<div ng-show="link.edit">
<div ng-show="!link.isInternal">
<input type="text" ng-model="link.link" /><br />
or <a href="#" ng-click="switchLinkType($event,link)">choose internal page</a>
<localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
</div>
<div ng-show="link.isInternal">
<span ng-bind="link.internalName"></span> <a href="#" ng-click="selectInternal($event,link)">Choose</a><br />
or <a href="#" ng-click="switchLinkType($event,link)">enter external link</a>
<span ng-bind="link.internalName"></span> <a href="#" ng-click="selectInternal($event,link)"><localize key="choose">Choose</localize></a><br />
<localize key="or">or</localize> <a href="#" ng-click="switchLinkType($event,link)"><localize key="relatedlinks_enterExternal">enter external link</localize></a>
</div>
</div>
</td>
@@ -42,12 +43,11 @@
<td>
<div class="btn-group" ng-show="!link.edit">
<button type="button" class="btn btn-default" ng-click="edit($index)">Edit</button>
<button type="button" class="btn btn-default" ng-click="delete($index)">Delete</button>
<button type="button" class="btn btn-default" ng-click="edit($index)"><localize key="edit">Edit</localize></button>
<button type="button" class="btn btn-default" ng-click="delete($index)"><localize key="delete">Delete</localize></button>
</div>
<div class="btn-group" ng-show="link.edit">
<button type="button" class="btn btn-default" ng-click="cancelEdit($index)">Cancel</button>
<button type="button" class="btn btn-default" ng-click="cancelEdit($index)">Save</button>
<button type="button" class="btn btn-default" ng-click="saveEdit($index)"><localize key="buttons_save">Save</localize></button>
</div>
</td>
@@ -56,23 +56,23 @@
<tfoot>
<tr>
<td></td>
<td><input type="text" ng-model="newCaption" placeholder="Enter a new caption" val-highlight="hasError" /></td>
<td><input type="text" ng-model="newCaption" localize="placeholder" placeholder="@relatedlinks_captionPlaceholder" val-highlight="hasError" /></td>
<td>
<div ng-show="addExternal">
<input type="text" ng-model="newLink" placeholder="Enter the link" />
<br /> or
<a href="#" ng-click="switch($event)">choose internal page</a>
<input type="text" ng-model="newLink" localize="placeholder" placeholder="@relatedlinks_externalLinkPlaceholder" />
<br /> <localize key="or">or</localize>
<a href="#" ng-click="switch($event)"><localize key="relatedlinks_chooseInternal">choose internal page</localize></a>
</div>
<div ng-show="!addExternal">
<span ng-bind="newInternalName"></span> <a href="#" ng-click="internal($event)">Choose</a><br />
or <a href="#" ng-click="switch($event)">enter external link</a>
<span ng-bind="newInternalName"></span> <a href="#" ng-click="internal($event)"><localize key="choose">Choose</localize></a><br />
<localize key="or">or</localize> <a href="#" ng-click="switch($event)"><localize key="relatedlinks_enterExternal">enter external link</localize></a>
</div>
</td>
<td><input type="checkbox" ng-model="newNewWindow" /> </td>
<td>
<div class="btn-group">
<button class="btn btn-default" ng-click="add($event)">Add</button>
<button class="btn btn-default" ng-click="add($event)"><localize key="general_add">Add</localize></button>
</div>
</td>
</tr>
OurUmbraco.Site/umbraco/Views/propertyeditors/tags/tags.html
+10 -5
View File
@@ -1,11 +1,14 @@
<div ng-controller="Umbraco.PropertyEditors.TagsController" class="umb-editor umb-tags">
<div ng-if="isLoading">
<localize key="loading" />...
<div ng-if="isLoading">
<localize key="loading">Loading</localize>...
</div>
<div ng-if="!isLoading">
<span ng-repeat="tag in currentTags" ng-click="removeTag(tag)" class="label label-primary tag">
<input type="hidden" name="tagCount" ng-model="model.value.length" val-property-validator="validateMandatory" />
<span ng-repeat="tag in model.value" ng-click="$parent.removeTag(tag)" class="label label-primary tag">
<span ng-bind-html="tag"></span>
<i class="icon icon-delete"></i>
</span>
@@ -16,6 +19,8 @@
ng-keydown="$parent.addTagOnEnter($event)"
on-blur="$parent.addTag()"
localize="placeholder"
placeholder="@placeholders_enterTags" />
placeholder="@placeholders_enterTags" />
</div>
</div>
OurUmbraco.Site/umbraco/assets/css/installer.css
+2 -1
View File
@@ -891,7 +891,8 @@ textarea::-webkit-input-placeholder {
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
float: left;
margin-left: -20px;
margin-right: 5px;
margin-left: 0;
}
.controls > .radio:first-child,
OurUmbraco.Site/umbraco/assets/css/umbraco.css
+1 -1
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/umbraco/config/lang/cs.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<language alias="cs" intName="Czech" localName="česky" lcid="5" culture="en-GB">
<language alias="cs" intName="Czech" localName="česky" lcid="5" culture="cs-CZ">
<creator>
<name>umbraco</name>
<link>http://umbraco.org</link>
OurUmbraco.Site/umbraco/config/lang/da.xml
+47 -11
View File
@@ -228,6 +228,7 @@
<key alias="entername">Indtast navn...</key>
<key alias="search">Søg...</key>
<key alias="filter">Filtrer...</key>
<key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
</area>
<area alias="editcontenttype">
<key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
@@ -596,16 +597,51 @@ Mange hilsner fra Umbraco robotten
<key alias="noColors">Du har ikke konfigureret nogen godkendte farver</key>
</area>
<area alias="relatedlinks">
<key alias="addExternal">Tilføj eksternt link</key>
<key alias="addInternal">Tilføj internt link</key>
<key alias="addlink">Tilføj</key>
<key alias="caption">Billedtekst</key>
<key alias="internalPage">Intern side</key>
<key alias="linkurl">URL</key>
<key alias="modeDown">Flyt ned</key>
<key alias="modeUp">Flyt op</key>
<key alias="newWindow">Åben i nyt vindue</key>
<key alias="removeLink">Fjern link</key>
<key alias="enterExternal">indtast eksternt link</key>
<key alias="chooseInternal">vælg en intern side</key>
<key alias="caption">Tekst</key>
<key alias="link">Link</key>
<key alias="newWindow">Nyt vindue</key>
<key alias="captionPlaceholder">Indtast en tekst</key>
<key alias="externalLinkPlaceholder">Indtast et link</key>
</area>
<area alias="imagecropper">
<key alias="reset">Nulstil</key>
</area>
<area alias="grid">
<key alias="insertControl">Indsæt element</key>
<key alias="addRows">Tilføj rækker til dit layout</key>
<key alias="addElement"><![CDATA[Kom i gang ved at trykke på <i class=" icon icon-add blue"></i> nedenfor og tilføje det første element]]></key>
<key alias="clickToEmbed">Klik for at indlejre</key>
<key alias="clickToInsertImage">Klik for at indsætte et billede</key>
<key alias="placeholderImageCaption">Billedtekst...</key>
<key alias="placeholderWriteHere">Skriv her...</key>
<key alias="gridLayouts">Gridlayout</key>
<key alias="gridLayoutsDetail">Et layout er det overordnede arbejdsområde til dit gitter - du vil typisk kun behøve ét eller to</key>
<key alias="addGridLayout">Tilføj gitterlayout</key>
<key alias="addGridLayoutDetail">Juster dit layout ved at justere kolonnebredder og tilføj yderligere sektioner</key>
<key alias="rowConfigurations">Rækkekonfigurationer</key>
<key alias="rowConfigurationsDetail">Rækker er foruddefinerede celler, der arrangeres vandret</key>
<key alias="addRowConfiguration">Tilføj rækkekonfiguration</key>
<key alias="addRowConfigurationDetail">Juster rækken ved at indstille cellebredder og tilføje yderligere celler</key>
<key alias="columns">Kolonner</key>
<key alias="columnsDetails">Det totale antaller kolonner i gitteret</key>
<key alias="settings">Indstillinger</key>
<key alias="settingsDetails">Konfigurer, hvilket indstillinger, brugeren kan ændre</key>
<key alias="styles">Typografi</key>
<key alias="stylesDetails">Vælg, hvilke typografiværdier, en redaktør kan ændre</key>
<key alias="settingDialogDetails">Indstillinger gemmes kun, hvis den indtaste json-konfiguration er gyldig</key>
<key alias="allowAllEditors">Tillad alle editorer</key>
<key alias="allowAllRowConfigurations">Tillad alle rækkekonfigurationer</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Nuværende version</key>
@@ -759,7 +795,7 @@ Mange hilsner fra Umbraco robotten
<key alias="DownloadXmlDTD">Download XML DTD</key>
<key alias="fields">Felter</key>
<key alias="includeSubpages">Inkluder undersider</key>
<key alias="mailBody">Hej %0%. Dette er en automatisk mail sendt for at informere dig om at dokumentet '%1' har en forespørgsel omkring oversættelse til '%5%' af %2%. Gå til http://%3%/Umbraco/translation/details.aspx?id=%4% for at redigere. Eller log ind i Umbraco for at få en oversigt over dine oversættelsesopgaver: http://%3%/Umbraco Hav en god dag! Mange hilsner Umbraco-robotten</key>
<key alias="mailBody">Hej %0%. Dette er en automatisk mail sendt for at informere dig om at dokumentet '%1' har en forespørgsel omkring oversættelse til '%5%' af %2%. Gå til http://%3%/translation/details.aspx?id=%4% for at redigere. Eller log ind i Umbraco for at få en oversigt over dine oversættelsesopgaver: http://%3%/Umbraco Hav en god dag! Mange hilsner Umbraco-robotten</key>
<key alias="mailSubject">[%0%] Oversættelsesopgave for %1%</key>
<key alias="noTranslators">Ingen oversættelsesbrugere er fundet. Opret venligst en oversættelsesbruger før du begynder at sende indhold til oversættelse</key>
<key alias="ownedTasks">Opgaver oprettet af dig</key>
OurUmbraco.Site/umbraco/config/lang/de.xml
+2 -2
View File
@@ -779,9 +779,9 @@ Hallo %0%,
das Dokument '%1%' wurde von '%2%' zur Übersetzung in '%5%' freigegeben.
Zum Bearbeiten verwenden Sie bitte diesen Link: http://%3%/Umbraco/translation/details.aspx?id=%4%.
Zum Bearbeiten verwenden Sie bitte diesen Link: http://%3%/translation/details.aspx?id=%4%.
Sie können sich auch alle anstehenden Übersetzungen gesammelt im Umbraco-Verwaltungsbereich anzeigen lassen: http://%3%/Umbraco/Umbraco.aspx
Sie können sich auch alle anstehenden Übersetzungen gesammelt im Umbraco-Verwaltungsbereich anzeigen lassen: http://%3%/Umbraco.aspx
Einen schönen Tag wünscht
Ihr freundlicher Umbraco-Robot
OurUmbraco.Site/umbraco/config/lang/en.xml
+23 -17
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<language alias="en" intName="English (UK)" localName="English (UK)" lcid="" culture="en-GB">
<creator>
<name>The Umbraco community</name>
@@ -100,7 +100,7 @@
<key alias="contentRepublished">The content has been re-published.</key>
<key alias="currentProperty">Current Property</key>
<key alias="currentType">Current type</key>
<key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.</key>
<key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
<key alias="docTypeChanged">Document Type Changed</key>
<key alias="mapProperties">Map Properties</key>
<key alias="mapToProperty">Map to Property</key>
@@ -679,9 +679,11 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="paSimpleHelp">If you just want to setup simple protection using a single login and password</key>
</area>
<area alias="publish">
<key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
<key alias="contentPublishedFailedAwaitingRelease">
<![CDATA[
%0% could not be published because the item is scheduled for release.
]]></key>
]]>
</key>
<key alias="contentPublishedFailedInvalid"><![CDATA[
%0% could not be published because these properties: %1% did not pass validation rules.
]]></key>
@@ -705,16 +707,16 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noColors">You have not configured any approved colours</key>
</area>
<area alias="relatedlinks">
<key alias="addExternal">Add external link</key>
<key alias="addInternal">Add internal link</key>
<key alias="addlink">Add</key>
<key alias="enterExternal">enter external link</key>
<key alias="chooseInternal">choose internal page</key>
<key alias="caption">Caption</key>
<key alias="internalPage">Internal page</key>
<key alias="linkurl">URL</key>
<key alias="modeDown">Move Down</key>
<key alias="modeUp">Move Up</key>
<key alias="newWindow">Open in new window</key>
<key alias="removeLink">Remove link</key>
<key alias="link">Link</key>
<key alias="newWindow">New window</key>
<key alias="captionPlaceholder">Enter a new caption</key>
<key alias="externalLinkPlaceholder">Enter the link</key>
</area>
<area alias="imagecropper">
<key alias="reset">Reset</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Current version</key>
@@ -845,14 +847,18 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="template">Template</key>
</area>
<area alias="grid">
<key alias="insertControl">Insert control</key>
<key alias="addRows">Add rows to your layout</key>
<key alias="addElement"><![CDATA[To start, click the <i class="icon icon-add blue"></i> below and add your first element]]></key>
<key alias="clickToEmbed">Click to embed</key>
<key alias="clickToInsertImage">Click to insert image</key>
<key alias="placeholderImageCaption">Image caption...</key>
<key alias="placeholderWriteHere">Write here...</key>
<key alias="gridLayouts">Grid layouts</key>
<key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two differnt layouts</key>
<key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
<key alias="addGridLayout">Add grid layout</key>
<key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
@@ -1006,7 +1012,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="editors">Editor</key>
<key alias="excerptField">Excerpt field</key>
<key alias="language">Language</key>
<key alias="loginname">Login</key>
<key alias="loginname">Username</key>
<key alias="mediastartnode">Start Node in Media Library</key>
<key alias="modules">Sections</key>
<key alias="noConsole">Disable Umbraco Access</key>
@@ -1025,7 +1031,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="permissionSelectPages">Select pages to modify their permissions</key>
<key alias="searchAllChildren">Search all children</key>
<key alias="startnode">Start Node in Content</key>
<key alias="username">Username</key>
<key alias="username">Name</key>
<key alias="userPermissions">User permissions</key>
<key alias="usertype">User type</key>
<key alias="userTypes">User types</key>
OurUmbraco.Site/umbraco/config/lang/en_us.xml
+24 -28
View File
@@ -44,16 +44,16 @@
<key alias="invalidNode">Invalid node.</key>
<key alias="invalidDomain">Invalid domain format.</key>
<key alias="duplicateDomain">Domain has already been assigned.</key>
<key alias="domain">Domain</key>
<key alias="language">Language</key>
<key alias="domain">Domain</key>
<key alias="domainCreated">New domain '%0%' has been created</key>
<key alias="domainDeleted">Domain '%0%' is deleted</key>
<key alias="domainExists">Domain '%0%' has already been assigned</key>
<key alias="domainUpdated">Domain '%0%' has been updated</key>
<key alias="orEdit">Edit Current Domains</key>
<key alias="domainHelp"><![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080" or
"https://www.example.com/".<br /><br />One-level paths in domains are supported, eg. "example.com/en". However, they
should be avoided. Better use the culture setting above.]]></key>
<key alias="domainUpdated">Domain '%0%' has been updated</key>
<key alias="orEdit">Edit Current Domains</key>
<key alias="inherit">Inherit</key>
<key alias="setLanguage">Culture</key>
<key alias="setLanguageHelp"><![CDATA[Set the culture for nodes below the current node,<br /> or inherit culture from parent nodes. Will also apply<br />
@@ -63,8 +63,6 @@
<area alias="auditTrails">
<key alias="atViewingFor">Viewing for</key>
</area>
<area alias="buttons">
<key alias="select">Select</key>
<key alias="selectCurrentFolder">Select current folder</key>
@@ -102,7 +100,7 @@
<key alias="contentRepublished">The content has been re-published.</key>
<key alias="currentProperty">Current Property</key>
<key alias="currentType">Current type</key>
<key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location.</key>
<key alias="docTypeCannotBeChanged">The document type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it.</key>
<key alias="docTypeChanged">Document Type Changed</key>
<key alias="mapProperties">Map Properties</key>
<key alias="mapToProperty">Map to Property</key>
@@ -134,7 +132,7 @@
<key alias="itemChanged">This item has been changed after publication</key>
<key alias="itemNotPublished">This item is not published</key>
<key alias="lastPublished">Last published</key>
<key alias="listViewNoItems" version="7.1.5">There are no items show in the list.</key>
<key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
<key alias="mediatype">Media Type</key>
<key alias="mediaLinks">Link to media item(s)</key>
<key alias="membergroup">Member Group</key>
@@ -162,8 +160,7 @@
<key alias="uploadClear">Remove file(s)</key>
<key alias="urls">Link to document</key>
<key alias="memberof">Member of group(s)</key>
<key alias="notmemberof">Not a member of group(s)</key>
<key alias="notmemberof">Not a member of group(s)</key>
<key alias="childItems" version="7.0">Child items</key>
<key alias="target" version="7.0">Target</key>
</area>
@@ -175,9 +172,7 @@
<key alias="chooseNode">Where do you want to create the new %0%</key>
<key alias="createUnder">Create an item under</key>
<key alias="updateData">Choose a type and a title</key>
<key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
<key alias="noMediaTypes" version="7.0"><![CDATA[There are no allowed media types available. You must enable these in the settings section under <strong>"media types"</strong>.]]></key>
</area>
<area alias="dashboard">
@@ -250,6 +245,7 @@
<key alias="entername">Enter a name...</key>
<key alias="search">Type to search...</key>
<key alias="filter">Type to filter...</key>
<key alias="enterTags">Type to add tags (press enter after each tag)...</key>
</area>
<area alias="editcontenttype">
@@ -412,7 +408,6 @@
<key alias="width">Width</key>
<key alias="yes">Yes</key>
<key alias="folder">Folder</key>
<key alias="searchResults">Search results</key>
</area>
<area alias="graphicheadline">
@@ -560,11 +555,9 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="greeting4">Happy thunderous Thursday</key>
<key alias="greeting5">Happy funky Friday</key>
<key alias="greeting6">Happy Caturday</key>
<key alias="instruction">log in below</key>
<key alias="instruction">Log in below</key>
<key alias="timeout">Session timed out</key>
<key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
<key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
</area>
<area alias="main">
<key alias="dashboard">Dashboard</key>
@@ -715,16 +708,16 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noColors">You have not configured any approved colors</key>
</area>
<area alias="relatedlinks">
<key alias="addExternal">Add external link</key>
<key alias="addInternal">Add internal link</key>
<key alias="addlink">Add</key>
<key alias="enterExternal">enter external link</key>
<key alias="chooseInternal">choose internal page</key>
<key alias="caption">Caption</key>
<key alias="internalPage">Internal page</key>
<key alias="linkurl">URL</key>
<key alias="modeDown">Move Down</key>
<key alias="modeUp">Move Up</key>
<key alias="link">Link</key>
<key alias="newWindow">Open in new window</key>
<key alias="removeLink">Remove link</key>
<key alias="captionPlaceholder">enter the display caption</key>
<key alias="externalLinkPlaceholder">Enter the link</key>
</area>
<area alias="imagecropper">
<key alias="reset">Reset</key>
</area>
<area alias="rollback">
<key alias="currentVersion">Current version</key>
@@ -751,8 +744,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="statistics">Statistics</key>
<key alias="translation">Translation</key>
<key alias="users">Users</key>
<key alias="help" version="7.0">Help</key>
<key alias="forms">Forms</key>
<key alias="analytics">Analytics</key>
</area>
<area alias="settings">
@@ -859,8 +852,12 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="addRows">Add rows to your layout</key>
<key alias="addElement"><![CDATA[To start, click the <i class="icon icon-add blue"></i> below and add your first element]]></key>
<key alias="clickToEmbed">Click to embed</key>
<key alias="clickToInsertImage">Click to insert image</key>
<key alias="placeholderImageCaption">Image caption...</key>
<key alias="placeholderWriteHere">Write here...</key>
<key alias="gridLayouts">Grid layouts</key>
<key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two differnt layouts</key>
<key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
<key alias="addGridLayout">Add grid layout</key>
<key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
@@ -1032,12 +1029,11 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="permissionSelectPages">Select pages to modify their permissions</key>
<key alias="searchAllChildren">Search all children</key>
<key alias="startnode">Start Node in Content</key>
<key alias="username">Username</key>
<key alias="username">Name</key>
<key alias="userPermissions">User permissions</key>
<key alias="usertype">User type</key>
<key alias="userTypes">User types</key>
<key alias="writer">Writer</key>
<key alias="yourProfile" version="7.0">Your profile</key>
<key alias="yourHistory" version="7.0">Your recent history</key>
<key alias="sessionExpires" version="7.0">Session expires in</key>
OurUmbraco.Site/umbraco/config/lang/es.xml
+42 -2
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<language alias="es" intName="Spanish" localName="español" lcid="10" culture="es-ES">
<creator>
<name>The Umbraco community</name>
@@ -95,6 +95,7 @@
<key alias="styleChoose">Elegir estilo</key>
<key alias="styleShow">Mostrar estilos</key>
<key alias="tableInsert">Insertar tabla</key>
<key alias="returnToList">Volver al listado</key>
</area>
<area alias="changeDocType">
<key alias="changeDocTypeInstruction">Para cambiar el tipo de documento al contenido seleccionado, primero selecciona uno de la lista de tipos válidos.</key>
@@ -117,6 +118,7 @@
<key alias="validDocTypesNote">Solo se muestran otros tipos válidos para el contenido actual.</key>
</area>
<area alias="content">
<key alias="isPublished" version="7.2">Está publicado</key>
<key alias="about">Acerca de</key>
<key alias="alias">Link alternativo</key>
<key alias="alternativeTextHelp">(como describe la imagen sobre el teléfono)</key>
@@ -161,6 +163,7 @@
<key alias="notmemberof">No es miembreo de grupo(s)</key>
<key alias="childItems" version="7.0">Nodos hijo</key>
<key alias="target" version="7.0">Target</key>
<key alias="listViewNoItems">No hay datos que mostrar</key>
</area>
<area alias="media">
<key alias="clickToUpload">Haz click para subir archivos</key>
@@ -242,6 +245,8 @@
<key alias="filter">Escribe para filtrar resultados...</key>
</area>
<area alias="editcontenttype">
<key alias="allowAtRoot" version="7.2">Permitir en nodo raíz</key>
<key alias="allowAtRootDesc" version="7.2">Sólo tipos de contenido permitidos podrán crearse bajo el nodo raíz de los árboles de Contenido y Media</key>
<key alias="allowedchildnodetypes">Tipos de nodos hijos permitidos</key>
<key alias="contenttypecompositions">Composiciones de Tipo de Documento</key>
<key alias="create">Crear</key>
@@ -251,6 +256,11 @@
<key alias="tab">Pestaña</key>
<key alias="thumbnail">Miniatura</key>
<key alias="hasListView">Permitir vista de listado</key>
<key alias="hasListViewDesc" version="7.2">Configura el contenido para mostrar un listado de nodos hijos, en lugar de mostrarlos en forma de árbol</key>
<key alias="currentListView" version="7.2">Vista de listado actual</key>
<key alias="currentListViewDesc" version="7.2">El tipo de vista de listado activa</key>
<key alias="createListView" version="7.2">Crear un tipo de listado personalizado</key>
<key alias="removeListView" version="7.2">Quitar el tipo de listado personalizado</key>
</area>
<area alias="editdatatype">
<key alias="addPrevalue">añadir prevalor</key>
@@ -705,6 +715,36 @@
<key alias="quickGuide">Guía rápida sobre las etiquetas de plantilla de Umbraco</key>
<key alias="template">Plantilla</key>
</area>
<area alias="grid">
<key alias="insertControl">Insertar control</key>
<key alias="addRows">Añade más filas</key>
<key alias="addElement"><![CDATA[Para empezar, haz click en <i class="icon icon-add blue"></i> y añade tu primer contenido]]></key>
<key alias="gridLayouts">Plantillas de Grid</key>
<key alias="gridLayoutsDetail">Las plantillas son el área de trabajo para el editor de grids, normalmente sólo necesitas una o dos plantillas diferentes</key>
<key alias="addGridLayout">Añadir plantilla de grid</key>
<key alias="addGridLayoutDetail">Ajusta la plantilla configurando la anchura de las columnas y añadiendo más secciones</key>
<key alias="rowConfigurations">Configuraciones de filas</key>
<key alias="rowConfigurationsDetail">Las filas son celdas predefinidas que se disponen horizontalmente</key>
<key alias="addRowConfiguration">Añade una configuración de fila</key>
<key alias="addRowConfigurationDetail">Ajusta la fila configurando los anchos de cada celda y añadiendo más celdas</key>
<key alias="columns">Columnas</key>
<key alias="columnsDetails">Número total de columnas en la plantilla del grid</key>
<key alias="settings">Configuración</key>
<key alias="settingsDetails">Configura qué ajustes pueden cambiar los editores</key>
<key alias="styles">Estilos</key>
<key alias="stylesDetails">Configura qué estilos pueden cambiar los editores</key>
<key alias="settingDialogDetails">La configuración sólo se guardará si el json introducido es válido</key>
<key alias="allowAllEditors">Permitir todos los controles de edición</key>
<key alias="allowAllRowConfigurations">Permitir todas las configuraciones de fila</key>
</area>
<area alias="templateEditor">
<key alias="alternativeField">Campo opcional</key>
<key alias="alternativeText">Texto opcional</key>
@@ -848,4 +888,4 @@
<key alias="yourHistory" version="7.0">Tu historial reciente</key>
<key alias="sessionExpires" version="7.0">La sesión caduca en</key>
</area>
</language>
</language>
OurUmbraco.Site/umbraco/config/lang/nl.xml
+30
View File
@@ -788,6 +788,36 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
<key alias="quickGuide">Quick Guide voor Umbraco template tags</key>
<key alias="template">Sjabloon</key>
</area>
<area alias="grid">
<key alias="insertControl">Item toevoegen</key>
<key alias="addRows">Een rij aan de lay-out toevoegen</key>
<key alias="addElement"><![CDATA[Klik om te starten op het <i class="icon icon-add blue"></i> teken onderaan en voeg je eerste item toe]]></key>
<key alias="gridLayouts">Grid lay-outs</key>
<key alias="gridLayoutsDetail">Lay-outs zijn het globale werkgebied voor de grid editor. Je hebt meestal maar één of twee verschillende lay-outs nodig</key>
<key alias="addGridLayout">Een grid layout toevoegen</key>
<key alias="addGridLayoutDetail">De lay-out aanpassen door de kolombreedte aan te passen en extra kolommen toe te voegen</key>
<key alias="rowConfigurations">Rijconfiguratie</key>
<key alias="rowConfigurationsDetail">Rijen zijn voorgedefinieerde cellen die horizontaal zijn gerangschikt</key>
<key alias="addRowConfiguration">Een rijconfiguratie toevoegen</key>
<key alias="addRowConfigurationDetail">De rijconfiguratie aanpassen door de breedte van de cel in te stellen en extra cellen toe te voegen</key>
<key alias="columns">Kolommen</key>
<key alias="columnsDetails">Het totaal aantal gecombineerde kolommen in de grid layout</key>
<key alias="settings">Instellingen</key>
<key alias="settingsDetails">Configureren welke instellingen de editors kunnen aanpassen</key>
<key alias="styles">Styles</key>
<key alias="stylesDetails">Configureren welke stijlen de editors kunnen aanpassen</key>
<key alias="settingDialogDetails">De instellingen worden enkel bewaard indien de ingevoerde Json geldig is</key>
<key alias="allowAllEditors">Alle editors toelaten</key>
<key alias="allowAllRowConfigurations">Alle rijconfiguraties toelaten</key>
</area>
<area alias="templateEditor">
<key alias="alternativeField">Alternatief veld</key>
<key alias="alternativeText">Alternatieve tekst</key>
OurUmbraco.Site/umbraco/config/lang/sv.xml
+4 -4
View File
@@ -509,10 +509,10 @@
<key alias="relateToOriginal">Relatera kopierat objekt till orginalet</key>
</area>
<area alias="notifications">
<key alias="editNotifications">Inställningar för notifieringar gällande {0}</key>
<key alias="mailBody">Hej {0} Detta mail skickas till dig automatiskt för att meddela att '{1}' har utförts på sidan '{2}' av användaren '{3}' Gå till http://{4}/actions/editContent.aspx?id={5} för att redigera.</key>
<key alias="mailBodyHtml"><![CDATA[<p>Hej {0}</p> <p>Detta mail skickas till dig automatiskt för att meddela att <strong>'{1}'</strong> har utförts på sidan <a href="http://{4}/actions/preview.aspx?id={5}"><strong>'{2}'</strong></a> av användaren <strong>'{3}'</strong> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://{4}/actions/editContent.aspx?id={5}">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Sammanfattning av uppdateringen:</h3> <table style="width: 100%;"> {6} </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://{4}/actions/publish.aspx?id={5}">&nbsp;&nbsp;PUBLICERA&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://{4}/actions/editContent.aspx?id={5}">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;REDIGERA&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://{4}/actions/delete.aspx?id={5}">&nbsp;&nbsp;&nbsp;&nbsp;TA BORT&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div>]]></key>
<key alias="mailSubject">[{0}] Meddelande för att informera om att {1} har utförts på {2}</key>
<key alias="editNotifications">Inställningar för notifieringar gällande %0%</key>
<key alias="mailBody">Hej %0% Detta mail skickas till dig automatiskt för att meddela att '%1%' har utförts på sidan '%2%' av användaren '%3%' Gå till http://%4%/actions/editContent.aspx?id=%5% för att redigera.</key>
<key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p> <p>Detta mail skickas till dig automatiskt för att meddela att <strong>'%1%'</strong> har utförts på sidan <a href="http://%4%/actions/preview.aspx?id=%5%"><strong>'%2%'</strong></a> av användaren <strong>'%3%'</strong> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;EDIT&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <br /> </div> <p> <h3>Sammanfattning av uppdateringen:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%">&nbsp;&nbsp;PUBLICERA&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;REDIGERA&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a> &nbsp; <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%">&nbsp;&nbsp;&nbsp;&nbsp;TA BORT&nbsp;&nbsp;&nbsp;&nbsp;</a> <br /> </div>]]></key>
<key alias="mailSubject">[%0%] Meddelande för att informera om att %1% har utförts på %2%</key>
<key alias="notifications">Notifieringar</key>
</area>
<area alias="packager">
OurUmbraco.Site/umbraco/controls/ContentTypeControlNew.ascx
+3 -3
View File
@@ -25,18 +25,18 @@
<cc2:Pane ID="Pane1" runat="server" Width="216" Height="80">
<asp:DataGrid ID="dgTabs" Width="100%" runat="server" CellPadding="2" HeaderStyle-CssClass="propertyHeader"
ItemStyle-CssClass="propertyContent" GridLines="None" OnItemCommand="dgTabs_ItemCommand"
ItemStyle-CssClass="propertyContent" GridLines="None" OnItemCommand="dgTabs_ItemCommand" OnItemDataBound="dgTabs_ItemDataBound" OnPreRender="dgTabs_PreRender"
HeaderStyle-Font-Bold="True" AutoGenerateColumns="False" CssClass="tabs-table">
<Columns>
<asp:BoundColumn DataField="id" Visible="False"></asp:BoundColumn>
<asp:TemplateColumn HeaderText="Name & sort order">
<ItemTemplate>
<i class="icon-navigation handle"></i>
<i class="icon-navigation handle" style="display:inline-block; margin-top:5px;"></i>
<asp:TextBox ID="txtTab" runat="server" Value='<%#DataBinder.Eval(Container.DataItem,"name")%>'></asp:TextBox>
<asp:TextBox ID="txtSortOrder" runat="server" CssClass="sort-order" style="width:40px;background-color:#f2f2f2;" Value='<%#DataBinder.Eval(Container.DataItem,"order") %>'></asp:TextBox>
<asp:Button ID="btnDelete" runat="server" Text="Delete" CommandName="Delete" CssClass="btn btn-small btn-danger" />
</ItemTemplate>
</asp:TemplateColumn>
<asp:ButtonColumn ButtonType="PushButton" Text="Delete" CommandName="Delete"></asp:ButtonColumn>
</Columns>
</asp:DataGrid>
<p style="text-align: center;">
OurUmbraco.Site/umbraco/developer/Packages/installer.aspx
+3 -3
View File
@@ -107,7 +107,7 @@
<p>
<strong>Please note:</strong> Installing a package containing several items and
files can take some time. Do not refresh the page or navigate away before, the installer
notifies you the install is completed.
notifies you once the install is completed.
</p>
</div>
@@ -280,9 +280,9 @@
<cc1:PropertyPanel runat="server">
<p>
All items in the package has been installed</p>
All items in the package have been installed</p>
<p>
Overview of what was installed can found under "installed package" in the developer
Overview of what was installed can be found under "installed package" in the developer
section.</p>
<p>
Uninstall is available at the same location.</p>
OurUmbraco.Site/umbraco/dialogs/AssignDomain2.aspx
+2 -1
View File
@@ -5,6 +5,7 @@
<asp:Content ContentPlaceHolderID="head" runat="server">
<umb:JsInclude runat="server" FilePath="Dialogs/AssignDomain2.js" PathNameAlias="UmbracoClient" />
<umb:JsInclude runat="server" FilePath="PunyCode/punycode.min.js" PathNameAlias="UmbracoClient" />
<umb:JsInclude runat="server" FilePath="Application/JQuery/jquery.validate.min.js" PathNameAlias="UmbracoClient" />
<umb:CssInclude runat="server" FilePath="Dialogs/AssignDomain2.css" PathNameAlias="UmbracoClient" />
<script type="text/javascript">
@@ -50,7 +51,7 @@
</thead>
<tbody data-bind="foreach: domains">
<tr>
<td valign="top"><input class="domain" data-bind="value: Name, uniqueName: true" /><input type="hidden" value="0" /></td>
<td valign="top"><input class="domain" data-bind="value: Name, uniqueName: true" /><input type="hidden" value="0" data-bind="uniqueName: true"/></td>
<td valign="top"><select class="language" data-bind="options: $parent.languages, optionsText: 'Code', optionsValue: 'Id', value: Lang, uniqueName: true"></select></td>
<td valign="top"><a href="#" class="btn btn-danger" data-bind="click: $parent.removeDomain"><i class="icon icon-trash"></i></a></td>
</tr>
OurUmbraco.Site/umbraco/dialogs/ChangeDocType.aspx
+4 -5
View File
@@ -51,7 +51,7 @@
</cc1:PropertyPanel>
<asp:PlaceHolder ID="NotAvailablePlaceholder" runat="server" Visible="false">
<div class="propertyItem notice" style="padding: 10px">
<div class="propertyItem notice" style="padding-top: 10px">
<p><%=umbraco.ui.Text("changeDocType", "docTypeCannotBeChanged") %></p>
</div>
</asp:PlaceHolder>
@@ -91,15 +91,14 @@
</cc1:Pane>
<asp:PlaceHolder ID="SuccessPlaceholder" runat="server" Visible="false">
<h2 class="propertypaneTitel"><%=umbraco.ui.Text("changeDocType", "docTypeChanged") %></h2>
<br />
<div class="success" style="padding: 10px">
<p><%=umbraco.ui.Text("changeDocType", "docTypeChanged") %></p>
<p>
<asp:Literal ID="SuccessMessage" runat="server" />
<asp:Literal ID="PropertiesMappedMessage" runat="server" />
<asp:Literal ID="ContentPublishedMessage" runat="server" />
<br /><br />
<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("defaultdialogs", "closeThisWindow") %></a>
</div>
</p>
</asp:PlaceHolder>
<asp:PlaceHolder ID="ValidationPlaceholder" runat="server" Visible="false">
OurUmbraco.Site/umbraco/endPreview.aspx
+22 -14
View File
@@ -1,16 +1,24 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="endPreview.aspx.cs" Inherits="umbraco.presentation.endPreview" %>
<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<script runat="server">
<html xmlns="http://www.w3.org/1999/xhtml" >
<head runat="server">
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
Redirecting...
</div>
</form>
</body>
</html>
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
global::umbraco.presentation.preview.PreviewContent.ClearPreviewCookie();
if (!Uri.IsWellFormedUriString(Request.QueryString["redir"], UriKind.Relative))
{
Response.Redirect("/", true);
}
Uri url;
if (!Uri.TryCreate(Request.QueryString["redir"], UriKind.Relative, out url))
{
Response.Redirect("/", true);
}
Response.Redirect(url.ToString(), true);
}
</script>
OurUmbraco.Site/umbraco/installer.html
+2 -2
View File
@@ -17,8 +17,8 @@
<div ng-include="installer.current.view"></div>
</div>
<div id="overlay"></div>
<script src="lib/lazyload/lazyload.min.js"></script>
<div id="overlay"></div>
<script src="lib/rgrove-lazyload/lazyload.js"></script>
<script src="js/install.loader.js"></script>
</body>
</html>
OurUmbraco.Site/umbraco/js/canvasdesigner.loader.js
+3 -3
View File
@@ -1,8 +1,8 @@
LazyLoad.js([
'/Umbraco/lib/jquery/jquery-2.0.3.min.js',
'/Umbraco/lib/jquery/jquery-ui-1.10.4.custom.min.js',
'/Umbraco/lib/jquery/jquery.min.js',
'/Umbraco/lib/jquery-ui/jquery-ui.min.js',
'/Umbraco/lib/angular/1.1.5/angular.min.js',
'/Umbraco/lib/underscore/underscore.js',
'/Umbraco/lib/underscore/underscore-min.js',
'/Umbraco/js/app.js',
'/Umbraco/js/umbraco.resources.js',
'/Umbraco/js/umbraco.services.js',
OurUmbraco.Site/umbraco/js/canvasdesigner.panel.js
+6 -6
View File
@@ -77,12 +77,12 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
$scope.pageUrl = "../dialogs/Preview.aspx?id=" + $location.search().id;
$scope.valueAreLoaded = false;
$scope.devices = [
{ name: "desktop", css: "desktop", icon: "icon-display" },
{ name: "laptop - 1366px", css: "laptop border", icon: "icon-laptop" },
{ name: "iPad portrait - 768px", css: "iPad-portrait border", icon: "icon-ipad" },
{ name: "iPad landscape - 1024px", css: "iPad-landscape border", icon: "icon-ipad flip" },
{ name: "smartphone portrait - 480px", css: "smartphone-portrait border", icon: "icon-iphone" },
{ name: "smartphone landscape - 320px", css: "smartphone-landscape border", icon: "icon-iphone flip" }
{ name: "desktop", css: "desktop", icon: "icon-display", title: "Desktop" },
{ name: "laptop - 1366px", css: "laptop border", icon: "icon-laptop", title: "Laptop" },
{ name: "iPad portrait - 768px", css: "iPad-portrait border", icon: "icon-ipad", title: "Tablet portrait" },
{ name: "iPad landscape - 1024px", css: "iPad-landscape border", icon: "icon-ipad flip", title: "Tablet landscape" },
{ name: "smartphone portrait - 480px", css: "smartphone-portrait border", icon: "icon-iphone", title: "Smartphone portrait" },
{ name: "smartphone landscape - 320px", css: "smartphone-landscape border", icon: "icon-iphone flip", title: "Smartphone landscape" }
];
$scope.previewDevice = $scope.devices[0];
OurUmbraco.Site/umbraco/js/init.js
+15 -3
View File
@@ -2,7 +2,6 @@
app.run(['userService', '$log', '$rootScope', '$location', 'navigationService', 'appState', 'editorState', 'fileManager', 'assetsService', 'eventsService', '$cookies', '$templateCache',
function (userService, $log, $rootScope, $location, navigationService, appState, editorState, fileManager, assetsService, eventsService, $cookies, $templateCache) {
//This sets the default jquery ajax headers to include our csrf token, we
// need to user the beforeSend method because our token changes per user/login so
// it cannot be static
@@ -16,8 +15,10 @@ app.run(['userService', '$log', '$rootScope', '$location', 'navigationService',
eventsService.on("app.authenticated", function(evt, data) {
assetsService._loadInitAssets().then(function() {
appState.setGlobalState("isReady", true);
//send the ready event
//send the ready event with the included returnToPath,returnToSearch data
eventsService.emit("app.ready", data);
returnToPath = null, returnToSearch = null;
});
});
@@ -44,7 +45,18 @@ app.run(['userService', '$log', '$rootScope', '$location', 'navigationService',
wiring up it's controller, etc... and then redirect to the rejected URL. */
$rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
event.preventDefault();
$location.path(rejection.path).search(rejection.search);
var returnPath = null;
if (rejection.path == "/login" || rejection.path.startsWith("/login/")) {
//Set the current path before redirecting so we know where to redirect back to
returnPath = encodeURIComponent($location.url());
}
$location.path(rejection.path)
if (returnPath) {
$location.search("returnPath", returnPath);
}
});
OurUmbraco.Site/umbraco/js/install.loader.js
+5 -4
View File
@@ -1,16 +1,17 @@
LazyLoad.js( [
'lib/jquery/jquery-2.0.3.min.js',
'lib/jquery/jquery.min.js',
/* 1.1.5 */
'lib/angular/1.1.5/angular.min.js',
'lib/angular/1.1.5/angular-cookies.min.js',
'lib/angular/1.1.5/angular-mobile.min.js',
'lib/angular/1.1.5/angular-mocks.js',
'lib/angular/1.1.5/angular-sanitize.min.js',
'lib/underscore/underscore.js',
'js/umbraco.installer.js'
'lib/underscore/underscore-min.js',
'js/umbraco.installer.js',
'js/umbraco.directives.js'
], function () {
jQuery(document).ready(function () {
angular.bootstrap(document, ['ngSanitize', 'umbraco.install']);
angular.bootstrap(document, ['ngSanitize', 'umbraco.install', 'umbraco.directives.validation']);
});
}
);
OurUmbraco.Site/umbraco/js/loader.js
+7 -9
View File
@@ -1,9 +1,7 @@
LazyLoad.js(
[
'lib/jquery/jquery-2.0.3.min.js',
/* the jquery ui elements we need */
'lib/jquery/jquery-ui-1.10.3.custom.min.js',
'lib/jquery/jquery.min.js',
'lib/jquery-ui/jquery-ui.min.js',
/* 1.1.5 */
'lib/angular/1.1.5/angular.min.js',
@@ -14,15 +12,15 @@ LazyLoad.js(
'lib/angular/angular-ui-sortable.js',
'lib/angular/tmhDynamicLocale.js',
'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',
/* App-wide file-upload helper */
'lib/jquery/jquery.upload/js/jquery.fileupload.js',
'lib/jquery/jquery.upload/js/jquery.fileupload-process.js',
'lib/jquery/jquery.upload/js/jquery.fileupload-angular.js',
'lib/jquery-file-upload/jquery.fileupload.js',
'lib/jquery-file-upload/jquery.fileupload-process.js',
'lib/jquery-file-upload/jquery.fileupload-angular.js',
'lib/bootstrap/js/bootstrap.2.3.2.min.js',
'lib/underscore/underscore.js',
'lib/underscore/underscore-min.js',
'lib/umbraco/Extensions.js',
'lib/umbraco/NamespaceManager.js',
OurUmbraco.Site/umbraco/js/umbraco.controllers.js
+695 -444
View File
File diff suppressed because it is too large Load Diff
OurUmbraco.Site/umbraco/js/umbraco.directives.js
+643 -152
View File
File diff suppressed because it is too large Load Diff
OurUmbraco.Site/umbraco/js/umbraco.filters.js
+1 -1
View File
@@ -1,6 +1,6 @@
/*! umbraco
* https://github.com/umbraco/umbraco-cms/
* Copyright (c) 2014 Umbraco HQ;
* Copyright (c) 2015 Umbraco HQ;
* Licensed MIT
*/
OurUmbraco.Site/umbraco/js/umbraco.installer.js
+1 -1
View File
@@ -1,6 +1,6 @@
/*! umbraco
* https://github.com/umbraco/umbraco-cms/
* Copyright (c) 2014 Umbraco HQ;
* Copyright (c) 2015 Umbraco HQ;
* Licensed MIT
*/
OurUmbraco.Site/umbraco/js/umbraco.resources.js
+28 -15
View File
@@ -1,6 +1,6 @@
/*! umbraco
* https://github.com/umbraco/umbraco-cms/
* Copyright (c) 2014 Umbraco HQ;
* Copyright (c) 2015 Umbraco HQ;
* Licensed MIT
*/
@@ -1206,6 +1206,7 @@ angular.module('umbraco.resources').factory('dataTypeResource', dataTypeResource
* - User
* - Language
* - Domain
* - DataType
**/
function entityResource($q, $http, umbRequestHelper) {
@@ -1440,20 +1441,26 @@ function entityResource($q, $http, umbRequestHelper) {
* @returns {Promise} resourcePromise object containing the entity array.
*
*/
search: function (query, type, searchFrom) {
search: function (query, type, searchFrom, canceler) {
var args = [{ query: query }, { type: type }];
if (searchFrom) {
args.push({ searchFrom: searchFrom });
}
var httpConfig = {};
if (canceler) {
httpConfig["timeout"] = canceler;
}
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"entityApiBaseUrl",
"Search",
args)),
'Failed to retrieve entity data for query ' + query);
$http.get(
umbRequestHelper.getApiUrl(
"entityApiBaseUrl",
"Search",
args),
httpConfig),
'Failed to retrieve entity data for query ' + query);
},
@@ -1478,15 +1485,21 @@ function entityResource($q, $http, umbRequestHelper) {
* @returns {Promise} resourcePromise object containing the entity array.
*
*/
searchAll: function (query) {
searchAll: function (query, canceler) {
var httpConfig = {};
if (canceler) {
httpConfig["timeout"] = canceler;
}
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"entityApiBaseUrl",
"SearchAll",
[{ query: query }])),
'Failed to retrieve entity data for query ' + query);
$http.get(
umbRequestHelper.getApiUrl(
"entityApiBaseUrl",
"SearchAll",
[{ query: query }]),
httpConfig),
'Failed to retrieve entity data for query ' + query);
}
};
OurUmbraco.Site/umbraco/js/umbraco.security.js
+1 -1
View File
@@ -1,6 +1,6 @@
/*! umbraco
* https://github.com/umbraco/umbraco-cms/
* Copyright (c) 2014 Umbraco HQ;
* Copyright (c) 2015 Umbraco HQ;
* Licensed MIT
*/
OurUmbraco.Site/umbraco/js/umbraco.services.js
+280 -201
View File
@@ -1,6 +1,6 @@
/*! umbraco
* https://github.com/umbraco/umbraco-cms/
* Copyright (c) 2014 Umbraco HQ;
* Copyright (c) 2015 Umbraco HQ;
* Licensed MIT
*/
@@ -507,27 +507,36 @@ angular.module('umbraco.services')
.factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope, $http) {
var initAssetsLoaded = false;
var appendRnd = function(url){
var appendRnd = function (url) {
//if we don't have a global umbraco obj yet, the app is bootstrapping
if(!Umbraco.Sys.ServerVariables.application){
if (!Umbraco.Sys.ServerVariables.application) {
return url;
}
var rnd = Umbraco.Sys.ServerVariables.application.version +"."+Umbraco.Sys.ServerVariables.application.cdf;
var _op = (url.indexOf("?")>0) ? "&" : "?";
var rnd = Umbraco.Sys.ServerVariables.application.version + "." + Umbraco.Sys.ServerVariables.application.cdf;
var _op = (url.indexOf("?") > 0) ? "&" : "?";
url = url + _op + "umb__rnd=" + rnd;
return url;
};
function convertVirtualPath(path) {
//make this work for virtual paths
if (path.startsWith("~/")) {
path = umbRequestHelper.convertVirtualToAbsolutePath(path);
}
return path;
}
var service = {
loadedAssets:{},
_getAssetPromise : function(path){
if(this.loadedAssets[path]){
loadedAssets: {},
_getAssetPromise: function (path) {
if (this.loadedAssets[path]) {
return this.loadedAssets[path];
}else{
} else {
var deferred = $q.defer();
this.loadedAssets[path] = {deferred: deferred, state: "new", path: path};
this.loadedAssets[path] = { deferred: deferred, state: "new", path: path };
return this.loadedAssets[path];
}
},
@@ -540,7 +549,7 @@ angular.module('umbraco.services')
//here we need to ensure the required application assets are loaded
if (initAssetsLoaded === false) {
var self = this;
self.loadJs(umbRequestHelper.getApiUrl("serverVarsJs", "", ""), $rootScope).then(function() {
self.loadJs(umbRequestHelper.getApiUrl("serverVarsJs", "", ""), $rootScope).then(function () {
initAssetsLoaded = true;
//now we need to go get the legacyTreeJs - but this can be done async without waiting.
@@ -569,30 +578,33 @@ angular.module('umbraco.services')
* @param {Number} timeout in milliseconds
* @returns {Promise} Promise object which resolves when the file has loaded
*/
loadCss : function(path, scope, attributes, timeout){
var asset = this._getAssetPromise(path); // $q.defer();
var t = timeout || 5000;
var a = attributes || undefined;
if(asset.state === "new"){
asset.state = "loading";
LazyLoad.css(appendRnd(path), function () {
if (!scope) {
asset.state = "loaded";
asset.deferred.resolve(true);
}else{
asset.state = "loaded";
angularHelper.safeApply(scope, function () {
asset.deferred.resolve(true);
});
}
});
}else if(asset.state === "loaded"){
asset.deferred.resolve(true);
}
return asset.deferred.promise;
},
loadCss: function (path, scope, attributes, timeout) {
path = convertVirtualPath(path);
var asset = this._getAssetPromise(path); // $q.defer();
var t = timeout || 5000;
var a = attributes || undefined;
if (asset.state === "new") {
asset.state = "loading";
LazyLoad.css(appendRnd(path), function () {
if (!scope) {
asset.state = "loaded";
asset.deferred.resolve(true);
} else {
asset.state = "loaded";
angularHelper.safeApply(scope, function () {
asset.deferred.resolve(true);
});
}
});
} else if (asset.state === "loaded") {
asset.deferred.resolve(true);
}
return asset.deferred.promise;
},
/**
* @ngdoc method
* @name umbraco.services.assetsService#loadJs
@@ -607,28 +619,30 @@ angular.module('umbraco.services')
* @param {Number} timeout in milliseconds
* @returns {Promise} Promise object which resolves when the file has loaded
*/
loadJs : function(path, scope, attributes, timeout){
loadJs: function (path, scope, attributes, timeout) {
path = convertVirtualPath(path);
var asset = this._getAssetPromise(path); // $q.defer();
var t = timeout || 5000;
var a = attributes || undefined;
if(asset.state === "new"){
if (asset.state === "new") {
asset.state = "loading";
LazyLoad.js(appendRnd(path), function () {
if (!scope) {
asset.state = "loaded";
asset.deferred.resolve(true);
}else{
asset.state = "loaded";
angularHelper.safeApply(scope, function () {
asset.deferred.resolve(true);
});
}
if (!scope) {
asset.state = "loaded";
asset.deferred.resolve(true);
} else {
asset.state = "loaded";
angularHelper.safeApply(scope, function () {
asset.deferred.resolve(true);
});
}
});
}else if(asset.state === "loaded"){
} else if (asset.state === "loaded") {
asset.deferred.resolve(true);
}
@@ -655,7 +669,7 @@ angular.module('umbraco.services')
throw "pathArray must be an array";
}
var nonEmpty = _.reject(pathArray, function(item) {
var nonEmpty = _.reject(pathArray, function (item) {
return item === undefined || item === "";
});
@@ -667,12 +681,14 @@ angular.module('umbraco.services')
//compile a list of promises
//blocking
_.each(nonEmpty, function(path){
_.each(nonEmpty, function (path) {
path = convertVirtualPath(path);
var asset = service._getAssetPromise(path);
//if not previously loaded, add to list of promises
if(asset.state !== "loaded")
{
if(asset.state === "new"){
if (asset.state !== "loaded") {
if (asset.state === "new") {
asset.state = "loading";
assets.push(asset);
}
@@ -686,21 +702,21 @@ angular.module('umbraco.services')
//gives a central monitoring of all assets to load
promise = $q.all(promises);
_.each(assets, function(asset){
_.each(assets, function (asset) {
LazyLoad.js(appendRnd(asset.path), function () {
if (!scope) {
asset.state = "loaded";
asset.deferred.resolve(true);
}else{
asset.state = "loaded";
angularHelper.safeApply(scope, function () {
asset.deferred.resolve(true);
});
}
});
if (!scope) {
asset.state = "loaded";
asset.deferred.resolve(true);
} else {
asset.state = "loaded";
angularHelper.safeApply(scope, function () {
asset.deferred.resolve(true);
});
}
});
});
}else{
} else {
//return and resolve
var deferred = $q.defer();
promise = deferred.promise;
@@ -1920,6 +1936,13 @@ angular.module('umbraco.services')
template: 'views/common/dialogs/ysod.html',
show: true
});
},
confirmDialog: function (ysodError) {
options.template = 'views/common/dialogs/confirm.html';
options.show = true;
return openDialog(options);
}
};
});
@@ -2264,7 +2287,7 @@ angular.module('umbraco.services').factory('formHelper', formHelper);
angular.module('umbraco.services')
.factory('gridService', function ($http, $q){
var configPath = "../config/grid.editors.config.js";
var configPath = Umbraco.Sys.ServerVariables.umbracoUrls.gridConfig;
var service = {
getGridEditors: function () {
return $http.get(configPath);
@@ -3026,122 +3049,126 @@ angular.module('umbraco.services')
}]);
angular.module('umbraco.services')
.factory('localizationService', function ($http, $q, eventsService, $window, $filter, userService) {
var service = {
// array to hold the localized resource string entries
dictionary:[],
// location of the resource file
url: "js/language.aspx",
// flag to indicate if the service hs loaded the resource file
resourceFileLoaded:false,
// success handler for all server communication
successCallback:function (data) {
// store the returned array in the dictionary
service.dictionary = data;
// set the flag that the resource are loaded
service.resourceFileLoaded = true;
// broadcast that the file has been loaded
eventsService.emit("localizationService.updated", data);
},
var url = "LocalizedText";
var resourceFileLoadStatus = "none";
var resourceLoadingPromise = [];
// allows setting of language on the fly
setLanguage: function(value) {
service.initLocalizedResources();
},
function _lookup(value, tokens, dictionary) {
// allows setting of resource url on the fly
setUrl: function(value) {
service.url = value;
service.initLocalizedResources();
},
//strip the key identifier if its there
if (value && value[0] === "@") {
value = value.substring(1);
}
// loads the language resource file from the server
initLocalizedResources:function () {
var deferred = $q.defer();
// build the url to retrieve the localized resource file
$http({ method:"GET", url:service.url, cache:false })
.then(function(response){
service.resourceFileLoaded = true;
service.dictionary = response.data;
//if no area specified, add general_
if (value && value.indexOf("_") < 0) {
value = "general_" + value;
}
eventsService.emit("localizationService.updated", service.dictionary);
return deferred.resolve(service.dictionary);
}, function(err){
return deferred.reject("Something broke");
});
return deferred.promise;
},
//helper to tokenize and compile a localization string
tokenize: function(value,scope) {
if (value) {
var localizer = value.split(':');
var retval = { tokens: undefined, key: localizer[0].substring(0) };
if (localizer.length > 1) {
retval.tokens = localizer[1].split(',');
for (var x = 0; x < retval.tokens.length; x++) {
retval.tokens[x] = scope.$eval(retval.tokens[x]);
}
}
return retval;
var entry = dictionary[value];
if (entry) {
if (tokens) {
for (var i = 0; i < tokens.length; i++) {
entry = entry.replace("%" + i + "%", tokens[i]);
}
return value;
},
// checks the dictionary for a localized resource string
localize: function(value,tokens) {
var deferred = $q.defer();
if(service.resourceFileLoaded){
var val = service._lookup(value,tokens);
deferred.resolve(val);
}else{
service.initLocalizedResources().then(function(dic){
var val = service._lookup(value,tokens);
deferred.resolve(val);
});
}
return deferred.promise;
},
_lookup: function(value,tokens){
//strip the key identifier if its there
if(value && value[0] === "@"){
value = value.substring(1);
}
//if no area specified, add general_
if(value && value.indexOf("_") < 0){
value = "general_" + value;
}
var entry = service.dictionary[value];
if(entry){
if(tokens){
for (var i = 0; i < tokens.length; i++) {
entry = entry.replace("%"+i+"%", tokens[i]);
}
}
return entry;
}
return "[" + value + "]";
}
};
return entry;
}
return "[" + value + "]";
}
// force the load of the resource file
service.initLocalizedResources();
var service = {
// array to hold the localized resource string entries
dictionary: [],
//This happens after login / auth and assets loading
eventsService.on("app.authenticated", function(){
service.resourceFileLoaded = false;
});
// loads the language resource file from the server
initLocalizedResources: function () {
var deferred = $q.defer();
// return the local instance when called
return service;
//if the resource is already loading, we don't want to force it to load another one in tandem, we'd rather
// wait for that initial http promise to finish and then return this one with the dictionary loaded
if (resourceFileLoadStatus === "loading") {
//add to the list of promises waiting
resourceLoadingPromise.push(deferred);
//exit now it's already loading
return deferred.promise;
}
resourceFileLoadStatus = "loading";
// build the url to retrieve the localized resource file
$http({ method: "GET", url: url, cache: false })
.then(function (response) {
resourceFileLoadStatus = "loaded";
service.dictionary = response.data;
eventsService.emit("localizationService.updated", response.data);
deferred.resolve(response.data);
//ensure all other queued promises are resolved
for (var p in resourceLoadingPromise) {
resourceLoadingPromise[p].resolve(response.data);
}
}, function (err) {
deferred.reject("Something broke");
//ensure all other queued promises are resolved
for (var p in resourceLoadingPromise) {
resourceLoadingPromise[p].reject("Something broke");
}
});
return deferred.promise;
},
//helper to tokenize and compile a localization string
tokenize: function (value, scope) {
if (value) {
var localizer = value.split(':');
var retval = { tokens: undefined, key: localizer[0].substring(0) };
if (localizer.length > 1) {
retval.tokens = localizer[1].split(',');
for (var x = 0; x < retval.tokens.length; x++) {
retval.tokens[x] = scope.$eval(retval.tokens[x]);
}
}
return retval;
}
return value;
},
// checks the dictionary for a localized resource string
localize: function (value, tokens) {
var deferred = $q.defer();
if (resourceFileLoadStatus === "loaded") {
var val = _lookup(value, tokens, service.dictionary);
deferred.resolve(val);
} else {
service.initLocalizedResources().then(function (dic) {
var val = _lookup(value, tokens, dic);
deferred.resolve(val);
});
}
return deferred.promise;
},
};
// force the load of the resource file
service.initLocalizedResources();
//This happens after login / auth and assets loading
eventsService.on("app.authenticated", function () {
resourceFileLoadStatus = "none";
resourceLoadingPromise = [];
});
// return the local instance when called
return service;
});
/**
* @ngdoc service
* @name umbraco.services.macroService
@@ -3156,8 +3183,10 @@ function macroService() {
/** parses the special macro syntax like <?UMBRACO_MACRO macroAlias="Map" /> and returns an object with the macro alias and it's parameters */
parseMacroSyntax: function (syntax) {
var expression = /(<\?UMBRACO_MACRO macroAlias=["']([\w\.]+?)["'][\s\S]+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/i;
//This regex will match an alias of anything except characters that are quotes or new lines (for legacy reasons, when new macros are created
// their aliases are cleaned an invalid chars are stripped)
var expression = /(<\?UMBRACO_MACRO macroAlias=["']([^\"\'\n\r]+?)["'][\s\S]+?)(\/>|>.*?<\/\?UMBRACO_MACRO>)/i;
var match = expression.exec(syntax);
if (!match || match.length < 3) {
return null;
@@ -3302,6 +3331,7 @@ function macroService() {
}
angular.module('umbraco.services').factory('macroService', macroService);
/**
* @ngdoc service
* @name umbraco.services.mediaHelper
@@ -3631,6 +3661,11 @@ function mediaHelper(umbRequestHelper) {
* @param {string} imagePath Image path, ex: /media/1234/my-image.jpg
*/
detectIfImageByExtension: function (imagePath) {
if (!imagePath) {
return false;
}
var lowered = imagePath.toLowerCase();
var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
return ("," + Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes + ",").indexOf("," + ext + ",") !== -1;
@@ -4231,23 +4266,26 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
* Opens the user dialog, next to the sections navigation
* template is located in views/common/dialogs/user.html
*/
showUserDialog: function() {
showUserDialog: function () {
// hide tray and close help dialog
if (service.helpDialog) {
service.helpDialog.close();
}
service.hideTray();
if(userDialog){
userDialog.close();
userDialog = null;
if (service.userDialog) {
service.userDialog.close();
service.userDialog = undefined;
}
userDialog = dialogService.open(
{
template: "views/common/dialogs/user.html",
modalClass: "umb-modal-left",
show: true
});
service.userDialog = dialogService.open(
{
template: "views/common/dialogs/user.html",
modalClass: "umb-modal-left",
show: true
});
return userDialog;
return service.userDialog;
},
/**
@@ -4259,7 +4297,13 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
* Opens the user dialog, next to the sections navigation
* template is located in views/common/dialogs/user.html
*/
showHelpDialog: function() {
showHelpDialog: function () {
// hide tray and close user dialog
service.hideTray();
if (service.userDialog) {
service.userDialog.close();
}
if(service.helpDialog){
service.helpDialog.close();
service.helpDialog = undefined;
@@ -4843,7 +4887,7 @@ angular.module('umbraco.services')
throw "args.term is required";
}
return entityResource.search(args.term, "Document", args.searchFrom).then(function (data) {
return entityResource.search(args.term, "Document", args.searchFrom, args.canceler).then(function (data) {
_.each(data, function (item) {
configureContentResult(item);
});
@@ -4893,7 +4937,7 @@ angular.module('umbraco.services')
throw "args.term is required";
}
return entityResource.searchAll(args.term).then(function (data) {
return entityResource.searchAll(args.term, args.canceler).then(function (data) {
_.each(data, function(resultByType) {
switch(resultByType.type) {
@@ -5423,7 +5467,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
if (img) {
var data = {
alt: img.altText,
alt: img.altText || "",
src: (img.url) ? img.url : "nothing.jpg",
rel: img.id,
id: '__mcenew'
@@ -6587,6 +6631,30 @@ angular.module('umbraco.services').factory('treeService', treeService);
function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogService, notificationsService) {
return {
/**
* @ngdoc method
* @name umbraco.services.umbRequestHelper#convertVirtualToAbsolutePath
* @methodOf umbraco.services.umbRequestHelper
* @function
*
* @description
* This will convert a virtual path (i.e. ~/App_Plugins/Blah/Test.html ) to an absolute path
*
* @param {string} a virtual path, if this is already an absolute path it will just be returned, if this is a relative path an exception will be thrown
*/
convertVirtualToAbsolutePath: function(virtualPath) {
if (virtualPath.startsWith("/")) {
return virtualPath;
}
if (!virtualPath.startsWith("~/")) {
throw "The path " + virtualPath + " is not a virtual path";
}
if (!Umbraco.Sys.ServerVariables.application.applicationPath) {
throw "No applicationPath defined in Umbraco.ServerVariables.application.applicationPath";
}
return Umbraco.Sys.ServerVariables.application.applicationPath + virtualPath.trimStart("~/");
},
/**
* @ngdoc method
* @name umbraco.services.umbRequestHelper#dictionaryToQueryString
@@ -6802,8 +6870,14 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
//when there's a 500 (unhandled) error show a YSOD overlay if debugging is enabled.
if (status >= 500 && status < 600) {
//show a ysod dialog
if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
//This is a bit of a hack to check if the error is due to a file being uploaded that is too large,
// we have to just check for the existence of a string value but currently that is the best way to
// do this since it's very hacky/difficult to catch this on the server
if (data.indexOf("Maximum request length exceeded") >= 0) {
notificationsService.error("Server error", "The uploaded file was too large, check with your site administrator to adjust the maximum size allowed");
}
else if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
//show a ysod dialog
dialogService.ysodDialog({
errorMsg: 'An error occurred',
data: data
@@ -7349,14 +7423,18 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
//if there is only one image, then return the target height
return targetHeight;
}
else if (currRowWidth / targetRowWidth > 0.90) {
//it's close enough, it's at least 90% of the width so we'll accept it with the target height
return targetHeight;
}
else {
//if it's not successful, return false
//if it's not successful, return null
return null;
}
},
/** builds an image grid row */
buildRow: function(imgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin) {
buildRow: function(imgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin, totalRemaining) {
var currRowWidth = 0;
var row = { images: [] };
@@ -7403,8 +7481,8 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
this.setImageStyle(row.images[j], sizes[j].width, sizes[j].height, margin, bottomMargin);
}
if (row.images.length === 1) {
//if there's only one image on the row, set the container to max width
if (row.images.length === 1 && totalRemaining > 1) {
//if there's only one image on the row and there are more images remaining, set the container to max width
row.images[0].style.width = maxRowWidth + "px";
}
@@ -7428,7 +7506,7 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
buildGrid: function(images, maxRowWidth, maxRowHeight, startingIndex, minDisplayHeight, idealImgPerRow, margin,imagesOnly) {
var rows = [];
var imagesProcessed = 0;
var imagesProcessed = 0;
//first fill in all of the original image sizes and URLs
for (var i = startingIndex; i < images.length; i++) {
@@ -7448,7 +7526,8 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
var currImgs = images.slice(imagesProcessed);
//build the row
var row = this.buildRow(currImgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin);
var remaining = images.length - imagesProcessed;
var row = this.buildRow(currImgs, maxRowHeight, minDisplayHeight, maxRowWidth, idealImgPerRow, margin, remaining);
if (row.images.length > 0) {
rows.push(row);
imagesProcessed += row.images.length;
OurUmbraco.Site/umbraco/js/umbraco.testing.js
+2 -2
View File
@@ -1,6 +1,6 @@
/*! umbraco
* https://github.com/umbraco/umbraco-cms/
* Copyright (c) 2014 Umbraco HQ;
* Copyright (c) 2015 Umbraco HQ;
* Licensed MIT
*/
@@ -2104,7 +2104,7 @@ angular.module('umbraco.mocks').
return {
register: function() {
$httpBackend
.whenGET(mocksUtils.urlRegex('js/language.aspx'))
.whenGET(mocksUtils.urlRegex('LocalizedText'))
.respond(getLanguageResource);
}
};
OurUmbraco.Site/umbraco/lib/angular-dynamic-locale/tmhDynamicLocale.min.js
Vendored
+8
View File
@@ -0,0 +1,8 @@
/**
* Angular Dynamic Locale - 0.1.27
* https://github.com/lgalfaso/angular-dynamic-locale
* License: MIT
*/
!function(){"use strict";angular.module("tmh.dynamicLocale",[]).config(["$provide",function(a){function b(a){return a.$stateful=!0,a}a.decorator("dateFilter",["$delegate",b]),a.decorator("numberFilter",["$delegate",b]),a.decorator("currencyFilter",["$delegate",b])}]).constant("tmhDynamicLocale.STORAGE_KEY","tmhDynamicLocale.locale").provider("tmhDynamicLocale",["tmhDynamicLocale.STORAGE_KEY",function(a){function b(a,b,c,d){var e=document.createElement("script"),f=document.getElementsByTagName("body")[0],g=!1;e.type="text/javascript",e.readyState?e.onreadystatechange=function(){("complete"===e.readyState||"loaded"===e.readyState)&&(e.onreadystatechange=null,d(function(){g||(g=!0,f.removeChild(e),b())},30,!1))}:(e.onload=function(){g||(g=!0,f.removeChild(e),b())},e.onerror=function(){g||(g=!0,f.removeChild(e),c())}),e.src=a,e.async=!1,f.appendChild(e)}function c(a,c,d,g,h,k,l){function m(a,b){f===d&&(angular.forEach(a,function(c,d){b[d]?angular.isArray(b[d])&&(a[d].length=b[d].length):delete a[d]}),angular.forEach(b,function(c,d){angular.isArray(b[d])||angular.isObject(b[d])?(a[d]||(a[d]=angular.isArray(b[d])?[]:{}),m(a[d],b[d])):a[d]=b[d]}))}if(j[d])return j[d];var n,o=h.defer();return d===f?o.resolve(c):(n=k.get(d))?(f=d,g.$evalAsync(function(){m(c,n),g.$broadcast("$localeChangeSuccess",d,c),e.put(i,d),o.resolve(c)})):(f=d,j[d]=o.promise,b(a,function(){var a=angular.injector(["ngLocale"]),b=a.get("$locale");m(c,b),k.put(d,b),delete j[d],g.$apply(function(){g.$broadcast("$localeChangeSuccess",d,c),e.put(i,d),o.resolve(c)})},function(){delete j[d],g.$apply(function(){f===d&&(f=c.id),g.$broadcast("$localeChangeError",d),o.reject(d)})},l)),o.promise}var d,e,f,g="angular/i18n/angular-locale_{{locale}}.js",h="tmhDynamicLocaleStorageCache",i=a,j={};this.localeLocationPattern=function(a){return a?(g=a,this):g},this.useStorage=function(a){h=a},this.useCookieStorage=function(){this.useStorage("$cookieStore")},this.defaultLocale=function(a){d=a},this.storageKey=function(a){return a?(i=a,this):i},this.$get=["$rootScope","$injector","$interpolate","$locale","$q","tmhDynamicLocaleCache","$timeout",function(a,b,j,k,l,m,n){var o=j(g);return e=b.get(h),a.$evalAsync(function(){var b;(b=e.get(i)||d)&&c(o({locale:b}),k,b,a,l,m,n)}),{set:function(b){return c(o({locale:b}),k,b,a,l,m,n)},get:function(){return f}}}]}]).provider("tmhDynamicLocaleCache",function(){this.$get=["$cacheFactory",function(a){return a("tmh.dynamicLocales")}]}).provider("tmhDynamicLocaleStorageCache",function(){this.$get=["$cacheFactory",function(a){return a("tmh.dynamicLocales.store")}]}).run(["tmhDynamicLocale",angular.noop])}(window);
//# sourceMappingURL=tmhDynamicLocale.min.js.map
OurUmbraco.Site/umbraco/lib/blueimp-load-image/load-image.all.min.js
Vendored
+1
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/umbraco/lib/bootstrap/less/forms.less
+1 -1
View File
@@ -229,7 +229,7 @@ textarea {
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
float: left;
margin-left: -20px;
margin-left: 0px;
}
// Move the options list down to align with labels
OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload-angular.js
Vendored
+427
View File
@@ -0,0 +1,427 @@
/*
* jQuery File Upload AngularJS Plugin 2.1.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/
/*jslint nomen: true, unparam: true */
/*global define, angular */
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define([
'jquery',
'angular',
'./jquery.fileupload-image',
'./jquery.fileupload-audio',
'./jquery.fileupload-video',
'./jquery.fileupload-validate'
], factory);
} else {
factory();
}
}(function () {
'use strict';
angular.module('blueimp.fileupload', [])
// The fileUpload service provides configuration options
// for the fileUpload directive and default handlers for
// File Upload events:
.provider('fileUpload', function () {
var scopeEvalAsync = function (expression) {
var scope = angular.element(this)
.fileupload('option', 'scope')();
// Schedule a new $digest cycle if not already inside of one
// and evaluate the given expression:
scope.$evalAsync(expression);
},
addFileMethods = function (scope, data) {
var files = data.files,
file = files[0];
angular.forEach(files, function (file, index) {
file._index = index;
file.$state = function () {
return data.state();
};
file.$processing = function () {
return data.processing();
};
file.$progress = function () {
return data.progress();
};
file.$response = function () {
return data.response();
};
});
file.$submit = function () {
if (!file.error) {
return data.submit();
}
};
file.$cancel = function () {
return data.abort();
};
},
$config;
$config = this.defaults = {
handleResponse: function (e, data) {
var files = data.result && data.result.files;
if (files) {
data.scope().replace(data.files, files);
} else if (data.errorThrown ||
data.textStatus === 'error') {
data.files[0].error = data.errorThrown ||
data.textStatus;
}
},
add: function (e, data) {
if (e.isDefaultPrevented()) {
return false;
}
var scope = data.scope(),
filesCopy = [];
angular.forEach(data.files, function (file) {
filesCopy.push(file);
});
scope.$apply(function () {
addFileMethods(scope, data);
var method = scope.option('prependFiles') ?
'unshift' : 'push';
Array.prototype[method].apply(scope.queue, data.files);
});
data.process(function () {
return scope.process(data);
}).always(function () {
scope.$apply(function () {
addFileMethods(scope, data);
scope.replace(filesCopy, data.files);
});
}).then(function () {
if ((scope.option('autoUpload') ||
data.autoUpload) &&
data.autoUpload !== false) {
data.submit();
}
});
},
progress: function (e, data) {
if (e.isDefaultPrevented()) {
return false;
}
data.scope().$apply();
},
done: function (e, data) {
if (e.isDefaultPrevented()) {
return false;
}
var that = this;
data.scope().$apply(function () {
data.handleResponse.call(that, e, data);
});
},
fail: function (e, data) {
if (e.isDefaultPrevented()) {
return false;
}
var that = this,
scope = data.scope();
if (data.errorThrown === 'abort') {
scope.clear(data.files);
return;
}
scope.$apply(function () {
data.handleResponse.call(that, e, data);
});
},
stop: scopeEvalAsync,
processstart: scopeEvalAsync,
processstop: scopeEvalAsync,
getNumberOfFiles: function () {
var scope = this.scope();
return scope.queue.length - scope.processing();
},
dataType: 'json',
autoUpload: false
};
this.$get = [
function () {
return {
defaults: $config
};
}
];
})
// Format byte numbers to readable presentations:
.provider('formatFileSizeFilter', function () {
var $config = {
// Byte units following the IEC format
// http://en.wikipedia.org/wiki/Kilobyte
units: [
{size: 1000000000, suffix: ' GB'},
{size: 1000000, suffix: ' MB'},
{size: 1000, suffix: ' KB'}
]
};
this.defaults = $config;
this.$get = function () {
return function (bytes) {
if (!angular.isNumber(bytes)) {
return '';
}
var unit = true,
i = 0,
prefix,
suffix;
while (unit) {
unit = $config.units[i];
prefix = unit.prefix || '';
suffix = unit.suffix || '';
if (i === $config.units.length - 1 || bytes >= unit.size) {
return prefix + (bytes / unit.size).toFixed(2) + suffix;
}
i += 1;
}
};
};
})
// The FileUploadController initializes the fileupload widget and
// provides scope methods to control the File Upload functionality:
.controller('FileUploadController', [
'$scope', '$element', '$attrs', '$window', 'fileUpload',
function ($scope, $element, $attrs, $window, fileUpload) {
var uploadMethods = {
progress: function () {
return $element.fileupload('progress');
},
active: function () {
return $element.fileupload('active');
},
option: function (option, data) {
return $element.fileupload('option', option, data);
},
add: function (data) {
return $element.fileupload('add', data);
},
send: function (data) {
return $element.fileupload('send', data);
},
process: function (data) {
return $element.fileupload('process', data);
},
processing: function (data) {
return $element.fileupload('processing', data);
}
};
$scope.disabled = !$window.jQuery.support.fileInput;
$scope.queue = $scope.queue || [];
$scope.clear = function (files) {
var queue = this.queue,
i = queue.length,
file = files,
length = 1;
if (angular.isArray(files)) {
file = files[0];
length = files.length;
}
while (i) {
i -= 1;
if (queue[i] === file) {
return queue.splice(i, length);
}
}
};
$scope.replace = function (oldFiles, newFiles) {
var queue = this.queue,
file = oldFiles[0],
i,
j;
for (i = 0; i < queue.length; i += 1) {
if (queue[i] === file) {
for (j = 0; j < newFiles.length; j += 1) {
queue[i + j] = newFiles[j];
}
return;
}
}
};
$scope.applyOnQueue = function (method) {
var list = this.queue.slice(0),
i,
file;
for (i = 0; i < list.length; i += 1) {
file = list[i];
if (file[method]) {
file[method]();
}
}
};
$scope.submit = function () {
this.applyOnQueue('$submit');
};
$scope.cancel = function () {
this.applyOnQueue('$cancel');
};
// Add upload methods to the scope:
angular.extend($scope, uploadMethods);
// The fileupload widget will initialize with
// the options provided via "data-"-parameters,
// as well as those given via options object:
$element.fileupload(angular.extend(
{scope: function () {
return $scope;
}},
fileUpload.defaults
)).on('fileuploadadd', function (e, data) {
data.scope = $scope.option('scope');
}).on('fileuploadfail', function (e, data) {
if (data.errorThrown === 'abort') {
return;
}
if (data.dataType &&
data.dataType.indexOf('json') === data.dataType.length - 4) {
try {
data.result = angular.fromJson(data.jqXHR.responseText);
} catch (ignore) {}
}
}).on([
'fileuploadadd',
'fileuploadsubmit',
'fileuploadsend',
'fileuploaddone',
'fileuploadfail',
'fileuploadalways',
'fileuploadprogress',
'fileuploadprogressall',
'fileuploadstart',
'fileuploadstop',
'fileuploadchange',
'fileuploadpaste',
'fileuploaddrop',
'fileuploaddragover',
'fileuploadchunksend',
'fileuploadchunkdone',
'fileuploadchunkfail',
'fileuploadchunkalways',
'fileuploadprocessstart',
'fileuploadprocess',
'fileuploadprocessdone',
'fileuploadprocessfail',
'fileuploadprocessalways',
'fileuploadprocessstop'
].join(' '), function (e, data) {
if ($scope.$emit(e.type, data).defaultPrevented) {
e.preventDefault();
}
}).on('remove', function () {
// Remove upload methods from the scope,
// when the widget is removed:
var method;
for (method in uploadMethods) {
if (uploadMethods.hasOwnProperty(method)) {
delete $scope[method];
}
}
});
// Observe option changes:
$scope.$watch(
$attrs.fileUpload,
function (newOptions) {
if (newOptions) {
$element.fileupload('option', newOptions);
}
}
);
}
])
// Provide File Upload progress feedback:
.controller('FileUploadProgressController', [
'$scope', '$attrs', '$parse',
function ($scope, $attrs, $parse) {
var fn = $parse($attrs.fileUploadProgress),
update = function () {
var progress = fn($scope);
if (!progress || !progress.total) {
return;
}
$scope.num = Math.floor(
progress.loaded / progress.total * 100
);
};
update();
$scope.$watch(
$attrs.fileUploadProgress + '.loaded',
function (newValue, oldValue) {
if (newValue !== oldValue) {
update();
}
}
);
}
])
// Display File Upload previews:
.controller('FileUploadPreviewController', [
'$scope', '$element', '$attrs',
function ($scope, $element, $attrs) {
$scope.$watch(
$attrs.fileUploadPreview + '.preview',
function (preview) {
if (preview) {
$element.empty().append(preview);
}
}
);
}
])
.directive('fileUpload', function () {
return {
controller: 'FileUploadController',
scope: true
};
})
.directive('fileUploadProgress', function () {
return {
controller: 'FileUploadProgressController',
scope: true
};
})
.directive('fileUploadPreview', function () {
return {
controller: 'FileUploadPreviewController'
};
})
// Enhance the HTML5 download attribute to
// allow drag&drop of files to the desktop:
.directive('download', function () {
return function (scope, elm) {
elm.on('dragstart', function (e) {
try {
e.originalEvent.dataTransfer.setData(
'DownloadURL',
[
'application/octet-stream',
elm.prop('download'),
elm.prop('href')
].join(':')
);
} catch (ignore) {}
});
};
});
}));
OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload-image.js
Vendored
+295
View File
@@ -0,0 +1,295 @@
/*
* jQuery File Upload Image Preview & Resize Plugin 1.6.0
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/
/*jslint nomen: true, unparam: true, regexp: true */
/*global define, window, document, DataView, Blob, Uint8Array */
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define([
'jquery',
'load-image',
'load-image-meta',
'load-image-exif',
'load-image-ios',
'canvas-to-blob',
'./jquery.fileupload-process'
], factory);
} else {
// Browser globals:
factory(
window.jQuery,
window.loadImage
);
}
}(function ($, loadImage) {
'use strict';
// Prepend to the default processQueue:
$.blueimp.fileupload.prototype.options.processQueue.unshift(
{
action: 'loadImageMetaData',
disableImageHead: '@',
disableExif: '@',
disableExifThumbnail: '@',
disableExifSub: '@',
disableExifGps: '@',
disabled: '@disableImageMetaDataLoad'
},
{
action: 'loadImage',
// Use the action as prefix for the "@" options:
prefix: true,
fileTypes: '@',
maxFileSize: '@',
noRevoke: '@',
disabled: '@disableImageLoad'
},
{
action: 'resizeImage',
// Use "image" as prefix for the "@" options:
prefix: 'image',
maxWidth: '@',
maxHeight: '@',
minWidth: '@',
minHeight: '@',
crop: '@',
orientation: '@',
forceResize: '@',
disabled: '@disableImageResize'
},
{
action: 'saveImage',
quality: '@imageQuality',
type: '@imageType',
disabled: '@disableImageResize'
},
{
action: 'saveImageMetaData',
disabled: '@disableImageMetaDataSave'
},
{
action: 'resizeImage',
// Use "preview" as prefix for the "@" options:
prefix: 'preview',
maxWidth: '@',
maxHeight: '@',
minWidth: '@',
minHeight: '@',
crop: '@',
orientation: '@',
thumbnail: '@',
canvas: '@',
disabled: '@disableImagePreview'
},
{
action: 'setImage',
name: '@imagePreviewName',
disabled: '@disableImagePreview'
}
);
// The File Upload Resize plugin extends the fileupload widget
// with image resize functionality:
$.widget('blueimp.fileupload', $.blueimp.fileupload, {
options: {
// The regular expression for the types of images to load:
// matched against the file type:
loadImageFileTypes: /^image\/(gif|jpeg|png)$/,
// The maximum file size of images to load:
loadImageMaxFileSize: 10000000, // 10MB
// The maximum width of resized images:
imageMaxWidth: 1920,
// The maximum height of resized images:
imageMaxHeight: 1080,
// Defines the image orientation (1-8) or takes the orientation
// value from Exif data if set to true:
imageOrientation: false,
// Define if resized images should be cropped or only scaled:
imageCrop: false,
// Disable the resize image functionality by default:
disableImageResize: true,
// The maximum width of the preview images:
previewMaxWidth: 80,
// The maximum height of the preview images:
previewMaxHeight: 80,
// Defines the preview orientation (1-8) or takes the orientation
// value from Exif data if set to true:
previewOrientation: true,
// Create the preview using the Exif data thumbnail:
previewThumbnail: true,
// Define if preview images should be cropped or only scaled:
previewCrop: false,
// Define if preview images should be resized as canvas elements:
previewCanvas: true
},
processActions: {
// Loads the image given via data.files and data.index
// as img element, if the browser supports the File API.
// Accepts the options fileTypes (regular expression)
// and maxFileSize (integer) to limit the files to load:
loadImage: function (data, options) {
if (options.disabled) {
return data;
}
var that = this,
file = data.files[data.index],
dfd = $.Deferred();
if (($.type(options.maxFileSize) === 'number' &&
file.size > options.maxFileSize) ||
(options.fileTypes &&
!options.fileTypes.test(file.type)) ||
!loadImage(
file,
function (img) {
if (img.src) {
data.img = img;
}
dfd.resolveWith(that, [data]);
},
options
)) {
return data;
}
return dfd.promise();
},
// Resizes the image given as data.canvas or data.img
// and updates data.canvas or data.img with the resized image.
// Also stores the resized image as preview property.
// Accepts the options maxWidth, maxHeight, minWidth,
// minHeight, canvas and crop:
resizeImage: function (data, options) {
if (options.disabled || !(data.canvas || data.img)) {
return data;
}
options = $.extend({canvas: true}, options);
var that = this,
dfd = $.Deferred(),
img = (options.canvas && data.canvas) || data.img,
resolve = function (newImg) {
if (newImg && (newImg.width !== img.width ||
newImg.height !== img.height ||
options.forceResize)) {
data[newImg.getContext ? 'canvas' : 'img'] = newImg;
}
data.preview = newImg;
dfd.resolveWith(that, [data]);
},
thumbnail;
if (data.exif) {
if (options.orientation === true) {
options.orientation = data.exif.get('Orientation');
}
if (options.thumbnail) {
thumbnail = data.exif.get('Thumbnail');
if (thumbnail) {
loadImage(thumbnail, resolve, options);
return dfd.promise();
}
}
}
if (img) {
resolve(loadImage.scale(img, options));
return dfd.promise();
}
return data;
},
// Saves the processed image given as data.canvas
// inplace at data.index of data.files:
saveImage: function (data, options) {
if (!data.canvas || options.disabled) {
return data;
}
var that = this,
file = data.files[data.index],
dfd = $.Deferred();
if (data.canvas.toBlob) {
data.canvas.toBlob(
function (blob) {
if (!blob.name) {
if (file.type === blob.type) {
blob.name = file.name;
} else if (file.name) {
blob.name = file.name.replace(
/\..+$/,
'.' + blob.type.substr(6)
);
}
}
// Don't restore invalid meta data:
if (file.type !== blob.type) {
delete data.imageHead;
}
// Store the created blob at the position
// of the original file in the files list:
data.files[data.index] = blob;
dfd.resolveWith(that, [data]);
},
options.type || file.type,
options.quality
);
} else {
return data;
}
return dfd.promise();
},
loadImageMetaData: function (data, options) {
if (options.disabled) {
return data;
}
var that = this,
dfd = $.Deferred();
loadImage.parseMetaData(data.files[data.index], function (result) {
$.extend(data, result);
dfd.resolveWith(that, [data]);
}, options);
return dfd.promise();
},
saveImageMetaData: function (data, options) {
if (!(data.imageHead && data.canvas &&
data.canvas.toBlob && !options.disabled)) {
return data;
}
var file = data.files[data.index],
blob = new Blob([
data.imageHead,
// Resized images always have a head size of 20 bytes,
// including the JPEG marker and a minimal JFIF header:
this._blobSlice.call(file, 20)
], {type: file.type});
blob.name = file.name;
data.files[data.index] = blob;
return data;
},
// Sets the resized version of the image as a property of the
// file object, must be called after "saveImage":
setImage: function (data, options) {
if (data.preview && !options.disabled) {
data.files[data.index][options.name || 'preview'] = data.preview;
}
return data;
}
}
});
}));
OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload-process.js
Vendored
+172
View File
@@ -0,0 +1,172 @@
/*
* jQuery File Upload Processing Plugin 1.3.0
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2012, Sebastian Tschan
* https://blueimp.net
*
* Licensed under the MIT license:
* http://www.opensource.org/licenses/MIT
*/
/*jslint nomen: true, unparam: true */
/*global define, window */
(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define([
'jquery',
'./jquery.fileupload'
], factory);
} else {
// Browser globals:
factory(
window.jQuery
);
}
}(function ($) {
'use strict';
var originalAdd = $.blueimp.fileupload.prototype.options.add;
// The File Upload Processing plugin extends the fileupload widget
// with file processing functionality:
$.widget('blueimp.fileupload', $.blueimp.fileupload, {
options: {
// The list of processing actions:
processQueue: [
/*
{
action: 'log',
type: 'debug'
}
*/
],
add: function (e, data) {
var $this = $(this);
data.process(function () {
return $this.fileupload('process', data);
});
originalAdd.call(this, e, data);
}
},
processActions: {
/*
log: function (data, options) {
console[options.type](
'Processing "' + data.files[data.index].name + '"'
);
}
*/
},
_processFile: function (data, originalData) {
var that = this,
dfd = $.Deferred().resolveWith(that, [data]),
chain = dfd.promise();
this._trigger('process', null, data);
$.each(data.processQueue, function (i, settings) {
var func = function (data) {
if (originalData.errorThrown) {
return $.Deferred()
.rejectWith(that, [originalData]).promise();
}
return that.processActions[settings.action].call(
that,
data,
settings
);
};
chain = chain.pipe(func, settings.always && func);
});
chain
.done(function () {
that._trigger('processdone', null, data);
that._trigger('processalways', null, data);
})
.fail(function () {
that._trigger('processfail', null, data);
that._trigger('processalways', null, data);
});
return chain;
},
// Replaces the settings of each processQueue item that
// are strings starting with an "@", using the remaining
// substring as key for the option map,
// e.g. "@autoUpload" is replaced with options.autoUpload:
_transformProcessQueue: function (options) {
var processQueue = [];
$.each(options.processQueue, function () {
var settings = {},
action = this.action,
prefix = this.prefix === true ? action : this.prefix;
$.each(this, function (key, value) {
if ($.type(value) === 'string' &&
value.charAt(0) === '@') {
settings[key] = options[
value.slice(1) || (prefix ? prefix +
key.charAt(0).toUpperCase() + key.slice(1) : key)
];
} else {
settings[key] = value;
}
});
processQueue.push(settings);
});
options.processQueue = processQueue;
},
// Returns the number of files currently in the processsing queue:
processing: function () {
return this._processing;
},
// Processes the files given as files property of the data parameter,
// returns a Promise object that allows to bind callbacks:
process: function (data) {
var that = this,
options = $.extend({}, this.options, data);
if (options.processQueue && options.processQueue.length) {
this._transformProcessQueue(options);
if (this._processing === 0) {
this._trigger('processstart');
}
$.each(data.files, function (index) {
var opts = index ? $.extend({}, options) : options,
func = function () {
if (data.errorThrown) {
return $.Deferred()
.rejectWith(that, [data]).promise();
}
return that._processFile(opts, data);
};
opts.index = index;
that._processing += 1;
that._processingQueue = that._processingQueue.pipe(func, func)
.always(function () {
that._processing -= 1;
if (that._processing === 0) {
that._trigger('processstop');
}
});
});
}
return this._processingQueue;
},
_create: function () {
this._super();
this._processing = 0;
this._processingQueue = $.Deferred().resolveWith(this)
.promise();
}
});
}));
OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload.js
Vendored
+1417
View File
File diff suppressed because it is too large Load Diff
OurUmbraco.Site/umbraco/lib/jquery-ui/jquery-ui-1.10.4.custom.min.css
Vendored
+7
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/umbraco/lib/jquery-ui/jquery-ui.min.js
Vendored
+12
View File
File diff suppressed because one or more lines are too long

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