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

Upgrade to 7.3.0 final

Browse Source
This commit is contained in:
Sebastiaan Janssen
2015-09-29 19:20:08 +02:00
parent 842cdd8532
commit d074e19b2b
67 changed files with 557 additions and 11335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Notification/Notification.csproj
+36 -36
View File
@@ -49,8 +49,8 @@
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="businesslogic, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5750.18160, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
@@ -61,12 +61,12 @@
<HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="cms, Version=1.0.5711.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5750.18161, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
@@ -85,20 +85,20 @@
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.2.7.0\lib\net45\ImageProcessor.dll</HintPath>
<Reference Include="ImageProcessor, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.3.0.0\lib\net45\ImageProcessor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor.Web, Version=4.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.3.5.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Reference Include="ImageProcessor.Web, Version=4.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.4.0.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="interfaces, Version=1.0.5711.25000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5750.18155, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
@@ -106,7 +106,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -165,8 +165,8 @@
<HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5711.25011, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5750.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\SQLCE4Umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -176,11 +176,11 @@
</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.3.0-RC\lib\System.Data.SqlServerCe.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http" />
@@ -232,43 +232,43 @@
</Reference>
<Reference Include="System.Xml" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.5711.25016, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5750.18164, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5711.25005, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5750.18157, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5750.18159, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5711.25019, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5750.18167, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Notification/packages.config
+3 -3
View File
@@ -6,8 +6,8 @@
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net451" />
<package id="Examine" version="0.1.68.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net451" />
<package id="ImageProcessor" version="2.2.7.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.3.5.0" targetFramework="net451" />
<package id="ImageProcessor" version="2.3.0.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.4.0.0" targetFramework="net451" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net451" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net451" />
@@ -37,6 +37,6 @@
<package id="Owin" version="1.0" targetFramework="net451" />
<package id="semver" version="1.1.2" targetFramework="net451" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0-RC" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
</packages>
NotificationsWeb/NotificationsWeb.csproj
+36 -36
View File
@@ -49,8 +49,8 @@
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="businesslogic, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5750.18160, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
@@ -61,12 +61,12 @@
<HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="cms, Version=1.0.5711.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5750.18161, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
@@ -85,20 +85,20 @@
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.2.7.0\lib\net45\ImageProcessor.dll</HintPath>
<Reference Include="ImageProcessor, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.3.0.0\lib\net45\ImageProcessor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor.Web, Version=4.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.3.5.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Reference Include="ImageProcessor.Web, Version=4.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.4.0.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="interfaces, Version=1.0.5711.25000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5750.18155, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
@@ -106,7 +106,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -165,19 +165,19 @@
<HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5711.25011, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5750.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\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.3.0-RC\lib\System.Data.SqlServerCe.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http" />
@@ -239,43 +239,43 @@
<Reference Include="System.Web.Mobile" />
<Reference Include="System.Xml.Linq" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.5711.25016, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5750.18164, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5711.25005, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5750.18157, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5750.18159, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5711.25019, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5750.18167, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
NotificationsWeb/packages.config
+3 -3
View File
@@ -6,8 +6,8 @@
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net451" />
<package id="Examine" version="0.1.68.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net451" />
<package id="ImageProcessor" version="2.2.7.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.3.5.0" targetFramework="net451" />
<package id="ImageProcessor" version="2.3.0.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.4.0.0" targetFramework="net451" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net451" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net451" />
@@ -37,6 +37,6 @@
<package id="Owin" version="1.0" targetFramework="net451" />
<package id="semver" version="1.1.2" targetFramework="net451" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0-RC" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
</packages>
OurUmbraco.Site/OurUmbraco.Site.csproj
+36 -36
View File
@@ -52,8 +52,8 @@
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="businesslogic, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5750.18160, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
@@ -64,12 +64,12 @@
<HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="cms, Version=1.0.5711.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5750.18161, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
@@ -92,20 +92,20 @@
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.2.7.0\lib\net45\ImageProcessor.dll</HintPath>
<Reference Include="ImageProcessor, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.3.0.0\lib\net45\ImageProcessor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor.Web, Version=4.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.3.5.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Reference Include="ImageProcessor.Web, Version=4.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.4.0.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="InfoCaster.Umbraco.UrlTracker, Version=3.8.5620.26854, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UrlTracker.3.8\lib\InfoCaster.Umbraco.UrlTracker.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="interfaces, Version=1.0.5711.25000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5750.18155, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="JsonFx, Version=2.0.1209.2802, Culture=neutral, PublicKeyToken=315052dd637f8a52, processorArchitecture=MSIL">
@@ -113,7 +113,7 @@
<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">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
@@ -124,7 +124,7 @@
<HintPath>..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -188,17 +188,17 @@
<HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5711.25011, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5750.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\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.3.0-RC\lib\System.Data.SqlServerCe.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http" />
@@ -262,43 +262,43 @@
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Xml.Linq" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.5711.25016, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5750.18164, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5711.25005, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5750.18157, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5750.18159, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5711.25019, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5750.18167, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml
+1 -1
View File
@@ -14,7 +14,7 @@
}
}
<img src="@url" alt="@Model.value.caption">
<img src="@url" alt="@Model.value.altText">
if (Model.value.caption != null)
{
OurUmbraco.Site/Views/Web.config
+5 -6
View File
@@ -1,18 +1,17 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
</sectionGroup>
</sectionGroup>
</configSections>
<system.web.webPages.razor>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces>
<namespaces>
<add namespace="System.Web.Mvc" />
<add namespace="System.Web.Mvc.Ajax" />
<add namespace="System.Web.Mvc.Html" />
@@ -23,7 +22,7 @@
<add namespace="Umbraco.Web.Mvc" />
<add namespace="umbraco" />
<add namespace="Examine" />
<add namespace="Microsoft.Web.Helpers" />
</namespaces>
</pages>
</system.web.webPages.razor>
OurUmbraco.Site/config/ClientDependency.config
+1 -1
View File
@@ -10,7 +10,7 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files
-->
<clientDependency version="1391026252" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<clientDependency version="1562814933" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<!--
This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
OurUmbraco.Site/css/Deli.css
+1 -1200
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/Mobile.css
+1 -1111
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/MobileCustom.css
+1 -194
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/Releases-bak.css
+1 -186
View File
@@ -1,186 +1 @@
.panel-wrapper{
overflow:hidden;
}
.panel-left{
float:left;
width:600px;
}
.panel-right{
float:right;
width:300px;
padding:10px 0 30px 40px;
}
.progressbar {
position: relative;
border: solid 1px #aeaeae;
background-color: #fff;
padding: 5px;
height: 30px;
margin:5px 0;
-ms-border-raidus:5px;
-moz-border-raidus:5px;
-o-border-raidus:5px;
-webkit-border-raidus:5px;
border-radius:5px;
}
.bar
{
float: left;
height: 30px;
}
.rl
{
/*
-ms-border-raidus:5px;
-moz-border-raidus:5px;
-o-border-raidus:5px;
*/
-webkit-border-top-left-radius:5px;
-webkit-border-bottom-left-radius:5px;
border-top-left-radius:5px;
border-bottom-left-radius:5px;
}
.rr
{
/*
-ms-border-raidus:5px;
-moz-border-raidus:5px;
-o-border-raidus:5px;
*/
-webkit-border-top-right-radius:5px;
-webkit-border-bottom-right-radius:5px;
border-top-right-radius:5px;
border-bottom-right-radius:5px;
}
.progressbar-small{
height:10px;
padding: 2px;
-ms-border-raidus:3px;
-moz-border-raidus:3px;
-o-border-raidus:3px;
-webkit-border-raidus:3px;
border-radius:3px;}
.progressbar-small .bar{ height:10px;}
.progressbar-small .rl
{
/*
-ms-border-raidus:3px;
-moz-border-raidus:3px;
-o-border-raidus:3px;
*/
-webkit-border-top-left-radius:3px;
-webkit-border-bottom-left-radius:3px;
border-top-left-radius:3px;
border-bottom-left-radius:3px;
}
.progressbar-small .rr
{
/*
-ms-border-raidus:3px;
-moz-border-raidus:3px;
-o-border-raidus:3px;
*/
-webkit-border-top-right-radius:3px;
-webkit-border-bottom-right-radius:3px;
border-top-right-radius:3px;
border-bottom-right-radius:3px;
}
.bar1 { background-color: #72BD51; }
.bar2 { background-color: #f36f21; }
.status ul{
list-style:none;
padding:0;
}
.status li{
padding:3px 5px;
}
.status li{
padding-left:20px;
}
.Fixed{background: url(img/ico/tick.png) no-repeat 0px 3px;}
.InProgress{background: url(img/ico/clock_select_remain.png) no-repeat 0px 3px;}
.Open{background: none;}
.Fixed a{
color:#333;
}
.Open a{
color:#999;
}
.InProgress a{
color:#72BD51;
}
.rfcTopic{
padding:5px 5px 5px 50px;
background: no-repeat 5px 15px url(forum/forum.gif);
border-bottom: #efefef 1px solid;
}
.solved{background-image: url(forum/solved.gif);}
.rfcOptions{padding:10px 5px;}
.addRfc{background-image: url(forum/comment_add.png) !important;}
.releaseListing{ margin-bottom:25px;}
.releaseListing .version{
padding:7px 5px 7px 55px;
-moz-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px;
min-height: 35px;
}
.future .version{
background: no-repeat 10px 10px url(img/box_planning.png);
border-bottom: #efefef 1px solid;
}
.released .version{
background: no-repeat 10px 10px url(img/box_released.png) #efefef;
}
.plannedreleases .version{
background: no-repeat 10px 10px url(img/box_released.png);
}
.inprogress .version{
background: no-repeat 10px 10px url(img/box_open.png);
}
.beta .version{
background: no-repeat 10px 10px url(img/box_closed.png);
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
.panel-wrapper{ overflow:hidden;}.panel-left{ float:left; width:600px;}.panel-right{ float:right; width:300px; padding:10px 0 30px 40px; }.progressbar { position: relative; border: solid 1px #aeaeae; background-color: #fff; padding: 5px; height: 30px; margin:5px 0; -ms-border-raidus:5px; -moz-border-raidus:5px; -o-border-raidus:5px; -webkit-border-raidus:5px; border-radius:5px;}.bar { float: left; height: 30px;}.rl{ /* -ms-border-raidus:5px; -moz-border-raidus:5px; -o-border-raidus:5px; */ -webkit-border-top-left-radius:5px; -webkit-border-bottom-left-radius:5px; border-top-left-radius:5px; border-bottom-left-radius:5px;}.rr{ /* -ms-border-raidus:5px; -moz-border-raidus:5px; -o-border-raidus:5px; */ -webkit-border-top-right-radius:5px; -webkit-border-bottom-right-radius:5px; border-top-right-radius:5px; border-bottom-right-radius:5px;}.progressbar-small{ height:10px; padding: 2px; -ms-border-raidus:3px; -moz-border-raidus:3px; -o-border-raidus:3px; -webkit-border-raidus:3px; border-radius:3px;}.progressbar-small .bar{ height:10px;}.progressbar-small .rl{ /* -ms-border-raidus:3px; -moz-border-raidus:3px; -o-border-raidus:3px; */ -webkit-border-top-left-radius:3px; -webkit-border-bottom-left-radius:3px; border-top-left-radius:3px; border-bottom-left-radius:3px;}.progressbar-small .rr{ /* -ms-border-raidus:3px; -moz-border-raidus:3px; -o-border-raidus:3px; */ -webkit-border-top-right-radius:3px; -webkit-border-bottom-right-radius:3px; border-top-right-radius:3px; border-bottom-right-radius:3px;}.bar1 { background-color: #72BD51; }.bar2 { background-color: #f36f21; }.status ul{ list-style:none; padding:0;}.status li{ padding:3px 5px;}.status li{ padding-left:20px;}.Fixed{background: url(img/ico/tick.png) no-repeat 0px 3px;}.InProgress{background: url(img/ico/clock_select_remain.png) no-repeat 0px 3px;}.Open{background: none;}.Fixed a{ color:#333; }.Open a{ color:#999; }.InProgress a{ color:#72BD51;}.rfcTopic{ padding:5px 5px 5px 50px; background: no-repeat 5px 15px url(forum/forum.gif); border-bottom: #efefef 1px solid;}.solved{background-image: url(forum/solved.gif);}.rfcOptions{padding:10px 5px;} .addRfc{background-image: url(forum/comment_add.png) !important;}.releaseListing{ margin-bottom:25px;}.releaseListing .version{ padding:7px 5px 7px 55px; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; min-height: 35px;}.future .version{ background: no-repeat 10px 10px url(img/box_planning.png); border-bottom: #efefef 1px solid;}.released .version{ background: no-repeat 10px 10px url(img/box_released.png) #efefef;}.plannedreleases .version{ background: no-repeat 10px 10px url(img/box_released.png);}.inprogress .version{ background: no-repeat 10px 10px url(img/box_open.png);}.beta .version{ background: no-repeat 10px 10px url(img/box_closed.png);}
OurUmbraco.Site/css/Releases.css
+1 -333
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/Style.css
+1 -15
View File
@@ -1,15 +1 @@
/* GENERAL STYLES */
html, body{
padding: 0px;
margin: 0px;
border: none;
}
body {
background: #fff;
font-family: Arial, Helvetica, sans-serif; color: #333;
font-size: 12px;
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
/* GENERAL STYLES */html, body{ padding: 0px; margin: 0px; border: none;}body { background: #fff; font-family: Arial, Helvetica, sans-serif; color: #333; font-size: 12px;}
OurUmbraco.Site/css/community.css
+1 -785
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/custom.css
+1 -522
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/docs.css
+1 -305
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/documentation.css
+1
View File
@@ -0,0 +1 @@

OurUmbraco.Site/css/editor.css
+1
View File
@@ -0,0 +1 @@
body {font-size: 14px;font-family: Arial, Helvetica, sans-serif; color: #333; }
OurUmbraco.Site/css/events.css
+1 -32
View File
@@ -1,32 +1 @@
.eventInfo *{font-size: 11px}
.eventInfo strong a{font-size: 12px}
.eventInfo ul{margin: 0px; padding-left: 0px;}
.eventInfo li{padding-left: 5px; margin-left: 0px;}
a.signUpButton{margin: auto; margin-top: 5px; margin-bottom: 5px; text-align: center; text-decoration: none; display: block; padding: 5px; width: 120px; color: #fff; font-size: 12px; background: #8ECA56; border: 1px solid #6AAE30; }
a.eventcancel{background: #AE3035 !Important; border-color: #6F1B1F }
a.eventwaiting{background: #EFB34A !Important; border-color: #DF8D00;}
ul.avatarList{list-style: none; margin: 0px; padding: 0px;}
ul.avatarList li{padding: 0px; margin: 0px;}
ul.avatarList li a{margin: 0px 0px 10px 10px; display: block; width: 48px; height: 48px; overflow: hidden; border: 1px solid #999; text-decoration: none; float: left;}
ul.avatarList li img{border: none; width: 48px; height: 48px;}
.datepicker{font-size: 1em}
.datepicker input{font-size: 1.5em; margin:0.5em 0;border:1px solid #bbb;}
.datepicker input.hour{width: 30px;}
.datepicker input.minute{width: 30px;}
table.list{padding-left: 10px; font-size: 11px;}
table.list thead td{border-bottom: 1px solid #ccc;}
table.list td{padding: 3px;}
/* css for timepicker */
.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }
.ui-timepicker-div dl{ text-align: left; }
.ui-timepicker-div dl dt{ height: 25px; }
.ui-timepicker-div dl dd{ margin: -25px 20px 10px 65px; height:0.5em !important; }
.ui-timepicker-div td { font-size: 90%; }
#ui-datepicker-div {clip:auto;}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
.eventInfo *{font-size: 11px}.eventInfo strong a{font-size: 12px}.eventInfo ul{margin: 0px; padding-left: 0px;}.eventInfo li{padding-left: 5px; margin-left: 0px;}a.signUpButton{margin: auto; margin-top: 5px; margin-bottom: 5px; text-align: center; text-decoration: none; display: block; padding: 5px; width: 120px; color: #fff; font-size: 12px; background: #8ECA56; border: 1px solid #6AAE30; }a.eventcancel{background: #AE3035 !Important; border-color: #6F1B1F }a.eventwaiting{background: #EFB34A !Important; border-color: #DF8D00;}ul.avatarList{list-style: none; margin: 0px; padding: 0px;}ul.avatarList li{padding: 0px; margin: 0px;}ul.avatarList li a{margin: 0px 0px 10px 10px; display: block; width: 48px; height: 48px; overflow: hidden; border: 1px solid #999; text-decoration: none; float: left;}ul.avatarList li img{border: none; width: 48px; height: 48px;}.datepicker{font-size: 1em}.datepicker input{font-size: 1.5em; margin:0.5em 0;border:1px solid #bbb;}.datepicker input.hour{width: 30px;}.datepicker input.minute{width: 30px;}table.list{padding-left: 10px; font-size: 11px;}table.list thead td{border-bottom: 1px solid #ccc;}table.list td{padding: 3px;}/* css for timepicker */.ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; }.ui-timepicker-div dl{ text-align: left; }.ui-timepicker-div dl dt{ height: 25px; }.ui-timepicker-div dl dd{ margin: -25px 20px 10px 65px; height:0.5em !important; }.ui-timepicker-div td { font-size: 90%; }#ui-datepicker-div {clip:auto;}
OurUmbraco.Site/css/fonts.css
+1 -208
View File
@@ -1,208 +1 @@
/*FONTS */
body{font-family: Arial, Helvetica, sans-serif; font-size: 13px;}
h1, h2, h3, h4, h5, p{font-family: Arial, Helvetica, sans-serif; color: #333;}
a{color: #1A6AB3;}
p{font-size: 13px; margin-top: 7px; margin-bottom: 15px; color: #333; line-height: 18px}
small{font-size: 11px; color: #5b5b5b;}
em{color: #332e2e;}
h1{font-size: 28px; font-weight: bold; margin-bottom: 7px;}
h2{font-size: 18px; font-weight: bold; margin-top: 0px; margin-bottom: 3px;}
h3{font-size: 14px; font-weight: bold;}
h4{font-size: 12px; font-weight: bold; }
h5{font-size: 11px; font-weight: bold; }
/*
code, pre {
background-color:#F2F2F2;
border:1px solid #E3E3E3;
border-left: 4px solid #e3e3e3;
display:block !Important;
font-family:monospace;
font-size:12px;
line-height:1.4em;
margin:0 6em 1em 1em;
padding: 0.5em;
max-width: 650px;
overflow: auto;
}
code pre{padding: 0px; border: none}
#documentation code{display: inline !Important;}
*/
code, pre {
padding: 0 3px 2px;
font-family: Menlo, Monaco, "Courier New", monospace;
font-size: 12px;
color: #333333;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
code {
padding: 3px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}
pre {
display: block;
padding: 8.5px;
margin: 0 0 9px;
font-size: 12px;
line-height: 18px;
background-color: #f5f5f5;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
}
pre.prettyprint {
margin-bottom: 18px;
}
pre code {
padding: 0;
color: inherit;
background-color: transparent;
border: 0;
}
.pre-scrollable {
max-height: 340px;
overflow-y: scroll;
}
#toc{float: right; margin-top: 40px; width: 250px; border: 1px solid #efefef; background: #fff; padding: 5px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;}
#toc ul{
padding: 0px;
list-style: none; margin: 0px !Important; padding-top: 5px; display: none;}
#toc ul li{list-style: none; margin: 0px; padding: 3px;}
#toc a{color: #666; font-size: 11px; margin-top; 0px !Important; margin-bottm: 0px !Important;
padding: 0px; text-weight: normal}
#toc li{margin-left: 0px;}
#toc li.H2{margin-left: 10px;}
#toc li.H3{margin-left: 20px;}
#toc li.H4{margin-left: 30px;}
#toc li.H5{margin-left: 40px;}
#toc a.toggle{display: block; color }
a.act{padding: 2px; padding-left: 20px; color: #252525; background: no-repeat center left;}
a.topics{background-image: url(img/ico/balloons.png);}
a.yourtopics{background-image: url(img/ico/balloon-smiley.png);}
a.edit{background-image: url(img/ico/pencil-small.png);}
a.delete{background-image: url(img/ico/cross-small.png);}
a.move{background-image: url(img/ico/document-tree.png);}
a.subscribe{background-image: url(img/ico/mail--plus.png);}
a.UnSubscribeTopic, a.UnSubscribeForum{background-image: url(img/ico/mail--delete.png);}
a.upload{background-image: url(img/ico/document--plus.png);}
#options a.history{background-image: url(img/ico/clock-history.png);}
a.blockMember { background-image: url(img/ico/minus-small-circle.png); }
a.unblockMember { background-image: url(img/ico/tick-small.png); }
a.deleteMember { background-image: url(img/ico/cross-small.png); }
a.markSpam { background-image: url(img/ico/minus-small-circle.png); }
a.markHam { background-image: url(img/ico/balloon-smiley.png); }
.options{padding: 3px !Important;}
a.add{background: #8ECA56 2px 2px url(img/ico/plus-button.png) no-repeat; padding: 3px 3px 3px 25px;
border: 1px solid #618A3B; color: #fff; text-decoration: none; margin-top: 2px;
-webkit-border-radius: 3px; /* Safari prototype */
-moz-border-radius: 3px; /* Gecko browsers */
border-radius: 3px; /* Everything else - limited support at the moment */
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
/*FONTS */body{font-family: Arial, Helvetica, sans-serif; font-size: 13px;}h1, h2, h3, h4, h5, p{font-family: Arial, Helvetica, sans-serif; color: #333;}a{color: #1A6AB3;}p{font-size: 13px; margin-top: 7px; margin-bottom: 15px; color: #333; line-height: 18px}small{font-size: 11px; color: #5b5b5b;}em{color: #332e2e;}h1{font-size: 28px; font-weight: bold; margin-bottom: 7px;}h2{font-size: 18px; font-weight: bold; margin-top: 0px; margin-bottom: 3px;}h3{font-size: 14px; font-weight: bold;}h4{font-size: 12px; font-weight: bold; }h5{font-size: 11px; font-weight: bold; }/*code, pre {background-color:#F2F2F2;border:1px solid #E3E3E3;border-left: 4px solid #e3e3e3;display:block !Important;font-family:monospace;font-size:12px;line-height:1.4em;margin:0 6em 1em 1em;padding: 0.5em;max-width: 650px;overflow: auto;}code pre{padding: 0px; border: none}#documentation code{display: inline !Important;}*/code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px;}code { padding: 3px 4px; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8;}pre { display: block; padding: 8.5px; margin: 0 0 9px; font-size: 12px; line-height: 18px; background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; white-space: pre; white-space: pre-wrap; word-break: break-all; word-wrap: break-word;}pre.prettyprint { margin-bottom: 18px;}pre code { padding: 0; color: inherit; background-color: transparent; border: 0;}.pre-scrollable { max-height: 340px; overflow-y: scroll;}#toc{float: right; margin-top: 40px; width: 250px; border: 1px solid #efefef; background: #fff; padding: 5px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px;}#toc ul{ padding: 0px; list-style: none; margin: 0px !Important; padding-top: 5px; display: none;}#toc ul li{list-style: none; margin: 0px; padding: 3px;}#toc a{color: #666; font-size: 11px; margin-top; 0px !Important; margin-bottm: 0px !Important; padding: 0px; text-weight: normal}#toc li{margin-left: 0px;}#toc li.H2{margin-left: 10px;}#toc li.H3{margin-left: 20px;}#toc li.H4{margin-left: 30px;}#toc li.H5{margin-left: 40px;}#toc a.toggle{display: block; color }a.act{padding: 2px; padding-left: 20px; color: #252525; background: no-repeat center left;}a.topics{background-image: url(img/ico/balloons.png);}a.yourtopics{background-image: url(img/ico/balloon-smiley.png);}a.edit{background-image: url(img/ico/pencil-small.png);}a.delete{background-image: url(img/ico/cross-small.png);}a.move{background-image: url(img/ico/document-tree.png);}a.subscribe{background-image: url(img/ico/mail--plus.png);}a.UnSubscribeTopic, a.UnSubscribeForum{background-image: url(img/ico/mail--delete.png);}a.upload{background-image: url(img/ico/document--plus.png);}#options a.history{background-image: url(img/ico/clock-history.png);}a.blockMember { background-image: url(img/ico/minus-small-circle.png); }a.unblockMember { background-image: url(img/ico/tick-small.png); }a.deleteMember { background-image: url(img/ico/cross-small.png); }a.markSpam { background-image: url(img/ico/minus-small-circle.png); }a.markHam { background-image: url(img/ico/balloon-smiley.png); }.options{padding: 3px !Important;}a.add{background: #8ECA56 2px 2px url(img/ico/plus-button.png) no-repeat; padding: 3px 3px 3px 25px;border: 1px solid #618A3B; color: #fff; text-decoration: none; margin-top: 2px; -webkit-border-radius: 3px; /* Safari prototype */ -moz-border-radius: 3px; /* Gecko browsers */ border-radius: 3px; /* Everything else - limited support at the moment */}
OurUmbraco.Site/css/forum.css
+1 -157
View File
@@ -1,157 +1 @@
/* Forum */
#forum table.forumList{ width: 100%; border: none; margin-bottom: 15px;}
#forum table.forumList thead{background: #fff; color: #46484B; padding: 5px;}
#forum table.forumList thead th{padding: 3px; border-bottom: #efefef 1px solid; font-size: 90%;
text-align: left; }
#forum table.forumList tbody{background: #fff; font-size: 12px;}
#forum table.forumList tbody th{font-weight: normal; border-bottom: #efefef 1px solid;
padding: 15px; text-align: left; padding-left: 60px }
#forum table.forumList tbody td{border-bottom: #efefef 1px solid;
background: #fff; width: 200px; padding: 15px; font-size: 11px; text-align: right;}
#forum table.forumList tbody td a{color: #999; text-decoration: none; font-size: 10px; display: block; }
#forum table.forumList td.replies, #forum table.forumList td.votes{
width: 40px; text-align: center; background: #F3F3F3; font-size: 20px; font-weight: bold;
color: #999; }
#forum table.forumList td.voted{color: green;}
#forum table.forumList td.replies small, #forum table.forumList td.votes small{display: block; padding: 2px; color: #999 !Important;}
#forum table.forumList th a{color: #000; font-size: 14px; font-weight: bold; text-decoration: none;}
#forum table.forumList th a:hover{text-decoration: underline;}
#forum table.forumList .forumName{color: #252525; font-size: 110%;}
#forum table.forumList .forumStats{font-weight: bold;}
#forum table.forumList .forumDesc{font-weight: normal; color: #333}
#forum table.forumList .forumLastPost{}
#forum table.forumList th.title a{display: block;}
#forum table.forumList tr th{background: no-repeat 15px 20px url(forum/forum.gif);}
#forum table.forumList tr.solved th{background-image: url(forum/solved.gif);}
/* Options */
#forum #options{display: block; height: 20px; padding: 5px; border-top: #efefef 1px solid; margin: 10px 0 0px 0;}
#forum #options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 20px;}
#forum #options ul li{float: left; padding-right: 15px; margin: 0px;}
#forum #options ul li a{font-size: 11px; margin: 0px;}
#forum #options ul li.right{float: right}
/* NEW */
#forum ul.commentsList{list-style: none; margin: 0; padding: 0}
#forum ul.commentsList li{display: block; margin: 0px 0px 35px 0px;}
#forum ul.commentsList li .author{display: block; float: left; width: 56px; margin-right: 20px;}
#forum ul.commentsList li .comment{float: left; display: block; width: 820px;}
#forum ul.commentsList li .voting{float: right; display: block; width: 50px;}
#forum ul.commentsList li.replies{border-bottom: #999 1px solid; margin: 10px 0px 25px 0px;}
/*badge */
#forum ul.commentsList li .author{text-align: center;}
#forum ul.commentsList li .author a.badge{margin: auto; margin-top: 10px;}
/* comment */
#forum ul.commentsList li .comment .meta{font-size: 11px;}
#forum ul.commentsList li .comment .meta h2{font-size: 24px;}
#forum ul.commentsList li .comment .postedAt{padding-bottom: 5px; border-bottom: 1px solid #efefef}
#forum ul.commentsList li .comment .options ul{margin: 0; padding: 3px 0px 15px 0px; height: 15px !important; list-style; none; font-size: 11px;}
#forum ul.commentsList li .comment .options ul li{display: inline; padding-right: 15px; font-size: 11px; float: left; margin: 0px}
#forum ul.commentsList li .comment .body{font-size: 12px;}
#forum ul.commentsList li .comment .body p{font-size: 12px; margin-top: 0px; margin-bottom: 15px;}
#forum ul.commentsList li .comment .body li{display: list-item; margin-top:.5em; margin-bottom:1em;}
#forum ul.commentsList li .comment .body ul li {list-style-type: disc;}
#forum ul.commentsList li .comment .body img { border: 0; }
#forum ul.commentsList li .comment .body blockquote { margin-bottom: 10px; padding: 10px 10px 1px 10px; background-color: #eeeeee; }
/* Solutions */
#forum ul.commentsList li.postSolution .postedAt{color: #8ECA56 !Important}
#forum ul.commentsList li.postSolution .memberBadge{background: #8ECA56 !Important}
#forum ul.commentsList li.postSolution .memberBadge *{color: #fff !Important}
#forum ul.commentsList .solution{color: #8ECA56 !Important}
/* TinyMCE skin */
#forum .defaultSkin .mceIframeContainer {display: block; border: none !Important; background-color: #fff; vertical-align: top; }
#forum .defaultSkin .mceLast{background: #fff;}
#forum .defaultSkin .mceToolbar {height: 30px; background: #efefef }
/* Comment area */
#forum #commentBody_parent,
#forum #topicBody_parent{border: 1px solid #CCCCCC !important; float: left; margin-bottom: 10px; width: 978px}
#forum #topicBody_parent{width:680px}
#forum .spamNotice {
background: #FFF6BF;
padding: 10px;
margin: 10px;
}
#forum .spamNotice h3 {
color: #8a0000;
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
/* Forum */#forum table.forumList{ width: 100%; border: none; margin-bottom: 15px;}#forum table.forumList thead{background: #fff; color: #46484B; padding: 5px;}#forum table.forumList thead th{padding: 3px; border-bottom: #efefef 1px solid; font-size: 90%; text-align: left; }#forum table.forumList tbody{background: #fff; font-size: 12px;}#forum table.forumList tbody th{font-weight: normal; border-bottom: #efefef 1px solid; padding: 15px; text-align: left; padding-left: 60px }#forum table.forumList tbody td{border-bottom: #efefef 1px solid; background: #fff; width: 200px; padding: 15px; font-size: 11px; text-align: right;}#forum table.forumList tbody td a{color: #999; text-decoration: none; font-size: 10px; display: block; }#forum table.forumList td.replies, #forum table.forumList td.votes{ width: 40px; text-align: center; background: #F3F3F3; font-size: 20px; font-weight: bold; color: #999; }#forum table.forumList td.voted{color: green;}#forum table.forumList td.replies small, #forum table.forumList td.votes small{display: block; padding: 2px; color: #999 !Important;}#forum table.forumList th a{color: #000; font-size: 14px; font-weight: bold; text-decoration: none;}#forum table.forumList th a:hover{text-decoration: underline;}#forum table.forumList .forumName{color: #252525; font-size: 110%;}#forum table.forumList .forumStats{font-weight: bold;}#forum table.forumList .forumDesc{font-weight: normal; color: #333}#forum table.forumList .forumLastPost{}#forum table.forumList th.title a{display: block;}#forum table.forumList tr th{background: no-repeat 15px 20px url(forum/forum.gif);}#forum table.forumList tr.solved th{background-image: url(forum/solved.gif);}/* Options */#forum #options{display: block; height: 20px; padding: 5px; border-top: #efefef 1px solid; margin: 10px 0 0px 0;}#forum #options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 20px;}#forum #options ul li{float: left; padding-right: 15px; margin: 0px;}#forum #options ul li a{font-size: 11px; margin: 0px;}#forum #options ul li.right{float: right}/* NEW */#forum ul.commentsList{list-style: none; margin: 0; padding: 0}#forum ul.commentsList li{display: block; margin: 0px 0px 35px 0px;}#forum ul.commentsList li .author{display: block; float: left; width: 56px; margin-right: 20px;}#forum ul.commentsList li .comment{float: left; display: block; width: 820px;}#forum ul.commentsList li .voting{float: right; display: block; width: 50px;}#forum ul.commentsList li.replies{border-bottom: #999 1px solid; margin: 10px 0px 25px 0px;}/*badge */#forum ul.commentsList li .author{text-align: center;}#forum ul.commentsList li .author a.badge{margin: auto; margin-top: 10px;}/* comment */#forum ul.commentsList li .comment .meta{font-size: 11px;}#forum ul.commentsList li .comment .meta h2{font-size: 24px;}#forum ul.commentsList li .comment .postedAt{padding-bottom: 5px; border-bottom: 1px solid #efefef}#forum ul.commentsList li .comment .options ul{margin: 0; padding: 3px 0px 15px 0px; height: 15px !important; list-style; none; font-size: 11px;}#forum ul.commentsList li .comment .options ul li{display: inline; padding-right: 15px; font-size: 11px; float: left; margin: 0px}#forum ul.commentsList li .comment .body{font-size: 12px;}#forum ul.commentsList li .comment .body p{font-size: 12px; margin-top: 0px; margin-bottom: 15px;}#forum ul.commentsList li .comment .body li{display: list-item; margin-top:.5em; margin-bottom:1em;}#forum ul.commentsList li .comment .body ul li {list-style-type: disc;}#forum ul.commentsList li .comment .body img { border: 0; }#forum ul.commentsList li .comment .body blockquote { margin-bottom: 10px; padding: 10px 10px 1px 10px; background-color: #eeeeee; }/* Solutions */#forum ul.commentsList li.postSolution .postedAt{color: #8ECA56 !Important}#forum ul.commentsList li.postSolution .memberBadge{background: #8ECA56 !Important}#forum ul.commentsList li.postSolution .memberBadge *{color: #fff !Important}#forum ul.commentsList .solution{color: #8ECA56 !Important}/* TinyMCE skin */#forum .defaultSkin .mceIframeContainer {display: block; border: none !Important; background-color: #fff; vertical-align: top; }#forum .defaultSkin .mceLast{background: #fff;}#forum .defaultSkin .mceToolbar {height: 30px; background: #efefef }/* Comment area */#forum #commentBody_parent,#forum #topicBody_parent{border: 1px solid #CCCCCC !important; float: left; margin-bottom: 10px; width: 978px}#forum #topicBody_parent{width:680px}#forum .spamNotice { background: #FFF6BF; padding: 10px; margin: 10px;}#forum .spamNotice h3 { color: #8a0000;}
OurUmbraco.Site/css/googlePrettify.css
+1 -32
View File
@@ -1,32 +1 @@
/* Pretty printing styles. Used with prettify.js. */
.str { color: #080; }
.kwd { color: #008; }
.com { color: #800; }
.typ { color: #606; }
.lit { color: #066; }
.pun { color: #660; }
.pln { color: #000; }
.tag { color: #008; }
.atn { color: #606; }
.atv { color: #080; }
.dec { color: #606; }
pre.prettyprint { padding: 2px; /*border: 1px solid #888;*/ }
@media print {
.str { color: #060; }
.kwd { color: #006; font-weight: bold; }
.com { color: #600; font-style: italic; }
.typ { color: #404; font-weight: bold; }
.lit { color: #044; }
.pun { color: #440; }
.pln { color: #000; }
.tag { color: #006; font-weight: bold; }
.atn { color: #404; }
.atv { color: #060; }
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
/* Pretty printing styles. Used with prettify.js. */.str { color: #080; }.kwd { color: #008; }.com { color: #800; }.typ { color: #606; }.lit { color: #066; }.pun { color: #660; }.pln { color: #000; }.tag { color: #008; }.atn { color: #606; }.atv { color: #080; }.dec { color: #606; }pre.prettyprint { padding: 2px; /*border: 1px solid #888;*/ }@media print { .str { color: #060; } .kwd { color: #006; font-weight: bold; } .com { color: #600; font-style: italic; } .typ { color: #404; font-weight: bold; } .lit { color: #044; } .pun { color: #440; } .pln { color: #000; } .tag { color: #006; font-weight: bold; } .atn { color: #404; } .atv { color: #060; }}
OurUmbraco.Site/css/jquery.autocomplete.css
+1 -48
View File
@@ -1,48 +1 @@
.ac_results {
padding: 0px;
border: 1px solid black;
background-color: white;
overflow: hidden;
z-index: 99999;
}
.ac_results ul {
width: 100%;
list-style-position: outside;
list-style: none;
padding: 0;
margin: 0;
}
.ac_results li {
margin: 0px;
padding: 2px 5px;
cursor: default;
display: block;
/*
if width will be 100% horizontal scrollbar will apear
when scroll mode will be used
*/
/*width: 100%;*/
font: menu;
font-size: 12px;
/*
it is very important, if line-height not setted or setted
in relative units scroll will be broken in firefox
*/
line-height: 16px;
overflow: hidden;
}
.ac_loading {
background: white url('indicator.gif') right center no-repeat;
}
.ac_odd {
background-color: #eee;
}
.ac_over {
background-color: #0A246A;
color: white;
}
.ac_results { padding: 0px; border: 1px solid black; background-color: white; overflow: hidden; z-index: 99999;}.ac_results ul { width: 100%; list-style-position: outside; list-style: none; padding: 0; margin: 0;}.ac_results li { margin: 0px; padding: 2px 5px; cursor: default; display: block; /* if width will be 100% horizontal scrollbar will apear when scroll mode will be used */ /*width: 100%;*/ font: menu; font-size: 12px; /* it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */ line-height: 16px; overflow: hidden;}.ac_loading { background: white url('indicator.gif') right center no-repeat;}.ac_odd { background-color: #eee;}.ac_over { background-color: #0A246A; color: white;}
OurUmbraco.Site/css/jquery.tabs.css
+1 -120
View File
@@ -1,120 +1 @@
/* Caution! Ensure accessibility in print and other media types... */
@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
.ui-tabs-hide {
display: none;
}
}
/* Hide useless elements in print layouts... */
@media print {
.ui-tabs-nav {
display: none;
}
}
/* Skin */
.ui-tabs-nav, .ui-tabs-panel {
font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
}
.ui-tabs-nav {
list-style: none;
margin: 0;
padding: 0 0 0 4px;
padding-top: 15px;
}
.ui-tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
display: block;
clear: both;
content: " ";
}
.ui-tabs-nav li {
float: left;
margin: 0 0 0 1px;
min-width: 84px; /* be nice to Opera */
}
.ui-tabs-nav a, .ui-tabs-nav a span {
display: block;
padding: 0 10px;
}
.ui-tabs-nav a {
margin: 1px 0 0; /* position: relative makes opacity fail for disabled tab in IE */
padding-left: 0;
color: #27537a;
font-weight: bold;
line-height: 1.5;
text-align: center;
text-decoration: none;
white-space: nowrap; /* required in IE 6 */
outline: 0; /* prevent dotted border in Firefox */
border: 1px solid #999; border-bottom: 1px solid white;
font-size: 16px;
margin-right: 10px;
}
.ui-tabs-nav .ui-tabs-selected a {
position: relative;
top: 1px;
z-index: 2;
margin-top: 0;
color: #000;
border-color: black; border-bottom-color: white;
}
.ui-tabs-nav a span {
width: 64px; /* IE 6 treats width as min-width */
min-width: 64px;
height: 18px; /* IE 6 treats height as min-height */
min-height: 18px;
padding-top: 6px;
padding-right: 0;
}
*>.ui-tabs-nav a span { /* hide from IE 6 */
width: auto;
height: auto;
}
.ui-tabs-nav .ui-tabs-selected a span {
padding-bottom: 1px;
}
.ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active {
background-position: 100% -150px;
}
.ui-tabs-nav a, .ui-tabs-nav .ui-tabs-disabled a:hover, .ui-tabs-nav .ui-tabs-disabled a:focus, .ui-tabs-nav .ui-tabs-disabled a:active {
background-position: 100% -100px;
}
.ui-tabs-nav .ui-tabs-selected a span, .ui-tabs-nav a:hover span, .ui-tabs-nav a:focus span, .ui-tabs-nav a:active span {
background-position: 0 -50px;
}
.ui-tabs-nav a span, .ui-tabs-nav .ui-tabs-disabled a:hover span, .ui-tabs-nav .ui-tabs-disabled a:focus span, .ui-tabs-nav .ui-tabs-disabled a:active span {
background-position: 0 0;
}
.ui-tabs-nav .ui-tabs-selected a:link, .ui-tabs-nav .ui-tabs-selected a:visited, .ui-tabs-nav .ui-tabs-disabled a:link, .ui-tabs-nav .ui-tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
cursor: text;
}
.ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active,
.ui-tabs-nav .ui-tabs-deselectable a:hover, .ui-tabs-nav .ui-tabs-deselectable a:focus, .ui-tabs-nav .ui-tabs-deselectable a:active { /* @ Opera, we need to be explicit again here now... */
cursor: pointer;
}
.ui-tabs-panel {
border-top: 1px solid #000;
padding: 1em 8px;
background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
}
.ui-tabs-loading em {
padding: 0 0 0 20px;
background: url(loading.gif) no-repeat 0 50%;
}
/* Additional IE specific bug fixes... */
* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */
display: inline-block;
}
*:first-child+html .ui-tabs-nav { /* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
display: inline-block;
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
/* Caution! Ensure accessibility in print and other media types... */@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */ .ui-tabs-hide { display: none; }}/* Hide useless elements in print layouts... */@media print { .ui-tabs-nav { display: none; }}/* Skin */.ui-tabs-nav, .ui-tabs-panel { font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;}.ui-tabs-nav { list-style: none; margin: 0; padding: 0 0 0 4px; padding-top: 15px;}.ui-tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */ display: block; clear: both; content: " ";}.ui-tabs-nav li { float: left; margin: 0 0 0 1px; min-width: 84px; /* be nice to Opera */}.ui-tabs-nav a, .ui-tabs-nav a span { display: block; padding: 0 10px; }.ui-tabs-nav a { margin: 1px 0 0; /* position: relative makes opacity fail for disabled tab in IE */ padding-left: 0; color: #27537a; font-weight: bold; line-height: 1.5; text-align: center; text-decoration: none; white-space: nowrap; /* required in IE 6 */ outline: 0; /* prevent dotted border in Firefox */ border: 1px solid #999; border-bottom: 1px solid white; font-size: 16px; margin-right: 10px;}.ui-tabs-nav .ui-tabs-selected a { position: relative; top: 1px; z-index: 2; margin-top: 0; color: #000; border-color: black; border-bottom-color: white;}.ui-tabs-nav a span { width: 64px; /* IE 6 treats width as min-width */ min-width: 64px; height: 18px; /* IE 6 treats height as min-height */ min-height: 18px; padding-top: 6px; padding-right: 0;}*>.ui-tabs-nav a span { /* hide from IE 6 */ width: auto; height: auto;}.ui-tabs-nav .ui-tabs-selected a span { padding-bottom: 1px;}.ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active { background-position: 100% -150px;}.ui-tabs-nav a, .ui-tabs-nav .ui-tabs-disabled a:hover, .ui-tabs-nav .ui-tabs-disabled a:focus, .ui-tabs-nav .ui-tabs-disabled a:active { background-position: 100% -100px;}.ui-tabs-nav .ui-tabs-selected a span, .ui-tabs-nav a:hover span, .ui-tabs-nav a:focus span, .ui-tabs-nav a:active span { background-position: 0 -50px;}.ui-tabs-nav a span, .ui-tabs-nav .ui-tabs-disabled a:hover span, .ui-tabs-nav .ui-tabs-disabled a:focus span, .ui-tabs-nav .ui-tabs-disabled a:active span { background-position: 0 0;}.ui-tabs-nav .ui-tabs-selected a:link, .ui-tabs-nav .ui-tabs-selected a:visited, .ui-tabs-nav .ui-tabs-disabled a:link, .ui-tabs-nav .ui-tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */ cursor: text;}.ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active,.ui-tabs-nav .ui-tabs-deselectable a:hover, .ui-tabs-nav .ui-tabs-deselectable a:focus, .ui-tabs-nav .ui-tabs-deselectable a:active { /* @ Opera, we need to be explicit again here now... */ cursor: pointer;}.ui-tabs-panel { border-top: 1px solid #000; padding: 1em 8px; background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */}.ui-tabs-loading em { padding: 0 0 0 20px; background: url(loading.gif) no-repeat 0 50%;}/* Additional IE specific bug fixes... */* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */ display: inline-block;}*:first-child+html .ui-tabs-nav { /* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */ display: inline-block;}
OurUmbraco.Site/css/jquery.ui.core.css
Vendored
+1 -38
View File
@@ -1,38 +1 @@
/*!
* jQuery UI CSS Framework 1.8.20
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Licensed under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming/API
*/
/* Layout helpers
----------------------------------*/
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
.ui-helper-clearfix:after { clear: both; }
.ui-helper-clearfix { zoom: 1; }
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
/* Interaction Cues
----------------------------------*/
.ui-state-disabled { cursor: default !important; }
/* Icons
----------------------------------*/
/* states and images */
.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
/* Misc visuals
----------------------------------*/
/* Overlays */
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
/*! * jQuery UI CSS Framework 1.8.20 * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) * Licensed under the MIT license. * http://jquery.org/license * * http://docs.jquery.com/UI/Theming/API *//* Layout helpers----------------------------------*/.ui-helper-hidden { display: none; }.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }.ui-helper-clearfix:after { clear: both; }.ui-helper-clearfix { zoom: 1; }.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }/* Interaction Cues----------------------------------*/.ui-state-disabled { cursor: default !important; }/* Icons----------------------------------*//* states and images */.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }/* Misc visuals----------------------------------*//* Overlays */.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
OurUmbraco.Site/css/jquery.ui.slider.css
Vendored
+1 -24
View File
@@ -1,24 +1 @@
/*!
* jQuery UI Slider 1.8.20
*
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
* Licensed under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Slider#theming
*/
.ui-slider { position: relative; text-align: left; }
.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
.ui-slider-horizontal { height: .8em; }
.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
.ui-slider-horizontal .ui-slider-range-min { left: 0; }
.ui-slider-horizontal .ui-slider-range-max { right: 0; }
.ui-slider-vertical { width: .8em; height: 100px; }
.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
.ui-slider-vertical .ui-slider-range-max { top: 0; }
/*! * jQuery UI Slider 1.8.20 * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) * Licensed under the MIT license. * http://jquery.org/license * * http://docs.jquery.com/UI/Slider#theming */.ui-slider { position: relative; text-align: left; }.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }.ui-slider-horizontal { height: .8em; }.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }.ui-slider-horizontal .ui-slider-range-min { left: 0; }.ui-slider-horizontal .ui-slider-range-max { right: 0; }.ui-slider-vertical { width: .8em; height: 100px; }.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }.ui-slider-vertical .ui-slider-range-min { bottom: 0; }.ui-slider-vertical .ui-slider-range-max { top: 0; }
OurUmbraco.Site/css/jquery.ui.theme.css
Vendored
+1 -247
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/mbd.forum.iPad.css
+1 -469
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/new-deli.css
+1 -1081
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/new-projects-mbd-ie.css
+1 -36
View File
@@ -1,36 +1 @@
/* IE Hacks */
.tip
{
background:#333;
}
.tip:after {
display: none;
}
.deliPromoBox li {
width: 154px;
}
.promoOptions li {
width: auto;
}
#selectsearch {
width: 326px;
}
#sections {
border: 1px solid #ddd;
left: 203px;
top: 24px;
}
#sections .sectiontab {
padding: 0 0 7px 19px;
}
#searchField{
line-height:32px;
}
/* IE Hacks */.tip{ background:#333;}.tip:after { display: none;}.deliPromoBox li { width: 154px;}.promoOptions li { width: auto;}#selectsearch { width: 326px;}#sections { border: 1px solid #ddd; left: 203px; top: 24px;}#sections .sectiontab { padding: 0 0 7px 19px;}#searchField{line-height:32px;}
OurUmbraco.Site/css/new-projects-mbd.css
+1 -900
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/notifications.css
+1 -34
View File
@@ -1,34 +1 @@
.notification
{
background:#FFFFFF none repeat scroll 0 0 !important;
border:1px solid #CCCCCC;
display:block;
font-size:11px;
margin-top:10px;
padding:3px;
}
.UnSubscribeTopic, .UnSubscribeForum,
.NotificationForumUnsubscribe, .NotificationTopicUnsubscribe
{
color: #680708;
}
.SubscribeTopic, .SubscribeForum
{
color: #07681c;
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
.notification{ background:#FFFFFF none repeat scroll 0 0 !important; border:1px solid #CCCCCC; display:block; font-size:11px; margin-top:10px; padding:3px;}.UnSubscribeTopic, .UnSubscribeForum,.NotificationForumUnsubscribe, .NotificationTopicUnsubscribe{ color: #680708;}.SubscribeTopic, .SubscribeForum{ color: #07681c;}
OurUmbraco.Site/css/nsbtEZJN bdMxx rNlKmYLPz mYr jNMV dPEy.css
+1
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/qtip2.css
+1 -3
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/repo-styles.css
+1 -213
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/repository.css
+1 -33
View File
@@ -1,33 +1 @@
/* GENERAL STYLES */
body,html{padding: 10px !Important; margin: 0px !Important; padding: 10px; background: white; background-image: none !Important;}
#closeHandle{display: none !Important;}
#header{font-size: 14px; font-weight: bold; color: rgb(153, 153, 153); margin-bottom: 7px;}
#header img{display: none !Important;}
img.gradient{display: none !Important;}
#theForm{margin-top: -15px; width: 100%; position: relative;}
#Table1{width: auto !Important; width: 100%; display: block; margin: 0px;}
#profileInfo{font-size: 10px; position: absolute; right: 10px; top: 10px; color: #999;}
.propertyPane{padding: 10px;}
a{color: black;}
body {
margin: 2px
}
.repoBox{display: block; clear: both; padding: 10px; border-bottom: 1px solid #ccc; margin-bottom: 15px;}
.noborder{border: none !Important;}
h4{margin-top: 0px; margin-bottom: 15px; font-size: 15px;}
.gradient{background-repeat: no-repeat;}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
/* GENERAL STYLES */body,html{padding: 10px !Important; margin: 0px !Important; padding: 10px; background: white; background-image: none !Important;}#closeHandle{display: none !Important;}#header{font-size: 14px; font-weight: bold; color: rgb(153, 153, 153); margin-bottom: 7px;}#header img{display: none !Important;}img.gradient{display: none !Important;}#theForm{margin-top: -15px; width: 100%; position: relative;}#Table1{width: auto !Important; width: 100%; display: block; margin: 0px;}#profileInfo{font-size: 10px; position: absolute; right: 10px; top: 10px; color: #999;}.propertyPane{padding: 10px;}a{color: black;}body { margin: 2px}.repoBox{display: block; clear: both; padding: 10px; border-bottom: 1px solid #ccc; margin-bottom: 15px;}.noborder{border: none !Important;} h4{margin-top: 0px; margin-bottom: 15px; font-size: 15px;}.gradient{background-repeat: no-repeat;}
OurUmbraco.Site/css/screen.css
+1 -1742
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/select2-new.css
+1 -666
View File
File diff suppressed because one or more lines are too long
OurUmbraco.Site/css/shadowbox.css
+1 -19
View File
@@ -1,19 +1 @@
#sb-container,#sb-wrapper{text-align:left;}#sb-container,#sb-overlay{position:absolute;top:0;left:0;width:100%;margin:0;padding:0;}#sb-container{height:100%;display:none;visibility:hidden;z-index:999;}body>#sb-container{position:fixed;}#sb-overlay{height:expression(document.documentElement.clientHeight+'px');}#sb-container>#sb-overlay{height:100%;}#sb-wrapper{position:relative;}#sb-wrapper img{border:none;}#sb-body{position:relative;margin:0;padding:0;overflow:hidden;border:1px solid #303030;}#sb-body-inner{position:relative;height:100%;}#sb-content.html{height:100%;overflow:auto;}#sb-loading{position:absolute;top:0;width:100%;height:100%;text-align:center;padding-top:10px;}#sb-body,#sb-loading{background-color:#060606;}#sb-title,#sb-info{position:relative;margin:0;padding:0;overflow:hidden;}#sb-title-inner,#sb-info-inner{position:relative;font-family:'Lucida Grande',Tahoma,sans-serif;line-height:16px;}#sb-title,#sb-title-inner{height:26px;}#sb-title-inner{font-size:16px;padding:5px 0;color:#fff;}#sb-info,#sb-info-inner{height:20px;}#sb-info-inner{font-size:12px;color:#fff;}#sb-nav{float:right;height:16px;padding:2px 0;width:45%;}#sb-nav a{display:block;float:right;height:16px;width:16px;margin-left:3px;cursor:pointer;}#sb-nav-close{background-image:url(resources/close.png);background-repeat:no-repeat;}#sb-nav-next{background-image:url(resources/next.png);background-repeat:no-repeat;}#sb-nav-previous{background-image:url(resources/previous.png);background-repeat:no-repeat;}#sb-nav-play{background-image:url(resources/play.png);background-repeat:no-repeat;}#sb-nav-pause{background-image:url(resources/pause.png);background-repeat:no-repeat;}#sb-counter{float:left;padding:2px 0;width:45%;}#sb-counter a{padding:0 4px 0 0;text-decoration:none;cursor:pointer;color:#fff;}#sb-counter a.sb-counter-current{text-decoration:underline;}div.sb-message{font-family:'Lucida Grande',Tahoma,sans-serif;font-size:12px;padding:10px;text-align:center;}div.sb-message a:link,div.sb-message a:visited{color:#fff;text-decoration:underline;}
#sb-loading a{
color:grey;
}
#sb-overlay{
background-color:#FFFFFF;
}
#sb-body, #sb-loading{
background-color: #F0F2F2;
border:1px solid #F0F2F2;
}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
#sb-container,#sb-wrapper{text-align:left;}#sb-container,#sb-overlay{position:absolute;top:0;left:0;width:100%;margin:0;padding:0;}#sb-container{height:100%;display:none;visibility:hidden;z-index:999;}body>#sb-container{position:fixed;}#sb-overlay{height:expression(document.documentElement.clientHeight+'px');}#sb-container>#sb-overlay{height:100%;}#sb-wrapper{position:relative;}#sb-wrapper img{border:none;}#sb-body{position:relative;margin:0;padding:0;overflow:hidden;border:1px solid #303030;}#sb-body-inner{position:relative;height:100%;}#sb-content.html{height:100%;overflow:auto;}#sb-loading{position:absolute;top:0;width:100%;height:100%;text-align:center;padding-top:10px;}#sb-body,#sb-loading{background-color:#060606;}#sb-title,#sb-info{position:relative;margin:0;padding:0;overflow:hidden;}#sb-title-inner,#sb-info-inner{position:relative;font-family:'Lucida Grande',Tahoma,sans-serif;line-height:16px;}#sb-title,#sb-title-inner{height:26px;}#sb-title-inner{font-size:16px;padding:5px 0;color:#fff;}#sb-info,#sb-info-inner{height:20px;}#sb-info-inner{font-size:12px;color:#fff;}#sb-nav{float:right;height:16px;padding:2px 0;width:45%;}#sb-nav a{display:block;float:right;height:16px;width:16px;margin-left:3px;cursor:pointer;}#sb-nav-close{background-image:url(resources/close.png);background-repeat:no-repeat;}#sb-nav-next{background-image:url(resources/next.png);background-repeat:no-repeat;}#sb-nav-previous{background-image:url(resources/previous.png);background-repeat:no-repeat;}#sb-nav-play{background-image:url(resources/play.png);background-repeat:no-repeat;}#sb-nav-pause{background-image:url(resources/pause.png);background-repeat:no-repeat;}#sb-counter{float:left;padding:2px 0;width:45%;}#sb-counter a{padding:0 4px 0 0;text-decoration:none;cursor:pointer;color:#fff;}#sb-counter a.sb-counter-current{text-decoration:underline;}div.sb-message{font-family:'Lucida Grande',Tahoma,sans-serif;font-size:12px;padding:10px;text-align:center;}div.sb-message a:link,div.sb-message a:visited{color:#fff;text-decoration:underline;}#sb-loading a{ color:grey;}#sb-overlay{ background-color:#FFFFFF;}#sb-body, #sb-loading{ background-color: #F0F2F2; border:1px solid #F0F2F2;}
OurUmbraco.Site/css/wiki.css
+1 -157
View File
@@ -1,157 +1 @@
/*
#wikiContent{width: 700px;}
*/
#wikiContent { margin-right: 216px; }
input.wikiheadline{border: 2px dotted #999; display: block; font-size: 28px;
font-weight: bold; margin-bottom: 7px; margin-top: 0.67em; width: 850px; }
.wiki-toc ul{list-style: none; margin: 5px; padding: 0px; font-size: 11px;}
.wiki-toc ul li{padding: 7px; display: block; border-bottom: 1px dotted #e7e7e7}
#wiki del{background: #FFC0C0; color: #774343;}
#wiki ins{background: #C8FFC0; color: #4A7743}
/* TinyMCE skin */
#wiki .defaultSkin .mceIframeContainer {border: 2px dotted #999 !Important; display: block;}
.wiki_subject{width: 300px; margin: 10px; float: left;}
#wikiButtons{margin-top: 16px; padding: 5px; margin-bottom: 15px; background: #efefef; }
#wikiButtons, #wikiButtons *{font-size: 90%}
.attachedFiles{list-style: none; margin: 0px; padding-left: 7px;}
#editMode{background: #FFF6BF; padding: 7px; font-size: 11px; text-align: center;}
.attachedFiles li{padding: 0px 0px 20px 45px; display: block; background: no-repeat left top;}
.attachedFiles li.docs{background-image: url(wiki/documents.png)}
.attachedFiles li.source{background-image: url(wiki/binary.png)}
.attachedFiles li.package{background-image: url(wiki/package.png)}
.attachedFiles a.fileName{display: block;}
#wikimovedialog{width: 520px; height: 350px; background: none; border: none;}
/* Options */
#wiki #options{display: block; width: 880px; height: 45px; padding: 5px; border-top: #efefef 1px solid; margin: 10px 0 20px 0;}
#wiki #options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 25px;}
#wiki #options ul li{float: left; padding-right: 15px;}
#wiki #options ul li a{font-size: 11px;}
#wiki #options ul li.create{float: right}
/* sidebar */
#wiki .wiki-sidebar ul{list-style: none; font-size: 11px; padding: 20px; margin: 20px 0px 20px 25px; width: 150px; border-left: 1px dotted #999; display: block; float: right}
#wiki .wiki-sidebar ul a{display: block; padding-bottom: 15px;}
/* Voting */
#wikivoting{ float: right; width: 60px;}
/*history */
#history{list-style: none; margin: 0px; padding: 0px; display: block;
border-bottom: 1px solid #999;
height: 17px; width: 950px; position: relative; clear: both; margin: 15px; margin-bottom: 2px;}
#history li{padding: 0; margin: 0; position: absolute;}
#history li a.wikiVersion{display: block;
width: 11px; text-indent:-999px;
height: 19px; margin-left: -5px; overflow: hidden; background: url(wiki/pin.png) center bottom no-repeat;}
#history li a.current{background-image: url(wiki/pin_current.png);}
#history li div.versionInfo{display: none; padding: 10px; background: #F0F0F0; width: 250px; position: absolute; bottom: 50px; left: -125px; border: 1px solid #ccc;}
#history li div.versionInfo a.author{float: left; margin: 3px 15px 15px 3px;}
#history li div.versionInfo a.author img{width: 32px; height: 32px}
#history li div.versionInfo h4{margin: 0px; padding: 0px;}
#history li div.versionInfo small{display: block; padding: 5px;}
#history li div.versionInfo a.bt_rollback{font-size: 11px; color: blue}
#history li div.versionInfo *{color: #999;}
#history li div.peak{display: block;}
#history li div.show{display: block;}
/* Attachments */
#wikiAttachmentsForm .overview{
margin-top: 0px;
padding-top:0px;
}
#historyBar{display: none;}
#wikiAttachmentsForm .upload{
border-bottom: none !important;
}
#wiki .spotlight{width: 286px; float: left; margin: 15px;}
/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */
/*#wikiContent{width: 700px;}*/#wikiContent { margin-right: 216px; }input.wikiheadline{border: 2px dotted #999; display: block; font-size: 28px; font-weight: bold; margin-bottom: 7px; margin-top: 0.67em; width: 850px; }.wiki-toc ul{list-style: none; margin: 5px; padding: 0px; font-size: 11px;}.wiki-toc ul li{padding: 7px; display: block; border-bottom: 1px dotted #e7e7e7}#wiki del{background: #FFC0C0; color: #774343;}#wiki ins{background: #C8FFC0; color: #4A7743}/* TinyMCE skin */#wiki .defaultSkin .mceIframeContainer {border: 2px dotted #999 !Important; display: block;}.wiki_subject{width: 300px; margin: 10px; float: left;}#wikiButtons{margin-top: 16px; padding: 5px; margin-bottom: 15px; background: #efefef; }#wikiButtons, #wikiButtons *{font-size: 90%}.attachedFiles{list-style: none; margin: 0px; padding-left: 7px;}#editMode{background: #FFF6BF; padding: 7px; font-size: 11px; text-align: center;}.attachedFiles li{padding: 0px 0px 20px 45px; display: block; background: no-repeat left top;}.attachedFiles li.docs{background-image: url(wiki/documents.png)}.attachedFiles li.source{background-image: url(wiki/binary.png)}.attachedFiles li.package{background-image: url(wiki/package.png)}.attachedFiles a.fileName{display: block;}#wikimovedialog{width: 520px; height: 350px; background: none; border: none;}/* Options */#wiki #options{display: block; width: 880px; height: 45px; padding: 5px; border-top: #efefef 1px solid; margin: 10px 0 20px 0;}#wiki #options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 25px;}#wiki #options ul li{float: left; padding-right: 15px;}#wiki #options ul li a{font-size: 11px;}#wiki #options ul li.create{float: right}/* sidebar */#wiki .wiki-sidebar ul{list-style: none; font-size: 11px; padding: 20px; margin: 20px 0px 20px 25px; width: 150px; border-left: 1px dotted #999; display: block; float: right}#wiki .wiki-sidebar ul a{display: block; padding-bottom: 15px;}/* Voting */ #wikivoting{ float: right; width: 60px;}/*history */#history{list-style: none; margin: 0px; padding: 0px; display: block; border-bottom: 1px solid #999;height: 17px; width: 950px; position: relative; clear: both; margin: 15px; margin-bottom: 2px;}#history li{padding: 0; margin: 0; position: absolute;}#history li a.wikiVersion{display: block; width: 11px; text-indent:-999px; height: 19px; margin-left: -5px; overflow: hidden; background: url(wiki/pin.png) center bottom no-repeat;}#history li a.current{background-image: url(wiki/pin_current.png);}#history li div.versionInfo{display: none; padding: 10px; background: #F0F0F0; width: 250px; position: absolute; bottom: 50px; left: -125px; border: 1px solid #ccc;}#history li div.versionInfo a.author{float: left; margin: 3px 15px 15px 3px;}#history li div.versionInfo a.author img{width: 32px; height: 32px}#history li div.versionInfo h4{margin: 0px; padding: 0px;}#history li div.versionInfo small{display: block; padding: 5px;}#history li div.versionInfo a.bt_rollback{font-size: 11px; color: blue} #history li div.versionInfo *{color: #999;}#history li div.peak{display: block;}#history li div.show{display: block;}/* Attachments */#wikiAttachmentsForm .overview{ margin-top: 0px; padding-top:0px;}#historyBar{display: none;}#wikiAttachmentsForm .upload{ border-bottom: none !important;}#wiki .spotlight{width: 286px; float: left; margin: 15px;}
OurUmbraco.Site/macroScripts/web.config
+8 -8
View File
@@ -2,9 +2,9 @@
<configuration>
<configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
</sectionGroup>
</configSections>
@@ -12,7 +12,7 @@
<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>
<pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
<namespaces>
<add namespace="Microsoft.Web.Helpers" />
<add namespace="umbraco" />
<add namespace="Examine" />
</namespaces>
@@ -37,11 +37,11 @@
-->
<pages
validateRequest="false"
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls>
<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
<add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls>
</pages>
</system.web>
OurUmbraco.Site/packages.config
+3 -3
View File
@@ -8,8 +8,8 @@
<package id="EasyHttp" version="1.6.29.0" targetFramework="net451" />
<package id="Examine" version="0.1.68.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net451" />
<package id="ImageProcessor" version="2.2.7.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.3.5.0" targetFramework="net451" />
<package id="ImageProcessor" version="2.3.0.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.4.0.0" targetFramework="net451" />
<package id="jQuery" version="1.4.1" targetFramework="net451" />
<package id="jQuery.Validation" version="1.8" targetFramework="net451" />
<package id="jQuery.Validation.Unobtrusive" version="2.0.20710.0" targetFramework="net451" />
@@ -46,7 +46,7 @@
<package id="RestSharp" version="104.1" targetFramework="net4" />
<package id="semver" version="1.1.2" targetFramework="net451" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0-RC" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0" targetFramework="net451" />
<package id="UrlTracker" version="3.8" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
<package id="YouTrackSharp" version="2.0.11.0" targetFramework="net4" />
OurUmbraco.Site/umbraco/Install/Views/Web.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<configuration>
<configSections>
OurUmbraco.Site/umbraco/Views/common/dialogs/help.html
+2 -2
View File
@@ -7,7 +7,7 @@
<div class="umb-panel-body umb-scrollable">
<div class="tab-content umb-control-group">
<div class="umb-pane">
<h5><localize key="help_helpTopicsFor">Help topics for</localize>: {{section}}</h5>
<h5><localize key="help_helpTopicsFor">Help topics for</localize>: {{sectionName}}</h5>
<ul class="unstyled list-icons" ng-show="topics">
<li ng-repeat="topic in topics">
<i class="icon icon-help-alt"></i>
@@ -31,7 +31,7 @@
</div>
<div class="umb-pane">
<h5><localize key="help_videoChaptersFor">Video chapters for</localize>: {{section}}</h5>
<h5><localize key="help_videoChaptersFor">Video chapters for</localize>: {{sectionName}}</h5>
<ul class="thumbnails" ng-show="videos">
<li class="span2" ng-repeat="video in videos">
OurUmbraco.Site/umbraco/Views/dashboard/forms/formsdashboardintro.html
+1 -1
View File
@@ -11,7 +11,7 @@
<div id="video_1" class="video_player" style="margin-bottom: 40px">
<video autoplay loop>
<!-- <source src="videos/gif.webm" type="video/webm"> -->
<source src="//player.vimeo.com/external/110229004.hd.mp4?s=823f701836260bd08fb783d38389f628" type="video/mp4">
<source src="https://player.vimeo.com/external/110229004.hd.mp4?s=823f701836260bd08fb783d38389f628" type="video/mp4">
Sorry, you don't have HTML5 video and we didn't catch this properly in javascript.
</video>
</div>
OurUmbraco.Site/umbraco/Views/datatype/edit.html
+6 -6
View File
@@ -24,9 +24,9 @@
</div>
</umb-header>
<div class="umb-panel-body umb-scrollable row-fluid">
<div class="tab-content form-horizontal" style="padding-bottom: 90px">
<div class="umb-pane">
<umb-tab-view>
<umb-tab id="tabDataType" rel="DataType" style="display: block;">
<umb-pane>
<umb-property property="properties.selectedEditor">
<div>
@@ -60,9 +60,9 @@
</div>
</div>
</div>
</div>
</div>
</umb-pane>
</umb-tab>
</umb-tab-view>
</umb-panel>
</form>
OurUmbraco.Site/umbraco/Views/propertyeditors/listview/listview.html
+11 -11
View File
@@ -1,7 +1,7 @@
<div class="umb-editor umb-listview" ng-controller="Umbraco.PropertyEditors.ListViewController" ng-switch="isNew">
<div class="row-fluid" ng-switch-when="true">
</div>
<div class="row-fluid" ng-switch-when="false">
@@ -14,15 +14,14 @@
</a>
<ul class="dropdown-menu">
<li ng-repeat="contentType in listViewAllowedTypes">
<a
href="#/{{entityType}}/{{entityType}}/edit/{{contentId}}?doctype={{contentType.alias}}&create=true">
<a href="#/{{entityType}}/{{entityType}}/edit/{{contentId}}?doctype={{contentType.alias}}&create=true">
<i class="icon-{{contentType.cssClass}}"></i>
{{contentType.name}}
</a>
</li>
</ul>
</div>
<div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content' && !isTrashed && options.allowBulkPublish">
<a class="btn btn-success" ng-disabled="actionInProgress" ng-click="publish()" prevent-default>
<localize key="actions_publish">Publish</localize>
@@ -38,13 +37,14 @@
<localize key="actions_delete">Delete</localize>
</a>
</div>
<span ng-bind="bulkStatus" ng-show="isAnythingSelected()"></span>
<div class="umb-loader-wrapper" ng-show="actionInProgress">
<div class="umb-loader"></div>
</div>
<form class="form-search pull-right" novalidate>
<span ng-bind="bulkStatus" ng-show="isAnythingSelected()" class="pull-right"></span>
<form class="form-search pull-right" novalidate ng-show="!actionInProgress">
<div class="inner-addon left-addon">
<i class="icon icon-search" ng-click="enterSearch($event)"></i>
<input type="text" class="form-control" localize="placeholder" placeholder="@general_typeToSearch" ng-model="options.filter" prevent-enter-submit no-dirty-check>
@@ -66,7 +66,7 @@
</td>
<td ng-repeat="column in options.includeProperties">
<a href="#" ng-click="sort(column.alias, column.allowSorting)" ng-class="{'sortable':column.allowSorting}" prevent-default>
<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-up': isSortDirection(column.alias, 'asc'), 'icon-navigation-down': isSortDirection(column.alias, 'desc')}"></i>
</a>
@@ -118,8 +118,8 @@
<li ng-repeat="pgn in pagination"
ng-class="{active:pgn.isActive}">
<a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
ng-bind="pgn.name ? pgn.name : pgn.val"
<a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
ng-bind="pgn.name ? pgn.name : pgn.val"
ng-if="pgn.val != '...'"></a>
<span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
</li>
OurUmbraco.Site/umbraco/config/lang/en.xml
+5
View File
@@ -841,6 +841,11 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="partialViewSavedText">Partial view saved without any errors!</key>
<key alias="partialViewErrorHeader">Partial view not saved</key>
<key alias="partialViewErrorText">An error occurred saving the file.</key>
<key alias="scriptSavedHeader">Script view saved</key>
<key alias="scriptSavedText">Script view saved without any errors!</key>
<key alias="scriptErrorHeader">Script view not saved</key>
<key alias="scriptErrorText">An error occurred saving the file.</key>
<key alias="cssErrorText">An error occurred saving the file.</key>
</area>
<area alias="stylesheet">
<key alias="aliasHelp">Uses CSS syntax ex: h1, .redHeader, .blueTex</key>
OurUmbraco.Site/umbraco/config/lang/en_us.xml
+5
View File
@@ -842,6 +842,11 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="partialViewSavedText">Partial view saved without any errors!</key>
<key alias="partialViewErrorHeader">Partial view not saved</key>
<key alias="partialViewErrorText">An error occurred saving the file.</key>
<key alias="scriptSavedHeader">Script view saved</key>
<key alias="scriptSavedText">Script view saved without any errors!</key>
<key alias="scriptErrorHeader">Script view not saved</key>
<key alias="scriptErrorText">An error occurred saving the file.</key>
<key alias="cssErrorText">An error occurred saving the file.</key>
</area>
<area alias="stylesheet">
<key alias="aliasHelp">Uses CSS syntax ex: h1, .redHeader, .blueTex</key>
OurUmbraco.Site/umbraco/config/lang/ja.xml
+33 -5
View File
@@ -52,11 +52,11 @@
<key alias="domainExists">ドメイン '%0%' は既に割り当てられています</key>
<key alias="domainUpdated">ドメイン '%0%' は更新されました</key>
<key alias="orEdit">ドメインの編集</key>
<key alias="domainHelp"><![CDATA[例: yourdomain.com, www.yourdomain.com]]></key>
<key alias="domainHelp"><![CDATA[例: "example.com", "www.example.com", "example.com:8080" または "https://www.example.com/". ]]></key>
<key alias="inherit">Inherit</key>
<key alias="setLanguage">カルチャの割り当て</key>
<key alias="setLanguageHelp"><![CDATA[現在のノード以下のカルチャを設定します。親ノードのカルチャを継承します。]]></key>
<key alias="setDomains">ドメインの割り当て</key>
<key alias="setDomains">ドメイン割り当て</key>
</area>
<area alias="auditTrails">
<key alias="atViewingFor">これらを表示</key>
@@ -165,6 +165,10 @@
<area alias="media">
<key alias="clickToUpload">クリックしてアップロードする</key>
<key alias="dropFilesHere">ファイルをここへドロップ..</key>
</area>
<area alias="member">
<key alias="createNewMember">メンバーの新規作成</key>
<key alias="allMembers">全てのメンバー</key>
</area>
<area alias="create">
<key alias="chooseNode">どこに新しい %0% を作りますか</key>
@@ -674,13 +678,19 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="paSimpleHelp">単一のログインとパスワードで単純に保護したい場合に適します</key>
</area>
<area alias="publish">
<key alias="contentPublishedFailedAwaitingRelease"><![CDATA[
<key alias="contentPublishedFailedAwaitingRelease">
<![CDATA[
%0% ページは公開がスケジュールされているため、公開されませんでした。
]]></key>
<key alias="contentPublishedFailedByEvent"><![CDATA[
<key alias="contentPublishedFailedInvalid"><![CDATA[
%1% のプロパティがバリデーション定義に違反したため、%0% は公開できませんでした。
]]></key>
<key alias="contentPublishedFailedByEvent">
<![CDATA[
サードパーティのエクステンションがキャンセルされたので、%0% は公開できませんでした。
]]></key>
<key alias="contentPublishedFailedByParent"><![CDATA[
<key alias="contentPublishedFailedByParent">
<![CDATA[
親ページが公開されていないので、%0% は公開できませんでした。
]]></key>
<key alias="includeUnpublished">非公開の子ページも含めます</key>
@@ -693,12 +703,20 @@ Runwayをインストールして作られた新しいウェブサイトがど
このページとその全ての子ページも公開したければ <em>全ての子ページを公開</em> をチェック。
]]></key>
</area>
<area alias="colorpicker">
<key alias="noColors">設定済みの色はありません。</key>
</area>
<area alias="relatedlinks">
<key alias="addExternal">外部リンクを追加</key>
<key alias="addInternal">内部リンクを追加</key>
<key alias="addlink">追加</key>
<key alias="caption">タイトル</key>
<key alias="captionPlaceholder">キャプション表示を入力</key>
<key alias="chooseInternal">内部リンクを選択</key>
<key alias="enterExternal">外部リンクを入力</key>
<key alias="externalLinkPlaceholder">リンクを入力</key>
<key alias="internalPage">内部ページ</key>
<key alias="link">リンク</key>
<key alias="linkurl">URL</key>
<key alias="modeDown">下に移動</key>
<key alias="modeUp">上に移動</key>
@@ -737,6 +755,12 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="forms">フォーム</key>
<key alias="analytics">アナリティクス</key>
</area>
<area alias="help">
<key alias="goTo">該当のヘルプへ</key>
<key alias="helpTopicsFor">ヘルプトピック：</key>
<key alias="videoChaptersFor">ヘルプの動画：</key>
<key alias="theBestUmbracoVideoTutorials">動画によるチュートリアル</key>
</area>
<area alias="settings">
<key alias="defaulttemplate">既定のテンプレート</key>
<key alias="dictionary editor egenskab">ディクショナリのキー</key>
@@ -763,6 +787,10 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="sortPleaseWait"><![CDATA[ 項目の並べ替えには少し時間がかかります。しばらくお待ちください。<br/> <br/> 並び替え中はウィンドウを閉じないでください。]]></key>
</area>
<area alias="speechBubbles">
<key alias="operationFailedHeader">失敗しました</key>
<key alias="invalidUserPermissionsText">不十分なユーザー権限により操作を完了できませんでした</key>
<key alias="operationCancelledHeader">キャンセルされました</key>
<key alias="operationCancelledText">サードパーティのアドインにより操作はキャンセルされました</key>
<key alias="contentPublishedFailedByEvent">サードパーティのアドインにより公開はキャンセルされました</key>
<key alias="contentTypeDublicatePropertyType">プロパティの方は既に存在しています</key>
<key alias="contentTypePropertyTypeCreated">プロパティの型を作成しました</key>
OurUmbraco.Site/umbraco/config/lang/ru.xml
+10
View File
@@ -437,6 +437,12 @@
<area alias="headers">
<key alias="page">Страница</key>
</area>
<area alias="help">
<key alias="goTo">перейти к</key>
<key alias="helpTopicsFor">Разделы справки для</key>
<key alias="videoChaptersFor">Обучающие видео для</key>
<key alias="theBestUmbracoVideoTutorials">Лучшие обучающие видеокурсы по Umbraco</key>
</area>
<area alias="imagecropper">
<key alias="reset">Сбросить</key>
</area>
@@ -588,6 +594,10 @@
<key alias="clickToUpload">Нажмите, чтобы загрузить</key>
<key alias="dropFilesHere">Перетащите файлы сюда...</key>
</area>
<area alias="member">
<key alias="createNewMember">Создать нового участника</key>
<key alias="allMembers">Все участники</key>
</area>
<area alias="moveOrCopy">
<key alias="choose">Выберите страницу...</key>
<key alias="copyDone">Узел %0% был скопирован в %1%</key>
OurUmbraco.Site/umbraco/dialogs/editMacro.aspx
+2 -1
View File
@@ -4,6 +4,7 @@
<%@ Import Namespace="Umbraco.Core.Configuration" %>
<%@ Import Namespace="Umbraco.Web" %>
<%@ Import Namespace="Umbraco.Core" %>
<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
@@ -15,7 +16,7 @@
$(document).ready(function () {
Umbraco.Dialogs.EditMacro.getInstance().init({
useAspNetMasterPages: <%=UmbracoConfig.For.UmbracoSettings().Templates.UseAspNetMasterPages.ToString().ToLower() %>,
codeEditorElementId: "<%=Request.GetItemAsString("objectId")%>",
codeEditorElementId: "<%=Request.CleanForXss("objectId") %>",
renderingEngine: "<%=Request.GetItemAsString("renderingEngine", "Mvc")%>",
macroAlias: '<%= _macroAlias %>'
});
OurUmbraco.Site/umbraco/endPreview.aspx
+4 -3
View File
@@ -5,9 +5,7 @@
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);
@@ -17,7 +15,10 @@
{
Response.Redirect("/", true);
}
if (Request.QueryString["redir"].StartsWith("//"))
{
Response.Redirect("/", true);
}
Response.Redirect(url.ToString(), true);
}
OurUmbraco.Site/umbraco/js/umbraco.controllers.js
+79 -99
View File
@@ -99,7 +99,7 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
$timeout(function () {
//this can be null if they time out
if ($scope.user && $scope.user.emailHash) {
$scope.avatar = "//www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm";
$scope.avatar = "https://www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm";
}
});
$("#avatar-img").fadeTo(1000, 1);
@@ -608,16 +608,23 @@ function ContentEditDialogController($scope, editorState, $routeParams, $q, $tim
angular.module("umbraco")
.controller("Umbraco.Dialogs.Content.EditController", ContentEditDialogController);
angular.module("umbraco")
.controller("Umbraco.Dialogs.HelpController", function ($scope, $location, $routeParams, helpService, userService) {
.controller("Umbraco.Dialogs.HelpController", function ($scope, $location, $routeParams, helpService, userService, localizationService) {
$scope.section = $routeParams.section;
$scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
if(!$scope.section){
$scope.section ="content";
$scope.section = "content";
}
$scope.sectionName = $scope.section;
var rq = {};
rq.section = $scope.section;
//translate section name
localizationService.localize("sections_" + rq.section).then(function (value) {
$scope.sectionName = value;
});
userService.getCurrentUser().then(function(user){
@@ -2051,7 +2058,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.YsodController", YsodContr
*/
function LegacyController($scope, $routeParams, $element) {
var url = decodeURIComponent($routeParams.url.toLowerCase().replace(/javascript\:/g, ""));
var url = decodeURIComponent($routeParams.url.replace(/javascript\:/gi, ""));
//split into path and query
var urlParts = url.split("?");
var extIndex = urlParts[0].lastIndexOf(".");
@@ -3182,7 +3189,7 @@ function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeo
umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearchResults", {
searcherName: searcher.name,
query: searcher.searchText,
query: encodeURIComponent(searcher.searchText),
queryType: searcher.searchType
})),
'Failed to search')
@@ -4062,7 +4069,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Member.EditController", Me
* @description
* The controller for the member list view
*/
function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState) {
function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState, localizationService) {
//setup scope vars
$scope.currentSection = appState.getSectionState("currentSection");
@@ -4074,6 +4081,13 @@ function MemberListController($scope, $routeParams, $location, $q, $window, appS
$scope.loaded = true;
$scope.content = data;
//translate "All Members"
if ($scope.content != null && $scope.content.name != null && $scope.content.name.replace(" ", "").toLowerCase() == "allmembers") {
localizationService.localize("member_allMembers").then(function (value) {
$scope.content.name = value;
});
}
editorState.set($scope.content);
navigationService.syncTree({ tree: "member", path: data.path.split(",") }).then(function (syncArgs) {
@@ -5558,7 +5572,10 @@ angular.module("umbraco")
} else {
return val.slice(paddArray[0].length, 0);
}
}else{
} else {
if (paddArray[1].length === 0) {
return val.slice(paddArray[0].length);
}
return val.slice(paddArray[0].length, -paddArray[1].length);
}
}
@@ -5648,7 +5665,7 @@ angular.module("umbraco")
};
$scope.percentage = function(spans){
return ((spans / $scope.columns) * 100).toFixed(1);
return ((spans / $scope.columns) * 100).toFixed(8);
};
$scope.toggleCollection = function(collection, toggle){
@@ -5717,7 +5734,7 @@ function RowConfigController($scope) {
};
$scope.percentage = function(spans) {
return ((spans / $scope.columns) * 100).toFixed(1);
return ((spans / $scope.columns) * 100).toFixed(8);
};
$scope.toggleCollection = function(collection, toggle) {
@@ -5878,7 +5895,8 @@ angular.module("umbraco")
$scope.control.value = {
focalPoint: data.focalPoint,
id: data.id,
image: data.image
image: data.image,
altText: data.altText
};
$scope.setUrl();
@@ -6349,7 +6367,7 @@ angular.module("umbraco")
};
$scope.percentage = function (spans) {
return ((spans / $scope.model.config.items.columns) * 100).toFixed(1);
return ((spans / $scope.model.config.items.columns) * 100).toFixed(8);
};
@@ -6813,7 +6831,7 @@ angular.module("umbraco")
};
$scope.percentage = function(spans){
return ((spans / $scope.model.value.columns) * 100).toFixed(1);
return ((spans / $scope.model.value.columns) * 100).toFixed(8);
};
$scope.zeroWidthFilter = function (cell) {
@@ -7254,7 +7272,7 @@ function includePropsPreValsController($rootScope, $scope, localizationService,
angular.module("umbraco").controller("Umbraco.PrevalueEditors.IncludePropertiesListViewController", includePropsPreValsController);
function listViewController($rootScope, $scope, $routeParams, $injector, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState) {
function listViewController($rootScope, $scope, $routeParams, $injector, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState, $timeout, $q) {
//this is a quick check to see if we're in create mode, if so just exit - we cannot show children for content
// that isn't created yet, if we continue this will use the parent id in the route params which isn't what
@@ -7347,15 +7365,17 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
}
});
function showNotificationsAndReset(err, reload) {
function showNotificationsAndReset(err, reload, successMsg) {
//check if response is ysod
if(err.status && err.status >= 500) {
dialogService.ysodDialog(err);
}
$scope.bulkStatus = "";
$scope.actionInProgress = false;
$timeout(function() {
$scope.bulkStatus = "";
$scope.actionInProgress = false;
}, 500);
if (reload === true) {
$scope.reloadView($scope.contentId);
@@ -7366,6 +7386,9 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
notificationsService.showNotification(err.data.notifications[i]);
}
}
else if (successMsg) {
notificationsService.success("Done", successMsg);
}
}
$scope.isSortDirection = function (col, direction) {
@@ -7533,101 +7556,58 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
return iconHelper.convertFromLegacyIcon(entry.icon);
};
$scope.delete = function() {
var selected = _.filter($scope.listViewResultSet.items, function(item) {
function serial(selected, fn, getStatusMsg, index) {
return fn(selected, index).then(function (content) {
index++;
$scope.bulkStatus = getStatusMsg(index, selected.length);
return index < selected.length ? serial(selected, fn, getStatusMsg, index) : content;
}, function (err) {
var reload = index > 0;
showNotificationsAndReset(err, reload);
return err;
});
}
function applySelected(fn, getStatusMsg, getSuccessMsg, confirmMsg) {
var selected = _.filter($scope.listViewResultSet.items, function (item) {
return item.selected;
});
var total = selected.length;
if (total === 0) {
if (selected.length === 0)
return;
}
if (confirm("Sure you want to delete?") == true) {
$scope.actionInProgress = true;
$scope.bulkStatus = "Starting with delete";
var current = 1;
var pluralSuffix = total == 1 ? "" : "s";
for (var i = 0; i < selected.length; i++) {
$scope.bulkStatus = "Deleted item " + current + " out of " + total + " item" + pluralSuffix;
deleteItemCallback(getIdCallback(selected[i])).then(function (data) {
if (current === total) {
//TODO: Should probably add notifications on the server side
notificationsService.success("Bulk action", "Deleted " + total + " item" + pluralSuffix);
showNotificationsAndReset(data, true);
}
current++;
}, function (err) {
showNotificationsAndReset(err, false);
});
}
}
};
$scope.publish = function() {
var selected = _.filter($scope.listViewResultSet.items, function(item) {
return item.selected;
});
var total = selected.length;
if (total === 0) {
if (confirmMsg && !confirm(confirmMsg))
return;
}
$scope.actionInProgress = true;
$scope.bulkStatus = "Starting with publish";
var current = 1;
$scope.bulkStatus = getStatusMsg(0, selected.length);
var pluralSuffix = total == 1 ? "" : "s";
serial(selected, fn, getStatusMsg, 0).then(function (result) {
// executes once the whole selection has been processed
// in case of an error (caught by serial), result will be the error
if (!(result.data && angular.isArray(result.data.notifications)))
showNotificationsAndReset(result, true, getSuccessMsg(selected.length));
});
};
for (var i = 0; i < selected.length; i++) {
$scope.bulkStatus = "Publishing " + current + " out of " + total + " document" + pluralSuffix;
$scope.delete = function () {
applySelected(
function (selected, index) { return deleteItemCallback(getIdCallback(selected[index])) },
function (count, total) { return "Deleted " + count + " out of " + total + " document" + (total > 1 ? "s" : "") },
function (total) { return "Deleted " + total + " document" + (total > 1 ? "s" : "") },
"Sure you want to delete?");
};
contentResource.publishById(getIdCallback(selected[i]))
.then(function(content) {
if (current == total) {
notificationsService.success("Bulk action", "Published " + total + " document" + pluralSuffix);
showNotificationsAndReset(content, true);
}
current++;
}, function(err) {
showNotificationsAndReset(err, false);
});
}
$scope.publish = function () {
applySelected(
function (selected, index) { return contentResource.publishById(getIdCallback(selected[index])); },
function (count, total) { return "Published " + count + " out of " + total + " document" + (total > 1 ? "s" : "") },
function (total) { return "Published " + total + " document" + (total > 1 ? "s" : "") });
};
$scope.unpublish = function() {
var selected = _.filter($scope.listViewResultSet.items, function(item) {
return item.selected;
});
var total = selected.length;
if (total === 0) {
return;
}
$scope.actionInProgress = true;
$scope.bulkStatus = "Starting with publish";
var current = 1;
var pluralSuffix = total == 1 ? "" : "s";
for (var i = 0; i < selected.length; i++) {
$scope.bulkStatus = "Unpublishing " + current + " out of " + total + " document" + pluralSuffix;
contentResource.unPublish(getIdCallback(selected[i]))
.then(function(content) {
if (current == total) {
notificationsService.success("Bulk action", "Unpublished " + total + " document" + pluralSuffix);
showNotificationsAndReset(content, true);
}
current++;
}, function(err) {
showNotificationsAndReset(err, false);
});
}
applySelected(
function (selected, index) { return contentResource.unPublish(getIdCallback(selected[index])); },
function (count, total) { return "Unpublished " + count + " out of " + total + " document" + (total > 1 ? "s" : "") },
function (total) { return "Unpublished " + total + " document" + (total > 1 ? "s" : "") });
};
function getCustomPropertyValue(alias, properties) {
OurUmbraco.Site/umbraco/js/umbraco.directives.js
+1 -1
View File
@@ -991,7 +991,7 @@ function avatarDirective() {
scope.$watch("hash", function (val) {
//set the gravatar url
scope.gravatar = "//www.gravatar.com/avatar/" + val + "?s=40";
scope.gravatar = "https://www.gravatar.com/avatar/" + val + "?s=40";
});
}
OurUmbraco.Site/umbraco/js/umbraco.services.js
+46 -26
View File
@@ -736,13 +736,32 @@ angular.module('umbraco.services')
/**
* @ngdoc service
* @name umbraco.services.contentEditingHelper
* @description A helper service for most editors, some methods are specific to content/media/member model types but most are used by
* @description A helper service for most editors, some methods are specific to content/media/member model types but most are used by
* all editors to share logic and reduce the amount of replicated code among editors.
**/
function contentEditingHelper(fileManager, $q, $location, $routeParams, notificationsService, serverValidationManager, dialogService, formHelper, appState, keyboardService) {
function isValidIdentifier(id){
//empty id <= 0
if(angular.isNumber(id) && id > 0){
return true;
}
//empty guid
if(id === "00000000-0000-0000-0000-000000000000"){
return false;
}
//empty string / alias
if(id === ""){
return false;
}
return true;
}
return {
/** Used by the content editor and mini content editor to perform saving operations */
contentEditorPerformSave: function (args) {
if (!angular.isObject(args)) {
@@ -764,7 +783,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
var self = this;
var deferred = $q.defer();
if (!args.scope.busy && formHelper.submitForm({ scope: args.scope, statusMessage: args.statusMessage })) {
args.scope.busy = true;
@@ -805,9 +824,9 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
return deferred.promise;
},
/** Returns the action button definitions based on what permissions the user has.
The content.allowedActions parameter contains a list of chars, each represents a button by permission so
The content.allowedActions parameter contains a list of chars, each represents a button by permission so
here we'll build the buttons according to the chars of the user. */
configureContentEditorButtons: function (args) {
@@ -870,7 +889,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
handler: args.methods.unPublish
};
default:
return null;
return null;
}
}
@@ -894,8 +913,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
//Now we need to make the drop down button list, this is also slightly tricky because:
//We cannot have any buttons if there's no default button above.
//We cannot have the unpublish button (Z) when there's no publish permission.
//We cannot have the unpublish button (Z) when the item is not published.
//We cannot have the unpublish button (Z) when there's no publish permission.
//We cannot have the unpublish button (Z) when the item is not published.
if (buttons.defaultButton) {
//get the last index of the button order
@@ -908,7 +927,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}
//if we are not creating, then we should add unpublish too,
//if we are not creating, then we should add unpublish too,
// so long as it's already published and if the user has access to publish
if (!args.create) {
if (args.content.publishDate && _.contains(args.content.allowedActions, "U")) {
@@ -969,13 +988,13 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}
}
}
actions.push(defaultAction);
//Now we need to make the drop down button list, this is also slightly tricky because:
//We cannot have any buttons if there's no default button above.
//We cannot have the unpublish button (Z) when there's no publish permission.
//We cannot have the unpublish button (Z) when the item is not published.
//We cannot have the unpublish button (Z) when there's no publish permission.
//We cannot have the unpublish button (Z) when the item is not published.
if (defaultAction) {
//get the last index of the button order
var lastIndex = _.indexOf(actionOrder, defaultAction);
@@ -987,7 +1006,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}
}
//if we are not creating, then we should add unpublish too,
//if we are not creating, then we should add unpublish too,
// so long as it's already published and if the user has access to publish
if (!creating) {
if (content.publishDate && _.contains(content.allowedActions,"U")) {
@@ -1063,7 +1082,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
var allOrigProps = this.getAllProps(origContent);
var allNewProps = this.getAllProps(savedContent);
function getNewProp(alias) {
function getNewProp(alias) {
return _.find(allNewProps, function (item) {
return item.alias === alias;
});
@@ -1077,12 +1096,12 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
};
//check for changed built-in properties of the content
for (var o in origContent) {
//ignore the ones listed in the array
if (shouldIgnore(o)) {
continue;
}
if (!_.isEqual(origContent[o], savedContent[o])) {
origContent[o] = savedContent[o];
}
@@ -1096,8 +1115,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
//they have changed so set the origContent prop to the new one
var origVal = allOrigProps[p].value;
allOrigProps[p].value = newProp.value;
//instead of having a property editor $watch their expression to check if it has
//instead of having a property editor $watch their expression to check if it has
// been updated, instead we'll check for the existence of a special method on their model
// and just call it.
if (angular.isFunction(allOrigProps[p].onValueChanged)) {
@@ -1122,7 +1141,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
* A function to handle what happens when we have validation issues from the server side
*/
handleSaveError: function (args) {
if (!args.err) {
throw "args.err cannot be null";
}
@@ -1136,7 +1155,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
if (args.err.status === 400) {
//now we need to look through all the validation errors
if (args.err.data && (args.err.data.ModelState)) {
//wire up the server validation errs
formHelper.handleServerValidation(args.err.data.ModelState);
@@ -1148,7 +1167,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
if (args.rebindCallback && angular.isFunction(args.rebindCallback)) {
args.rebindCallback();
}
serverValidationManager.executeAndClearAllSubscriptions();
}
@@ -1187,7 +1206,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
}
if (!this.redirectToCreatedContent(args.redirectId ? args.redirectId : args.savedContent.id)) {
//we are not redirecting because this is not new content, it is existing content. In this case
// we need to detect what properties have changed and re-bind them with the server data.
//call the callback
@@ -1205,14 +1224,14 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
*
* @description
* Changes the location to be editing the newly created content after create was successful.
* We need to decide if we need to redirect to edito mode or if we will remain in create mode.
* We need to decide if we need to redirect to edito mode or if we will remain in create mode.
* We will only need to maintain create mode if we have not fulfilled the basic requirements for creating an entity which is at least having a name and ID
*/
redirectToCreatedContent: function (id, modelState) {
//only continue if we are currently in create mode and if there is no 'Name' modelstate errors
// since we need at least a name to create content.
if ($routeParams.create && (id > 0 && (!modelState || !modelState["Name"]))) {
if ($routeParams.create && (isValidIdentifier(id) && (!modelState || !modelState["Name"]))) {
//need to change the location to not be in 'create' mode. Currently the route will be something like:
// /belle/#/content/edit/1234?doctype=newsArticle&create=true
@@ -1221,7 +1240,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
//clear the query strings
$location.search("");
//change to new path
$location.path("/" + $routeParams.section + "/" + $routeParams.tree + "/" + $routeParams.method + "/" + id);
//don't add a browser history for this
@@ -1233,6 +1252,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
};
}
angular.module('umbraco.services').factory('contentEditingHelper', contentEditingHelper);
/**
* @ngdoc service
* @name umbraco.services.cropperHelper
@@ -7211,7 +7231,7 @@ angular.module('umbraco.services')
}
setCurrentUser(data);
currentUser.avatar = '//www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
currentUser.avatar = 'https://www.gravatar.com/avatar/' + data.emailHash + '?s=40&d=404';
deferred.resolve(currentUser);
});
OurUmbraco.Site/umbraco/lib/umbraco/LegacyUmbClientMgr.js
+5
View File
@@ -384,6 +384,11 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
//just call the native dialog close() method to remove the dialog
lastModal.close();
//if it's the last one close them all
if (this._modal.length == 0) {
getRootScope().$emit("app.closeDialogs", undefined);
}
}
else {
//instead of calling just the dialog service we funnel it through the global
OurUmbraco.Site/umbraco/plugins/umbracoContour/Views/Web.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<configuration>
<configSections>
OurUmbraco.Site/umbraco/settings/scripts/editScript.aspx
+4 -6
View File
@@ -1,6 +1,7 @@
<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true"
CodeBehind="editScript.aspx.cs" Inherits="umbraco.cms.presentation.settings.scripts.editScript"
ValidateRequest="False" %>
<%@ Import Namespace="Umbraco.Core" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
@@ -21,13 +22,10 @@
nameTxtBox: $('#<%= NameTxt.ClientID %>'),
originalFileName: '<%= NameTxt.Text %>',
saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",
editorSourceElement: $('#<%= editorSource.ClientID %>'),
text: {
fileErrorHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileErrorHeader")) %>',
fileSavedHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileSavedHeader")) %>',
fileSavedText: '',
fileErrorText: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileErrorText")) %>',
}
treeSyncPath: "<%= ScriptTreeSyncPath %>",
lttPathElement: $('#<%= lttPath.ClientID %>')
});
editor.init();
OurUmbraco.Site/umbraco/settings/stylesheet/editstylesheet.aspx
+5 -8
View File
@@ -1,5 +1,6 @@
<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" CodeBehind="editstylesheet.aspx.cs" AutoEventWireup="True"
Inherits="Umbraco.Web.UI.Umbraco.Settings.Stylesheet.EditStyleSheet" ValidateRequest="False" %>
<%@ Import Namespace="Umbraco.Core" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="cdf" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
@@ -13,16 +14,12 @@
$(document).ready(function () {
var editor = new Umbraco.Editors.EditStyleSheet({
nameTxtBox: $('#<%= NameTxt.ClientID %>'),
originalFileName: '<%= NameTxt.Text.Replace("\\", "\\\\") %>',
cssId: '<%= Request.QueryString["id"] %>',
originalFileName: '<%= NameTxt.Text %>',
saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
editorSourceElement: $('#<%= editorSource.ClientID %>'),
text: {
cssErrorHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssErrorHeader")) %>',
cssSavedHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssSavedHeader")) %>',
cssSavedText: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssSavedText")) %>',
cssErrorText: 'Please make sure that you have permissions set correctly',
}
restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",
treeSyncPath: "<%= TreeSyncPath %>",
lttPathElement: $('#<%= lttPath.ClientID %>')
});
editor.init();
OurUmbraco.Site/umbraco/settings/views/EditView.aspx
+1
View File
@@ -66,6 +66,7 @@
<cc1:Pane ID="Pane7" runat="server" >
<cc1:PropertyPanel ID="pp_name" runat="server">
<asp:Literal runat="server" ID="PathPrefix"></asp:Literal>
<asp:TextBox ID="NameTxt" runat="server"></asp:TextBox>
</cc1:PropertyPanel>
OurUmbraco.Site/umbraco_client/Editors/EditScript.js
+65 -41
View File
@@ -30,63 +30,87 @@
doSubmit: function () {
var self = this;
var fileName = this._opts.nameTxtBox.val();
var codeVal = this._opts.editorSourceElement.val();
var filename = this._opts.nameTxtBox.val();
var codeval = this._opts.editorSourceElement.val();
//if CodeMirror is not defined, then the code editor is disabled.
if (typeof (CodeMirror) != "undefined") {
codeVal = UmbEditor.GetCode();
codeval = UmbEditor.GetCode();
}
umbraco.presentation.webservices.codeEditorSave.SaveScript(
fileName, self._opts.originalFileName, codeVal,
function (t) { self.submitSucces(t); },
function (t) { self.submitFailure(t); });
this.save(
filename,
self._opts.originalFileName,
codeval);
},
submitSucces: function(t) {
save: function (filename, oldName, contents) {
var self = this;
if (t != 'true') {
top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText));
$.post(self._opts.restServiceLocation + "SaveScript",
JSON.stringify({
filename: filename,
oldName: oldName,
contents: contents
}),
function (e) {
if (e.success) {
self.submitSuccess(e);
} else {
self.submitFailure(e.message, e.header);
}
});
},
submitSuccess: function (args) {
var msg = args.message;
var header = args.header;
var path = this._opts.treeSyncPath;
var pathChanged = false;
if (args.path) {
if (path != args.path) {
pathChanged = true;
}
path = args.path;
}
if (args.contents) {
UmbEditor.SetCode(args.contents);
}
var newFilePath = this._opts.nameTxtBox.val();
//if the filename changes, we need to redirect since the file name is used in the url
if (this._opts.originalFileName != newFilePath) {
var newLocation = window.location.pathname + "?" + "&file=" + newFilePath;
UmbClientMgr.mainTree().setActiveTreeType("scripts");
if (pathChanged) {
// no! file is used in url so we need to redirect
//UmbClientMgr.mainTree().moveNode(this._opts.originalFileName, path);
//this._opts.treeSyncPath = args.path;
//this._opts.lttPathElement.prop("href", args.url).html(args.url);
UmbClientMgr.contentFrame(newLocation);
var qs = window.location.search;
if (qs.startsWith("?")) qs = qs.substring("?".length);
var qp1 = qs.split("&");
var qp2 = [];
for (var i = 0; i < qp1.length; i++)
if (!qp1[i].startsWith("file="))
qp2.push(qp1[i]);
//we need to do this after we navigate otherwise the navigation will wait unti lthe message timeout is done!
top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.fileSavedHeader), unescape(this._opts.text.fileSavedText));
var location = window.location.pathname + "?" + qp2.join("&") + "&file=" + args.name;
UmbClientMgr.contentFrame(location);
// need to do it after we navigate otherwise the navigation waits until the message timeout is done
top.UmbSpeechBubble.ShowMessage("save", header, msg);
}
else {
top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.fileSavedHeader), unescape(this._opts.text.fileSavedText));
UmbClientMgr.mainTree().setActiveTreeType('scripts');
//we need to create a list of ids for each folder/file. Each folder/file's id is it's full path so we need to build each one.
var paths = [];
var parts = this._opts.originalFileName.split('/');
for (var i = 0;i < parts.length;i++) {
if (paths.length > 0) {
paths.push(paths[i - 1] + "/" + parts[i]);
}
else {
paths.push(parts[i]);
}
}
//we need to pass in the newId parameter so it knows which node to resync after retreival from the server
UmbClientMgr.mainTree().syncTree("-1,init," + paths.join(','), true, null, newFilePath);
//set the original file path to the new one
this._opts.originalFileName = newFilePath;
top.UmbSpeechBubble.ShowMessage("save", header, msg);
this._opts.lttPathElement.prop("href", args.url).html(args.url);
this._opts.originalFileName = args.name;
this._opts.treeSyncPath = args.path;
UmbClientMgr.mainTree().syncTree(path, true);
}
//this._opts.lttPathElement.prop("href", args.url).html(args.url);
//this._opts.originalFileName = args.name;
},
submitFailure: function(t) {
top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText));
submitFailure: function(err, header) {
top.UmbSpeechBubble.ShowMessage('error', header, err);
}
});
})(jQuery);
OurUmbraco.Site/umbraco_client/Editors/EditStyleSheet.js
+63 -20
View File
@@ -30,37 +30,80 @@
doSubmit: function() {
var self = this;
var fileName = this._opts.nameTxtBox.val();
var codeVal = this._opts.editorSourceElement.val();
var filename = this._opts.nameTxtBox.val();
var codeval = this._opts.editorSourceElement.val();
//if CodeMirror is not defined, then the code editor is disabled.
if (typeof(CodeMirror) != "undefined") {
codeVal = UmbEditor.GetCode();
codeval = UmbEditor.GetCode();
}
umbraco.presentation.webservices.codeEditorSave.SaveCss(
fileName, self._opts.originalFileName, codeVal, 0,
function (t) { self.submitSucces(t, fileName); },
function(t) { self.submitFailure(t); });
this.save(
filename,
self._opts.originalFileName,
codeval);
},
submitSucces: function (t, fileName) {
if (t != 'true') {
top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText));
save: function (filename, oldName, contents) {
var self = this;
$.post(self._opts.restServiceLocation + "SaveStylesheet",
JSON.stringify({
filename: filename,
oldName: oldName,
contents: contents
}),
function (e) {
if (e.success) {
self.submitSuccess(e);
} else {
self.submitFailure(e.message, e.header);
}
});
},
submitSuccess: function (args) {
var msg = args.message;
var header = args.header;
var path = this._opts.treeSyncPath;
var pathChanged = false;
if (args.path) {
if (path != args.path) {
pathChanged = true;
}
path = args.path;
}
if (args.contents) {
UmbEditor.SetCode(args.contents);
}
UmbClientMgr.mainTree().setActiveTreeType("stylesheets");
if (pathChanged) {
// file is used in url so we need to redirect
var qs = window.location.search;
if (qs.startsWith("?")) qs = qs.substring("?".length);
var qp1 = qs.split("&");
var qp2 = [];
for (var i = 0; i < qp1.length; i++)
if (!qp1[i].startsWith("id="))
qp2.push(qp1[i]);
var location = window.location.pathname + "?" + qp2.join("&") + "&id=" + args.name;
UmbClientMgr.contentFrame(location);
// need to do it after we navigate otherwise the navigation waits until the message timeout is done
top.UmbSpeechBubble.ShowMessage("save", header, msg);
}
else {
top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.cssSavedHeader), unescape(this._opts.text.cssSavedText));
top.UmbSpeechBubble.ShowMessage("save", header, msg);
this._opts.lttPathElement.prop("href", args.url).html(args.url);
this._opts.originalFileName = args.name;
this._opts.treeSyncPath = args.path;
UmbClientMgr.mainTree().syncTree(path, true);
}
UmbClientMgr.mainTree().setActiveTreeType('stylesheets');
UmbClientMgr.mainTree().syncTree("-1,init," + fileName, true);
//update the originalFileName prop
this._opts.originalFileName = this._opts.nameTxtBox.val();
},
submitFailure: function(t) {
top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText));
submitFailure: function(err, header) {
top.UmbSpeechBubble.ShowMessage('error', header, err);
}
});
})(jQuery);
OurUmbraco.Site/umbraco_client/Editors/EditView.js
+2 -20
View File
@@ -8,24 +8,6 @@
//private methods/variables
_opts: null,
_updateNewFileProperties: function(filePath) {
/// <summary>Updates the current treeSyncPath and original file name to have the new file name</summary>
//update the originalFileName prop
this._opts.originalFileName = filePath;
//re-create the new path
var subPath = this._opts.treeSyncPath.split(",");
//remove the last element
subPath.pop();
//add the new element
var parts = filePath.split("/");
//remove the first bit which will either be "Partials" or "MacroPartials"
parts.shift();
subPath.push(parts.join("/"));
this._opts.treeSyncPath = subPath.join();
},
// Constructor
constructor: function (opts) {
// Merge options with default
@@ -207,8 +189,8 @@
top.UmbSpeechBubble.ShowMessage('save', header, msg);
//then we need to update our current tree sync path to represent the new one
this._updateNewFileProperties(newFilePath);
this._opts.originalFileName = args.name;
this._opts.treeSyncPath = args.path;
UmbClientMgr.mainTree().syncTree(path, true, null, newFilePath.split("/")[1]);
}
OurUmbraco/OurUmbraco.csproj
+36 -36
View File
@@ -38,8 +38,8 @@
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="businesslogic, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\businesslogic.dll</HintPath>
<Reference Include="businesslogic, Version=1.0.5750.18160, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\businesslogic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
@@ -50,12 +50,12 @@
<HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="cms, Version=1.0.5711.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\cms.dll</HintPath>
<Reference Include="cms, Version=1.0.5750.18161, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\cms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="controls, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\controls.dll</HintPath>
<Reference Include="controls, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
@@ -78,16 +78,16 @@
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.2.7.0\lib\net45\ImageProcessor.dll</HintPath>
<Reference Include="ImageProcessor, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.2.3.0.0\lib\net45\ImageProcessor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor.Web, Version=4.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.3.5.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Reference Include="ImageProcessor.Web, Version=4.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ImageProcessor.Web.4.4.0.0\lib\net45\ImageProcessor.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="interfaces, Version=1.0.5711.25000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\interfaces.dll</HintPath>
<Reference Include="interfaces, Version=1.0.5750.18155, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="JsonFx, Version=2.0.1209.2802, Culture=neutral, PublicKeyToken=315052dd637f8a52, processorArchitecture=MSIL">
@@ -95,7 +95,7 @@
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\log4net.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
@@ -111,7 +111,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=1.0.1559.20655, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -174,8 +174,8 @@
<HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SQLCE4Umbraco, Version=1.0.5711.25011, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\SQLCE4Umbraco.dll</HintPath>
<Reference Include="SQLCE4Umbraco, Version=1.0.5750.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\SQLCE4Umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@@ -184,11 +184,11 @@
<Reference Include="System.Core" />
<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.3.0-RC\lib\System.Data.SqlServerCe.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Drawing" />
@@ -249,43 +249,43 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\TidyNet.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\TidyNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco, Version=1.0.5711.25016, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.dll</HintPath>
<Reference Include="umbraco, Version=1.0.5750.18164, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Core, Version=1.0.5711.25005, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Core.dll</HintPath>
<Reference Include="Umbraco.Core, Version=1.0.5750.18157, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.DataLayer, Version=1.0.5711.25008, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.DataLayer.dll</HintPath>
<Reference Include="umbraco.DataLayer, Version=1.0.5750.18159, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.DataLayer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.editorControls, Version=1.0.5711.25019, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.editorControls.dll</HintPath>
<Reference Include="umbraco.editorControls, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.editorControls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.MacroEngines, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.MacroEngines.dll</HintPath>
<Reference Include="umbraco.MacroEngines, Version=1.0.5750.18166, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.MacroEngines.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="umbraco.providers, Version=1.0.5711.25013, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\umbraco.providers.dll</HintPath>
<Reference Include="umbraco.providers, Version=1.0.5750.18163, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\umbraco.providers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.Web.UI, Version=1.0.5711.25020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\Umbraco.Web.UI.dll</HintPath>
<Reference Include="Umbraco.Web.UI, Version=1.0.5750.18167, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\Umbraco.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UmbracoExamine, Version=0.7.0.25010, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UmbracoExamine.dll</HintPath>
<Reference Include="UmbracoExamine, Version=0.7.0.18162, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UmbracoExamine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.60829.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.7.3.0-RC\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.7.3.0\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WebMatrix.Data, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
OurUmbraco/packages.config
+4 -4
View File
@@ -7,8 +7,8 @@
<package id="EasyHttp" version="1.6.29.0" targetFramework="net451" />
<package id="Examine" version="0.1.68.0" targetFramework="net451" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net451" />
<package id="ImageProcessor" version="2.2.7.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.3.5.0" targetFramework="net451" />
<package id="ImageProcessor" version="2.3.0.0" targetFramework="net451" />
<package id="ImageProcessor.Web" version="4.4.0.0" targetFramework="net451" />
<package id="JsonFx" version="2.0.1209.2802" targetFramework="net451" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net451" />
<package id="MarkdownDeep.NET" version="1.5" targetFramework="net451" />
@@ -16,7 +16,7 @@
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net451" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net451" />
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0-beta1" targetFramework="net451" />
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="5.0.0" targetFramework="net451" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net451" />
@@ -42,7 +42,7 @@
<package id="RestSharp" version="104.1" targetFramework="net451" />
<package id="semver" version="1.1.2" targetFramework="net451" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0-RC" targetFramework="net451" />
<package id="UmbracoCms.Core" version="7.3.0" targetFramework="net451" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net451" />
<package id="YouTrackSharp" version="2.0.11.0" targetFramework="net451" />
</packages>