diff --git a/.github/workflows/build-visitor-groups.yml b/.github/workflows/build-visitor-groups.yml index fc0751d..7cb64ea 100644 --- a/.github/workflows/build-visitor-groups.yml +++ b/.github/workflows/build-visitor-groups.yml @@ -8,8 +8,8 @@ on: workflow_dispatch: env: - BUILD_NO: 1.4.0.${{ github.run_number }} - BUILD_NO_PRE: 1.4.0-rc.${{ github.run_number }} + BUILD_NO: 2.0.0.${{ github.run_number }} + BUILD_NO_PRE: 2.0.0-rc.${{ github.run_number }} jobs: build: @@ -25,7 +25,7 @@ jobs: dotnet-version: | 6.0.x 7.0.x - + 8.0.x - name: Build (Production) if: github.ref == 'refs/heads/main' run: dotnet build --configuration Release -p:Version=${{ env.BUILD_NO }} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..5c7247b --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,7 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [] +} \ No newline at end of file diff --git a/README.md b/README.md index 42216ad..dffc7c0 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,15 @@ # Visitor Groups for Optimizely Data Platform -Vistor groups for the Optimizely Data platform, supports Optimizely CMS 11 and 12. + +> If you are looking for documentation relevant to V1.* then please refer to the [legacy documentation](./docs/README-legacy.md). This version supports Optimizely CMS 11 and 12. [![ODP Visitor Groups](https://github.com/made-to-engage/ODP.VisitorGroups/actions/workflows/build-visitor-groups.yml/badge.svg?branch=main)](https://github.com/made-to-engage/ODP.VisitorGroups/actions/workflows/build-visitor-groups.yml) ## Features +Supports multiple ODP instances. + Visitor Groups for: - Real Time Segments - Engagement Rank @@ -27,11 +30,9 @@ Install the package directly from the Optimizely Nuget repository. ``` dotnet add package UNRVLD.ODP.VisitorGroups ``` -``` -Install-Package UNRVLD.ODP.VisitorGroups -``` -## Configuration (.NET 5.0/6.0) + +## Configuration *Startup.cs* ``` c# @@ -45,32 +46,26 @@ All settings are optional, apart from the PrivateApiKey { "EPiServer": { //Other config - "OdpVisitorGroupOptions": { - "OdpCookieName": "vuid", - "CacheTimeoutSeconds": 10, - "BaseEndPoint": "https://api.zaius.com", - "PrivateApiKey": "key-lives-here" - } + "OdpVisitorGroupOptions": { + "OdpCookieName": "vuid", + "CacheTimeoutSeconds": 10, + "SchemaCacheTimeoutSeconds": 86400, + "PopulationEstimateCacheTimeoutSeconds": 4320, + "OdpEndpoints": [ + { + "Name": "US", //Unique name for the instance + "BaseEndPoint": "https://api.zaius.com", + "PrivateApiKey": "..." + }, + { + "Name": "EU", + "BaseEndPoint": "https://api.zaius.eu", + "PrivateApiKey": "..." + }] + } } } ``` - -## Configuration (.Net Framework) - - -*web.config* -All settings are optional, apart from the PrivateApiKey -``` xml - - - - - - -``` - -You can also manage these with the [options admin module](https://world.optimizely.com/blogs/grzegorz-wiechec/dates/2020/3/configuring-options-from-admin-mode/) - --- ## Version History @@ -82,4 +77,5 @@ You can also manage these with the [options admin module](https://world.optimize |1.1.2|Ensure Visitor Group UI doesn’t break if invalid or missing API key| |1.2.0|Adds counts to the segments, indicating the number of matching profiles| |1.3.0|Load the RTS segment count async| - |1.4.0|Removed support for .net5
Moved minimum .net framework requirements to v4.7.1
Added support for .net7
Updated minimum version of RestSharp as this caused issues when later versions of optimizely and visitor groups.| \ No newline at end of file + |1.4.0|Removed support for .NET5
Moved minimum .net framework requirements to v4.7.1
Added support for .NET7
Updated minimum version of RestSharp as this caused issues when later versions of optimizely and visitor groups.| + |2.0.0|Added support for .NET8
Added support for multiple ODP instances | \ No newline at end of file diff --git a/VisitorGroups.sln b/VisitorGroups.sln index 78d0d0d..33c8597 100644 --- a/VisitorGroups.sln +++ b/VisitorGroups.sln @@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoSite461", "src\DemoSite461\DemoSite461.csproj", "{AFB17DE9-C385-4CAA-A4C5-CB051AD27C72}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{51612577-1690-4EC4-9B9A-F7EC2ABB511E}" ProjectSection(SolutionItems) = preProject .github\workflows\build-visitor-groups.yml = .github\workflows\build-visitor-groups.yml diff --git a/docs/README-legacy.md b/docs/README-legacy.md new file mode 100644 index 0000000..13ac8b5 --- /dev/null +++ b/docs/README-legacy.md @@ -0,0 +1,87 @@ +# Visitor Groups for Optimizely Data Platform + +> This document is for V1.* of the module. + +Vistor groups for the Optimizely Data platform, supports Optimizely CMS 11 and 12. + +[![ODP Visitor Groups](https://github.com/made-to-engage/ODP.VisitorGroups/actions/workflows/build-visitor-groups.yml/badge.svg?branch=main)](https://github.com/made-to-engage/ODP.VisitorGroups/actions/workflows/build-visitor-groups.yml) + + +## Features + +Visitor Groups for: +- Real Time Segments +- Engagement Rank +- Order Likelihood +- Winback zone +- Customer Properties (Text/Numeric) +- Observation + - Total Revenue + - Order Count + - Average Order Revenue + +---- + +## Installation + +Install the package directly from the Optimizely Nuget repository. + +``` +dotnet add package UNRVLD.ODP.VisitorGroups +``` +``` +Install-Package UNRVLD.ODP.VisitorGroups +``` + +## Configuration (.NET 5.0/6.0) + +*Startup.cs* +``` c# +// Adds the registration for visitor groups +services.AddODPVisitorGroups(); +``` + +*appsettings.json* +All settings are optional, apart from the PrivateApiKey +``` json +{ + "EPiServer": { + //Other config + "OdpVisitorGroupOptions": { + "OdpCookieName": "vuid", + "CacheTimeoutSeconds": 10, + "BaseEndPoint": "https://api.zaius.com", + "PrivateApiKey": "key-lives-here" + } + } +} +``` + +## Configuration (.Net Framework) + + +*web.config* +All settings are optional, apart from the PrivateApiKey +``` xml + + + + + + +``` + +You can also manage these with the [options admin module](https://world.optimizely.com/blogs/grzegorz-wiechec/dates/2020/3/configuring-options-from-admin-mode/) + + --- + ## Version History + + |Version| Details| + |:---|:---------------| + |1.0|Initial Release| + |1.1|Add new criterion (Customer Properties)
Support for .net6| + |1.1.1|Refactor code to deal with HttpContect access issue| + |1.1.2|Ensure Visitor Group UI doesn’t break if invalid or missing API key| + |1.2.0|Adds counts to the segments, indicating the number of matching profiles| + |1.3.0|Load the RTS segment count async| + |1.4.0|Removed support for .net5
Moved minimum .net framework requirements to v4.7.1
Added support for .net7
Updated minimum version of RestSharp as this caused issues when later versions of optimizely and visitor groups.| \ No newline at end of file diff --git a/src/DemoSite/Program.cs b/src/DemoSite/Program.cs index 3039a17..f4f432c 100644 --- a/src/DemoSite/Program.cs +++ b/src/DemoSite/Program.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; namespace DemoSite @@ -10,6 +11,11 @@ public class Program public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureCmsDefaults() - .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup()); + + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }).ConfigureAppConfiguration((ctx,config) => config.AddUserSecrets("2a3dc6de-40c9-422e-8226-46cc8caa54a9")) + ; } } diff --git a/src/DemoSite/Views/Shared/Layouts/_Root.cshtml b/src/DemoSite/Views/Shared/Layouts/_Root.cshtml index 4a29179..e8fe8b7 100644 --- a/src/DemoSite/Views/Shared/Layouts/_Root.cshtml +++ b/src/DemoSite/Views/Shared/Layouts/_Root.cshtml @@ -5,13 +5,6 @@ - - @@ -34,6 +27,35 @@ + + @if (Model.Layout.IsInReadonlyMode) { await Html.RenderPartialAsync("Readonly", Model); diff --git a/src/DemoSite/appsettings.Development.json b/src/DemoSite/appsettings.Development.json index 851770c..7edf6ca 100644 --- a/src/DemoSite/appsettings.Development.json +++ b/src/DemoSite/appsettings.Development.json @@ -25,10 +25,21 @@ } }, "OdpVisitorGroupOptions": { - "OdpCookieName": "vuid", - "CacheTimeoutSeconds": 1, - "BaseEndPoint": "https://api.zaius.com", - "PrivateApiKey": "key-lives-here" + "OdpCookieName": "vuid", + "CacheTimeoutSeconds": 10, + "SchemaCacheTimeoutSeconds": 86400, + "PopulationEstimateCacheTimeoutSeconds": 4320, + "OdpEndpoints": [ + { + "Name": "", + "BaseEndPoint": "https://api.zaius.eu", + "PrivateApiKey": "" + }, + { + "Name": "", + "BaseEndPoint": "https://api.zaius.eu", + "PrivateApiKey": "" + }] } } } diff --git a/src/DemoSite461/App_Data/DefaultSiteContent.episerverdata b/src/DemoSite461/App_Data/DefaultSiteContent.episerverdata deleted file mode 100644 index b360d87..0000000 Binary files a/src/DemoSite461/App_Data/DefaultSiteContent.episerverdata and /dev/null differ diff --git a/src/DemoSite461/App_Data/EPiServerDB_13705f33.mdf b/src/DemoSite461/App_Data/EPiServerDB_13705f33.mdf deleted file mode 100644 index a9f235c..0000000 Binary files a/src/DemoSite461/App_Data/EPiServerDB_13705f33.mdf and /dev/null differ diff --git a/src/DemoSite461/App_Data/EPiServerDB_13705f33_log.ldf b/src/DemoSite461/App_Data/EPiServerDB_13705f33_log.ldf deleted file mode 100644 index ebbd5de..0000000 Binary files a/src/DemoSite461/App_Data/EPiServerDB_13705f33_log.ldf and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/045f38066e5742cea59f28c28d39b5c6/ad15c26de9ae4961bb2684c9fc0e3a22.jpg b/src/DemoSite461/App_Data/blobs/045f38066e5742cea59f28c28d39b5c6/ad15c26de9ae4961bb2684c9fc0e3a22.jpg deleted file mode 100644 index 1b8105b..0000000 Binary files a/src/DemoSite461/App_Data/blobs/045f38066e5742cea59f28c28d39b5c6/ad15c26de9ae4961bb2684c9fc0e3a22.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/08c9dcfd3394439d81bef2e20761473a/0a3b3bfc98c644458cf557c98a999c1a.jpg b/src/DemoSite461/App_Data/blobs/08c9dcfd3394439d81bef2e20761473a/0a3b3bfc98c644458cf557c98a999c1a.jpg deleted file mode 100644 index 0cbe775..0000000 Binary files a/src/DemoSite461/App_Data/blobs/08c9dcfd3394439d81bef2e20761473a/0a3b3bfc98c644458cf557c98a999c1a.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/0b40ed6c544a4c3f8aff051a4ffc2843/1a8e1607451f46508bc92399484aac6b.png b/src/DemoSite461/App_Data/blobs/0b40ed6c544a4c3f8aff051a4ffc2843/1a8e1607451f46508bc92399484aac6b.png deleted file mode 100644 index 70a1d2b..0000000 Binary files a/src/DemoSite461/App_Data/blobs/0b40ed6c544a4c3f8aff051a4ffc2843/1a8e1607451f46508bc92399484aac6b.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/0b40ed6c544a4c3f8aff051a4ffc2843/1a8e1607451f46508bc92399484aac6b_Thumbnail.png b/src/DemoSite461/App_Data/blobs/0b40ed6c544a4c3f8aff051a4ffc2843/1a8e1607451f46508bc92399484aac6b_Thumbnail.png deleted file mode 100644 index 6d6c06d..0000000 Binary files a/src/DemoSite461/App_Data/blobs/0b40ed6c544a4c3f8aff051a4ffc2843/1a8e1607451f46508bc92399484aac6b_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/0cf747aff9cd4f988028a50713512ab9/2aedf124d98949208342b1ec395f07c3.png b/src/DemoSite461/App_Data/blobs/0cf747aff9cd4f988028a50713512ab9/2aedf124d98949208342b1ec395f07c3.png deleted file mode 100644 index 260350e..0000000 Binary files a/src/DemoSite461/App_Data/blobs/0cf747aff9cd4f988028a50713512ab9/2aedf124d98949208342b1ec395f07c3.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/0cf747aff9cd4f988028a50713512ab9/2aedf124d98949208342b1ec395f07c3_Thumbnail.png b/src/DemoSite461/App_Data/blobs/0cf747aff9cd4f988028a50713512ab9/2aedf124d98949208342b1ec395f07c3_Thumbnail.png deleted file mode 100644 index 79cc41b..0000000 Binary files a/src/DemoSite461/App_Data/blobs/0cf747aff9cd4f988028a50713512ab9/2aedf124d98949208342b1ec395f07c3_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/253459fa9b294efcacd88272f50ce2c1/4744fa764ccc4f51876166ac614abe10.png b/src/DemoSite461/App_Data/blobs/253459fa9b294efcacd88272f50ce2c1/4744fa764ccc4f51876166ac614abe10.png deleted file mode 100644 index ed8df6e..0000000 Binary files a/src/DemoSite461/App_Data/blobs/253459fa9b294efcacd88272f50ce2c1/4744fa764ccc4f51876166ac614abe10.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/3235538c569849038452b38d32ad3fb0/26d4468ea1a24ddcb287b129546bc9bb.png b/src/DemoSite461/App_Data/blobs/3235538c569849038452b38d32ad3fb0/26d4468ea1a24ddcb287b129546bc9bb.png deleted file mode 100644 index d7067d9..0000000 Binary files a/src/DemoSite461/App_Data/blobs/3235538c569849038452b38d32ad3fb0/26d4468ea1a24ddcb287b129546bc9bb.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/3235538c569849038452b38d32ad3fb0/26d4468ea1a24ddcb287b129546bc9bb_Thumbnail.png b/src/DemoSite461/App_Data/blobs/3235538c569849038452b38d32ad3fb0/26d4468ea1a24ddcb287b129546bc9bb_Thumbnail.png deleted file mode 100644 index 11a0f2e..0000000 Binary files a/src/DemoSite461/App_Data/blobs/3235538c569849038452b38d32ad3fb0/26d4468ea1a24ddcb287b129546bc9bb_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/3262931d865e46679d7327b6f266acd7/36444e66f2354570b131138f502e14d4.png b/src/DemoSite461/App_Data/blobs/3262931d865e46679d7327b6f266acd7/36444e66f2354570b131138f502e14d4.png deleted file mode 100644 index 22d9e6a..0000000 Binary files a/src/DemoSite461/App_Data/blobs/3262931d865e46679d7327b6f266acd7/36444e66f2354570b131138f502e14d4.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/365501d749ff405b84cd434dee52cca1/14a448bd83c44587807a4aab90d730b1.png b/src/DemoSite461/App_Data/blobs/365501d749ff405b84cd434dee52cca1/14a448bd83c44587807a4aab90d730b1.png deleted file mode 100644 index a0d6902..0000000 Binary files a/src/DemoSite461/App_Data/blobs/365501d749ff405b84cd434dee52cca1/14a448bd83c44587807a4aab90d730b1.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/3824956bf6fc445bbe783660b71ff258/c101fa5b5d844132bd6e0662c89fdd91.png b/src/DemoSite461/App_Data/blobs/3824956bf6fc445bbe783660b71ff258/c101fa5b5d844132bd6e0662c89fdd91.png deleted file mode 100644 index b8d71cb..0000000 Binary files a/src/DemoSite461/App_Data/blobs/3824956bf6fc445bbe783660b71ff258/c101fa5b5d844132bd6e0662c89fdd91.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/3824956bf6fc445bbe783660b71ff258/c101fa5b5d844132bd6e0662c89fdd91_Thumbnail.png b/src/DemoSite461/App_Data/blobs/3824956bf6fc445bbe783660b71ff258/c101fa5b5d844132bd6e0662c89fdd91_Thumbnail.png deleted file mode 100644 index 1a76f2f..0000000 Binary files a/src/DemoSite461/App_Data/blobs/3824956bf6fc445bbe783660b71ff258/c101fa5b5d844132bd6e0662c89fdd91_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/395e7f4f437948f9a1a2e2130686a8b2/f08006eb5ef94dcb812559722f8de4d0.jpg b/src/DemoSite461/App_Data/blobs/395e7f4f437948f9a1a2e2130686a8b2/f08006eb5ef94dcb812559722f8de4d0.jpg deleted file mode 100644 index d8f5230..0000000 Binary files a/src/DemoSite461/App_Data/blobs/395e7f4f437948f9a1a2e2130686a8b2/f08006eb5ef94dcb812559722f8de4d0.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/3b23eaba6f99403b9b5cdc633c53da7c/e5b75ca76f414e5a8a7b7ca19ee41841.png b/src/DemoSite461/App_Data/blobs/3b23eaba6f99403b9b5cdc633c53da7c/e5b75ca76f414e5a8a7b7ca19ee41841.png deleted file mode 100644 index 4b786f7..0000000 Binary files a/src/DemoSite461/App_Data/blobs/3b23eaba6f99403b9b5cdc633c53da7c/e5b75ca76f414e5a8a7b7ca19ee41841.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/3b23eaba6f99403b9b5cdc633c53da7c/e5b75ca76f414e5a8a7b7ca19ee41841_Thumbnail.png b/src/DemoSite461/App_Data/blobs/3b23eaba6f99403b9b5cdc633c53da7c/e5b75ca76f414e5a8a7b7ca19ee41841_Thumbnail.png deleted file mode 100644 index 110385a..0000000 Binary files a/src/DemoSite461/App_Data/blobs/3b23eaba6f99403b9b5cdc633c53da7c/e5b75ca76f414e5a8a7b7ca19ee41841_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/41ddfb78ede04868b08475b843589051/642752e9ab914dbc8bfbff7b158c1a0b.jpg b/src/DemoSite461/App_Data/blobs/41ddfb78ede04868b08475b843589051/642752e9ab914dbc8bfbff7b158c1a0b.jpg deleted file mode 100644 index cf509aa..0000000 Binary files a/src/DemoSite461/App_Data/blobs/41ddfb78ede04868b08475b843589051/642752e9ab914dbc8bfbff7b158c1a0b.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/53d3488f065c41489feda54634457002/7e0637ed94d34711a656619e53f487e8.png b/src/DemoSite461/App_Data/blobs/53d3488f065c41489feda54634457002/7e0637ed94d34711a656619e53f487e8.png deleted file mode 100644 index 567f701..0000000 Binary files a/src/DemoSite461/App_Data/blobs/53d3488f065c41489feda54634457002/7e0637ed94d34711a656619e53f487e8.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/53d3488f065c41489feda54634457002/7e0637ed94d34711a656619e53f487e8_Thumbnail.png b/src/DemoSite461/App_Data/blobs/53d3488f065c41489feda54634457002/7e0637ed94d34711a656619e53f487e8_Thumbnail.png deleted file mode 100644 index f5118b1..0000000 Binary files a/src/DemoSite461/App_Data/blobs/53d3488f065c41489feda54634457002/7e0637ed94d34711a656619e53f487e8_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/5668307e5f73480a99c5bbba7be692cc/364d4d07c3fa4f8db401ce9504688eec.png b/src/DemoSite461/App_Data/blobs/5668307e5f73480a99c5bbba7be692cc/364d4d07c3fa4f8db401ce9504688eec.png deleted file mode 100644 index 12f1c80..0000000 Binary files a/src/DemoSite461/App_Data/blobs/5668307e5f73480a99c5bbba7be692cc/364d4d07c3fa4f8db401ce9504688eec.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/66daf9c7e6ac4f09a944dca5041dd692/92c46e048fef43d6978fb9afed9f5aaa.jpg b/src/DemoSite461/App_Data/blobs/66daf9c7e6ac4f09a944dca5041dd692/92c46e048fef43d6978fb9afed9f5aaa.jpg deleted file mode 100644 index 1522513..0000000 Binary files a/src/DemoSite461/App_Data/blobs/66daf9c7e6ac4f09a944dca5041dd692/92c46e048fef43d6978fb9afed9f5aaa.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/691185fd263b4a4788e68c7ff66976c3/eb53bd3a3bd442d98db93e8d2c3fc1af.png b/src/DemoSite461/App_Data/blobs/691185fd263b4a4788e68c7ff66976c3/eb53bd3a3bd442d98db93e8d2c3fc1af.png deleted file mode 100644 index 2c57a5b..0000000 Binary files a/src/DemoSite461/App_Data/blobs/691185fd263b4a4788e68c7ff66976c3/eb53bd3a3bd442d98db93e8d2c3fc1af.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/691185fd263b4a4788e68c7ff66976c3/eb53bd3a3bd442d98db93e8d2c3fc1af_Thumbnail.png b/src/DemoSite461/App_Data/blobs/691185fd263b4a4788e68c7ff66976c3/eb53bd3a3bd442d98db93e8d2c3fc1af_Thumbnail.png deleted file mode 100644 index da286dd..0000000 Binary files a/src/DemoSite461/App_Data/blobs/691185fd263b4a4788e68c7ff66976c3/eb53bd3a3bd442d98db93e8d2c3fc1af_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/6a45c5231e0b4eb0a1006c4e677de92b/8fbb14eb5b8948fd80cbe9b6484ad482.mp4 b/src/DemoSite461/App_Data/blobs/6a45c5231e0b4eb0a1006c4e677de92b/8fbb14eb5b8948fd80cbe9b6484ad482.mp4 deleted file mode 100644 index 3d4d7e1..0000000 Binary files a/src/DemoSite461/App_Data/blobs/6a45c5231e0b4eb0a1006c4e677de92b/8fbb14eb5b8948fd80cbe9b6484ad482.mp4 and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/704e0193293647f6a4d5682091f59334/ecc95455fbcf46dfb11d8a8515dacf79.jpg b/src/DemoSite461/App_Data/blobs/704e0193293647f6a4d5682091f59334/ecc95455fbcf46dfb11d8a8515dacf79.jpg deleted file mode 100644 index 18bd1f6..0000000 Binary files a/src/DemoSite461/App_Data/blobs/704e0193293647f6a4d5682091f59334/ecc95455fbcf46dfb11d8a8515dacf79.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/74332dec4a2e450080926fd0c49c17b7/5af56c1426724c0ca388e9c2ea6399d0.jpg b/src/DemoSite461/App_Data/blobs/74332dec4a2e450080926fd0c49c17b7/5af56c1426724c0ca388e9c2ea6399d0.jpg deleted file mode 100644 index 1b8105b..0000000 Binary files a/src/DemoSite461/App_Data/blobs/74332dec4a2e450080926fd0c49c17b7/5af56c1426724c0ca388e9c2ea6399d0.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/74332dec4a2e450080926fd0c49c17b7/5af56c1426724c0ca388e9c2ea6399d0_Thumbnail.jpg b/src/DemoSite461/App_Data/blobs/74332dec4a2e450080926fd0c49c17b7/5af56c1426724c0ca388e9c2ea6399d0_Thumbnail.jpg deleted file mode 100644 index 3fa4b09..0000000 Binary files a/src/DemoSite461/App_Data/blobs/74332dec4a2e450080926fd0c49c17b7/5af56c1426724c0ca388e9c2ea6399d0_Thumbnail.jpg and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/787466b2a06047529b47e85912bc15ea/7dba176dd85e4d898462b6f11111b163.png b/src/DemoSite461/App_Data/blobs/787466b2a06047529b47e85912bc15ea/7dba176dd85e4d898462b6f11111b163.png deleted file mode 100644 index ce7b2e5..0000000 Binary files a/src/DemoSite461/App_Data/blobs/787466b2a06047529b47e85912bc15ea/7dba176dd85e4d898462b6f11111b163.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/787466b2a06047529b47e85912bc15ea/7dba176dd85e4d898462b6f11111b163_Thumbnail.png b/src/DemoSite461/App_Data/blobs/787466b2a06047529b47e85912bc15ea/7dba176dd85e4d898462b6f11111b163_Thumbnail.png deleted file mode 100644 index 1b45287..0000000 Binary files a/src/DemoSite461/App_Data/blobs/787466b2a06047529b47e85912bc15ea/7dba176dd85e4d898462b6f11111b163_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/919c24d81499477496232a2ea04f96fa/e6b6a9b869714ea485f3fd17c38b537f.png b/src/DemoSite461/App_Data/blobs/919c24d81499477496232a2ea04f96fa/e6b6a9b869714ea485f3fd17c38b537f.png deleted file mode 100644 index 4a24a58..0000000 Binary files a/src/DemoSite461/App_Data/blobs/919c24d81499477496232a2ea04f96fa/e6b6a9b869714ea485f3fd17c38b537f.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/9ebc08680e2e4c8997f228885e265f27/75b9ce805d054490bca033587498917a.png b/src/DemoSite461/App_Data/blobs/9ebc08680e2e4c8997f228885e265f27/75b9ce805d054490bca033587498917a.png deleted file mode 100644 index c2c310c..0000000 Binary files a/src/DemoSite461/App_Data/blobs/9ebc08680e2e4c8997f228885e265f27/75b9ce805d054490bca033587498917a.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/9ebc08680e2e4c8997f228885e265f27/75b9ce805d054490bca033587498917a_Thumbnail.png b/src/DemoSite461/App_Data/blobs/9ebc08680e2e4c8997f228885e265f27/75b9ce805d054490bca033587498917a_Thumbnail.png deleted file mode 100644 index a4d3776..0000000 Binary files a/src/DemoSite461/App_Data/blobs/9ebc08680e2e4c8997f228885e265f27/75b9ce805d054490bca033587498917a_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/a49e8b2106e54b5baa1805cb13cfd702/723817a183ac4ada82e87421f1bf4033.png b/src/DemoSite461/App_Data/blobs/a49e8b2106e54b5baa1805cb13cfd702/723817a183ac4ada82e87421f1bf4033.png deleted file mode 100644 index 613b11c..0000000 Binary files a/src/DemoSite461/App_Data/blobs/a49e8b2106e54b5baa1805cb13cfd702/723817a183ac4ada82e87421f1bf4033.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/a49e8b2106e54b5baa1805cb13cfd702/723817a183ac4ada82e87421f1bf4033_Thumbnail.png b/src/DemoSite461/App_Data/blobs/a49e8b2106e54b5baa1805cb13cfd702/723817a183ac4ada82e87421f1bf4033_Thumbnail.png deleted file mode 100644 index 175040c..0000000 Binary files a/src/DemoSite461/App_Data/blobs/a49e8b2106e54b5baa1805cb13cfd702/723817a183ac4ada82e87421f1bf4033_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/aafebf3c768a4536b8c06d0c943c5423/78e08f306fc44c03888da8bab14fee3e.png b/src/DemoSite461/App_Data/blobs/aafebf3c768a4536b8c06d0c943c5423/78e08f306fc44c03888da8bab14fee3e.png deleted file mode 100644 index e13682e..0000000 Binary files a/src/DemoSite461/App_Data/blobs/aafebf3c768a4536b8c06d0c943c5423/78e08f306fc44c03888da8bab14fee3e.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/aafebf3c768a4536b8c06d0c943c5423/78e08f306fc44c03888da8bab14fee3e_Thumbnail.png b/src/DemoSite461/App_Data/blobs/aafebf3c768a4536b8c06d0c943c5423/78e08f306fc44c03888da8bab14fee3e_Thumbnail.png deleted file mode 100644 index 70c17f8..0000000 Binary files a/src/DemoSite461/App_Data/blobs/aafebf3c768a4536b8c06d0c943c5423/78e08f306fc44c03888da8bab14fee3e_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/c1238e75676b4aeda046fa223480a2ae/6598d114649f403494a5e39ae0e52e12.png b/src/DemoSite461/App_Data/blobs/c1238e75676b4aeda046fa223480a2ae/6598d114649f403494a5e39ae0e52e12.png deleted file mode 100644 index ce7b2e5..0000000 Binary files a/src/DemoSite461/App_Data/blobs/c1238e75676b4aeda046fa223480a2ae/6598d114649f403494a5e39ae0e52e12.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/c1238e75676b4aeda046fa223480a2ae/6598d114649f403494a5e39ae0e52e12_Thumbnail.png b/src/DemoSite461/App_Data/blobs/c1238e75676b4aeda046fa223480a2ae/6598d114649f403494a5e39ae0e52e12_Thumbnail.png deleted file mode 100644 index ac1dff4..0000000 Binary files a/src/DemoSite461/App_Data/blobs/c1238e75676b4aeda046fa223480a2ae/6598d114649f403494a5e39ae0e52e12_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/c7b63c679f1648a682d09f2528f7eda3/ccdc110de0d64864b73fcb36c1b77a53.png b/src/DemoSite461/App_Data/blobs/c7b63c679f1648a682d09f2528f7eda3/ccdc110de0d64864b73fcb36c1b77a53.png deleted file mode 100644 index 87c24bf..0000000 Binary files a/src/DemoSite461/App_Data/blobs/c7b63c679f1648a682d09f2528f7eda3/ccdc110de0d64864b73fcb36c1b77a53.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/c7b63c679f1648a682d09f2528f7eda3/ccdc110de0d64864b73fcb36c1b77a53_Thumbnail.png b/src/DemoSite461/App_Data/blobs/c7b63c679f1648a682d09f2528f7eda3/ccdc110de0d64864b73fcb36c1b77a53_Thumbnail.png deleted file mode 100644 index 97e273a..0000000 Binary files a/src/DemoSite461/App_Data/blobs/c7b63c679f1648a682d09f2528f7eda3/ccdc110de0d64864b73fcb36c1b77a53_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/ca3d2669369e4789b1545673fc64bc50/73bc58da26334206b2fee86b6f7c0a65.png b/src/DemoSite461/App_Data/blobs/ca3d2669369e4789b1545673fc64bc50/73bc58da26334206b2fee86b6f7c0a65.png deleted file mode 100644 index 522e498..0000000 Binary files a/src/DemoSite461/App_Data/blobs/ca3d2669369e4789b1545673fc64bc50/73bc58da26334206b2fee86b6f7c0a65.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/ca3d2669369e4789b1545673fc64bc50/73bc58da26334206b2fee86b6f7c0a65_Thumbnail.png b/src/DemoSite461/App_Data/blobs/ca3d2669369e4789b1545673fc64bc50/73bc58da26334206b2fee86b6f7c0a65_Thumbnail.png deleted file mode 100644 index 9a173a6..0000000 Binary files a/src/DemoSite461/App_Data/blobs/ca3d2669369e4789b1545673fc64bc50/73bc58da26334206b2fee86b6f7c0a65_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/d315619f93384d87a13ba6169cdcc8a3/17183bbd93a049bb9911f4baeebeff3e.png b/src/DemoSite461/App_Data/blobs/d315619f93384d87a13ba6169cdcc8a3/17183bbd93a049bb9911f4baeebeff3e.png deleted file mode 100644 index 567f701..0000000 Binary files a/src/DemoSite461/App_Data/blobs/d315619f93384d87a13ba6169cdcc8a3/17183bbd93a049bb9911f4baeebeff3e.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/e7051a9eff034b0ea74beb9b3325778a/0e06c4e11a794b428ab4f881663b88e8.png b/src/DemoSite461/App_Data/blobs/e7051a9eff034b0ea74beb9b3325778a/0e06c4e11a794b428ab4f881663b88e8.png deleted file mode 100644 index 68dc571..0000000 Binary files a/src/DemoSite461/App_Data/blobs/e7051a9eff034b0ea74beb9b3325778a/0e06c4e11a794b428ab4f881663b88e8.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/f86b5db2c7e4457fa5b81bdb20134307/3654f95ce9c243b88a097eafa064ebda.png b/src/DemoSite461/App_Data/blobs/f86b5db2c7e4457fa5b81bdb20134307/3654f95ce9c243b88a097eafa064ebda.png deleted file mode 100644 index 522e498..0000000 Binary files a/src/DemoSite461/App_Data/blobs/f86b5db2c7e4457fa5b81bdb20134307/3654f95ce9c243b88a097eafa064ebda.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/f86b5db2c7e4457fa5b81bdb20134307/3654f95ce9c243b88a097eafa064ebda_Thumbnail.png b/src/DemoSite461/App_Data/blobs/f86b5db2c7e4457fa5b81bdb20134307/3654f95ce9c243b88a097eafa064ebda_Thumbnail.png deleted file mode 100644 index e7b31d2..0000000 Binary files a/src/DemoSite461/App_Data/blobs/f86b5db2c7e4457fa5b81bdb20134307/3654f95ce9c243b88a097eafa064ebda_Thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/App_Data/blobs/f9bf46fa09be4fbe904a1409df9e3795/930770cbd8c9437da02cb1c0468945c2.jpg b/src/DemoSite461/App_Data/blobs/f9bf46fa09be4fbe904a1409df9e3795/930770cbd8c9437da02cb1c0468945c2.jpg deleted file mode 100644 index c2d2148..0000000 Binary files a/src/DemoSite461/App_Data/blobs/f9bf46fa09be4fbe904a1409df9e3795/930770cbd8c9437da02cb1c0468945c2.jpg and /dev/null differ diff --git a/src/DemoSite461/Business/AdministratorRegistrationPage.cs b/src/DemoSite461/Business/AdministratorRegistrationPage.cs deleted file mode 100644 index a2aa471..0000000 --- a/src/DemoSite461/Business/AdministratorRegistrationPage.cs +++ /dev/null @@ -1,81 +0,0 @@ -using EPiServer.ServiceLocation; -using EPiServer.Shell.Security; -using Owin; -using System; -using System.Web; -using System.Web.Mvc; -using System.Web.Routing; - -namespace DemoSite -{ - public static class AdministratorRegistrationPage - { - private static Func _isLocalRequest = () => false; - - private static Lazy _isAnyUserRegistered = new Lazy(() => false); - - private static bool? _isEnabled = null; - - public static bool IsEnabled - { - get - { - if (_isEnabled.HasValue) - { - return _isEnabled.Value; - } - - var showUserRegistration = _isLocalRequest() && !_isAnyUserRegistered.Value; - if (!showUserRegistration) - { - _isEnabled = false; - } - - return showUserRegistration; - } - set - { - _isEnabled = value; - } - } - - public static void UseAdministratorRegistrationPage(this IAppBuilder app, Func isLocalRequest) - { - _isLocalRequest = isLocalRequest; - _isAnyUserRegistered = new Lazy(IsAnyUserRegistered); - GlobalFilters.Filters.Add(new RegistrationActionFilterAttribute()); - if (isLocalRequest()) - { - AddRoute(); - } - } - - private static bool IsAnyUserRegistered() - { - var provider = ServiceLocator.Current.GetInstance(); - int totalUsers = 0; - var res = provider.GetAllUsers(0, 1, out totalUsers); - return totalUsers > 0; - } - - public class RegistrationActionFilterAttribute : ActionFilterAttribute - { - public override void OnActionExecuting(ActionExecutingContext context) - { - var registerUrl = VirtualPathUtility.ToAbsolute("~/Register"); - if (IsEnabled && !context.RequestContext.HttpContext.Request.Path.StartsWith(registerUrl)) - { - context.Result = new RedirectResult(registerUrl); - } - } - } - - static void AddRoute() - { - var routeData = new RouteValueDictionary(); - routeData.Add("Controller", "Register"); - routeData.Add("action", "Index"); - RouteTable.Routes.Add("Register", new Route("Register", routeData, new MvcRouteHandler()) { RouteExistingFiles = false }); - } - } -} diff --git a/src/DemoSite461/Business/Channels/DisplayResolutionBase.cs b/src/DemoSite461/Business/Channels/DisplayResolutionBase.cs deleted file mode 100644 index 0a1e8b8..0000000 --- a/src/DemoSite461/Business/Channels/DisplayResolutionBase.cs +++ /dev/null @@ -1,54 +0,0 @@ -using EPiServer.Framework.Localization; -using EPiServer.ServiceLocation; -using EPiServer.Web; - -namespace DemoSite.Business.Channels -{ - /// - /// Base class for all resolution definitions - /// - public abstract class DisplayResolutionBase : IDisplayResolution - { - private Injected LocalizationService { get; set; } - - protected DisplayResolutionBase(string name, int width, int height) - { - Id = GetType().FullName; - Name = Translate(name); - Width = width; - Height = height; - } - - /// - /// Gets the unique ID for this resolution - /// - public string Id { get; protected set; } - - /// - /// Gets the name of resolution - /// - public string Name { get; protected set; } - - /// - /// Gets the resolution width in pixels - /// - public int Width { get; protected set; } - - /// - /// Gets the resolution height in pixels - /// - public int Height { get; protected set; } - - private string Translate(string resurceKey) - { - string value; - - if(!LocalizationService.Service.TryGetString(resurceKey, out value)) - { - value = resurceKey; - } - - return value; - } - } -} diff --git a/src/DemoSite461/Business/Channels/DisplayResolutions.cs b/src/DemoSite461/Business/Channels/DisplayResolutions.cs deleted file mode 100644 index 1625364..0000000 --- a/src/DemoSite461/Business/Channels/DisplayResolutions.cs +++ /dev/null @@ -1,42 +0,0 @@ -namespace DemoSite.Business.Channels -{ - /// - /// Defines resolution for desktop displays - /// - public class StandardResolution : DisplayResolutionBase - { - public StandardResolution() : base("/resolutions/standard", 1366, 768) - { - } - } - - /// - /// Defines resolution for a horizontal iPad - /// - public class IpadHorizontalResolution : DisplayResolutionBase - { - public IpadHorizontalResolution() : base("/resolutions/ipadhorizontal", 1024, 768) - { - } - } - - /// - /// Defines resolution for a vertical iPhone 5s - /// - public class IphoneVerticalResolution : DisplayResolutionBase - { - public IphoneVerticalResolution() : base("/resolutions/iphonevertical", 320, 568) - { - } - } - - /// - /// Defines resolution for a vertical Android handheld device - /// - public class AndroidVerticalResolution : DisplayResolutionBase - { - public AndroidVerticalResolution() : base("/resolutions/androidvertical", 480, 800) - { - } - } -} diff --git a/src/DemoSite461/Business/Channels/MobileChannel.cs b/src/DemoSite461/Business/Channels/MobileChannel.cs deleted file mode 100644 index 1eb672f..0000000 --- a/src/DemoSite461/Business/Channels/MobileChannel.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Web; -using System.Web.WebPages; -using EPiServer.Web; - -namespace DemoSite.Business.Channels -{ - // - //Defines the 'Mobile' content channel - // - public class MobileChannel : DisplayChannel - { - public const string Name = "mobile"; - - public override string ChannelName - { - get - { - return Name; - } - } - - public override string ResolutionId - { - get - { - return typeof(IphoneVerticalResolution).FullName; - } - } - - public override bool IsActive(HttpContextBase context) - { - return context.GetOverriddenBrowser().IsMobileDevice; - } - } -} diff --git a/src/DemoSite461/Business/Channels/WebChannel.cs b/src/DemoSite461/Business/Channels/WebChannel.cs deleted file mode 100644 index d0c2c0a..0000000 --- a/src/DemoSite461/Business/Channels/WebChannel.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Web; -using EPiServer.Web; - -namespace DemoSite.Business.Channels -{ - /// - /// Defines the 'Web' content channel - /// - public class WebChannel : DisplayChannel - { - public override string ChannelName - { - get - { - return "web"; - } - } - - public override bool IsActive(HttpContextBase context) - { - return !context.Request.Browser.IsMobileDevice; - } - } -} diff --git a/src/DemoSite461/Business/ContentExtensions.cs b/src/DemoSite461/Business/ContentExtensions.cs deleted file mode 100644 index 611519a..0000000 --- a/src/DemoSite461/Business/ContentExtensions.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using EPiServer.Core; -using EPiServer.Filters; -using EPiServer.Framework.Web; -using EPiServer.ServiceLocation; -using EPiServer; - -namespace DemoSite.Business -{ - /// - /// Extension methods for content - /// - public static class ContentExtensions - { - /// - /// Filters content which should not be visible to the user. - /// - public static IEnumerable FilterForDisplay(this IEnumerable contents, bool requirePageTemplate = false, bool requireVisibleInMenu = false) - where T : IContent - { - var accessFilter = new FilterAccess(); - var publishedFilter = new FilterPublished(); - contents = contents.Where(x => !publishedFilter.ShouldFilter(x) && !accessFilter.ShouldFilter(x)); - if (requirePageTemplate) - { - var templateFilter = ServiceLocator.Current.GetInstance(); - templateFilter.TemplateTypeCategories = TemplateTypeCategories.Page; - contents = contents.Where(x => !templateFilter.ShouldFilter(x)); - } - if (requireVisibleInMenu) - { - contents = contents.Where(x => VisibleInMenu(x)); - } - return contents; - } - - private static bool VisibleInMenu(IContent content) - { - var page = content as PageData; - if (page == null) - { - return true; - } - return page.VisibleInMenu; - } - } -} diff --git a/src/DemoSite461/Business/ContentLocator.cs b/src/DemoSite461/Business/ContentLocator.cs deleted file mode 100644 index 3ba0ab6..0000000 --- a/src/DemoSite461/Business/ContentLocator.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using DemoSite.Models.Pages; -using EPiServer; -using EPiServer.Core; -using EPiServer.Filters; -using EPiServer.Shell.Configuration; -using EPiServer.Web; - -namespace DemoSite.Business -{ - public class ContentLocator - { - private readonly IContentLoader _contentLoader; - private readonly IContentProviderManager _providerManager; - private readonly IPageCriteriaQueryService _pageCriteriaQueryService; - - public ContentLocator(IContentLoader contentLoader, IContentProviderManager providerManager, IPageCriteriaQueryService pageCriteriaQueryService) - { - _contentLoader = contentLoader; - _providerManager = providerManager; - _pageCriteriaQueryService = pageCriteriaQueryService; - } - - public virtual IEnumerable GetAll(ContentReference rootLink) - where T : PageData - { - var children = _contentLoader.GetChildren(rootLink); - foreach (var child in children) - { - var childOfRequestedTyped = child as T; - if (childOfRequestedTyped != null) - { - yield return childOfRequestedTyped; - } - foreach (var descendant in GetAll(child.ContentLink)) - { - yield return descendant; - } - } - } - - /// - /// Returns pages of a specific page type - /// - /// - /// - /// ID of the page type to filter by - /// - public IEnumerable FindPagesByPageType(PageReference pageLink, bool recursive, int pageTypeId) - { - if (ContentReference.IsNullOrEmpty(pageLink)) - { - throw new ArgumentNullException("pageLink", "No page link specified, unable to find pages"); - } - - var pages = recursive - ? FindPagesByPageTypeRecursively(pageLink, pageTypeId) - : _contentLoader.GetChildren(pageLink); - - return pages; - } - - // Type specified through page type ID - private IEnumerable FindPagesByPageTypeRecursively(PageReference pageLink, int pageTypeId) - { - var criteria = new PropertyCriteriaCollection - { - new PropertyCriteria - { - Name = "PageTypeID", - Type = PropertyDataType.PageType, - Condition = CompareCondition.Equal, - Value = pageTypeId.ToString(CultureInfo.InvariantCulture) - } - }; - - // Include content providers serving content beneath the page link specified for the search - if (_providerManager.ProviderMap.CustomProvidersExist) - { - var contentProvider = _providerManager.ProviderMap.GetProvider(pageLink); - - if (contentProvider.HasCapability(ContentProviderCapabilities.Search)) - { - criteria.Add(new PropertyCriteria - { - Name = "EPI:MultipleSearch", - Value = contentProvider.ProviderKey - }); - } - } - - return _pageCriteriaQueryService.FindPagesWithCriteria(pageLink, criteria); - } - - /// - /// Returns all contact pages beneath the main contacts container - /// - /// - public IEnumerable GetContactPages() - { - var contactsRootPageLink = _contentLoader.Get(SiteDefinition.Current.StartPage).ContactsPageLink; - - if (ContentReference.IsNullOrEmpty(contactsRootPageLink)) - { - throw new MissingConfigurationException("No contact page root specified in site settings, unable to retrieve contact pages"); - } - - return _contentLoader.GetChildren(contactsRootPageLink).OrderBy(p => p.PageName); - } - } -} diff --git a/src/DemoSite461/Business/EditorDescriptors/ContactPageSelectionFactory.cs b/src/DemoSite461/Business/EditorDescriptors/ContactPageSelectionFactory.cs deleted file mode 100644 index 4217c10..0000000 --- a/src/DemoSite461/Business/EditorDescriptors/ContactPageSelectionFactory.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using EPiServer.ServiceLocation; -using EPiServer.Shell.ObjectEditing; - -namespace DemoSite.Business.EditorDescriptors -{ - /// - /// Provides a list of options corresponding to ContactPage pages on the site - /// - /// - public class ContactPageSelectionFactory : ISelectionFactory - { - private Injected ContentLocator { get; set; } - - public IEnumerable GetSelections(ExtendedMetadata metadata) - { - var contactPages = ContentLocator.Service.GetContactPages(); - - return new List(contactPages.Select(c => new SelectItem {Value = c.PageLink, Text = c.Name})); - } - } -} diff --git a/src/DemoSite461/Business/EditorDescriptors/ContactPageSelector.cs b/src/DemoSite461/Business/EditorDescriptors/ContactPageSelector.cs deleted file mode 100644 index b820477..0000000 --- a/src/DemoSite461/Business/EditorDescriptors/ContactPageSelector.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using EPiServer.Core; -using EPiServer.Shell.ObjectEditing; -using EPiServer.Shell.ObjectEditing.EditorDescriptors; - -namespace DemoSite.Business.EditorDescriptors -{ - /// - /// Registers an editor to select a ContactPage for a PageReference property using a dropdown - /// - [EditorDescriptorRegistration(TargetType = typeof(PageReference), UIHint = Global.SiteUIHints.Contact)] - public class ContactPageSelector : EditorDescriptor - { - public override void ModifyMetadata(ExtendedMetadata metadata, IEnumerable attributes) - { - SelectionFactoryType = typeof(ContactPageSelectionFactory); - - ClientEditingClass = "epi-cms/contentediting/editors/SelectionEditor"; - - base.ModifyMetadata(metadata, attributes); - } - } -} diff --git a/src/DemoSite461/Business/EditorDescriptors/StringListEditorDescriptor.cs b/src/DemoSite461/Business/EditorDescriptors/StringListEditorDescriptor.cs deleted file mode 100644 index faccbb1..0000000 --- a/src/DemoSite461/Business/EditorDescriptors/StringListEditorDescriptor.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using EPiServer.Shell.ObjectEditing.EditorDescriptors; -using EPiServer.Shell.ObjectEditing; - -namespace DemoSite.Business.EditorDescriptors -{ - /// - /// Register an editor for StringList properties - /// - [EditorDescriptorRegistration(TargetType = typeof(String[]), UIHint = Global.SiteUIHints.Strings)] - public class StringListEditorDescriptor : EditorDescriptor - { - public override void ModifyMetadata(ExtendedMetadata metadata, IEnumerable attributes) - { - ClientEditingClass = "alloy/editors/StringList"; - - base.ModifyMetadata(metadata, attributes); - } - } -} diff --git a/src/DemoSite461/Business/IModifyLayout.cs b/src/DemoSite461/Business/IModifyLayout.cs deleted file mode 100644 index b65a263..0000000 --- a/src/DemoSite461/Business/IModifyLayout.cs +++ /dev/null @@ -1,13 +0,0 @@ -using DemoSite.Models.ViewModels; - -namespace DemoSite.Business -{ - /// - /// Defines a method which may be invoked by PageContextActionFilter allowing controllers - /// to modify common layout properties of the view model. - /// - interface IModifyLayout - { - void ModifyLayout(LayoutModel layoutModel); - } -} diff --git a/src/DemoSite461/Business/Initialization/BundleConfig.cs b/src/DemoSite461/Business/Initialization/BundleConfig.cs deleted file mode 100644 index b244fb2..0000000 --- a/src/DemoSite461/Business/Initialization/BundleConfig.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Web.Optimization; -using EPiServer.Framework; -using EPiServer.Framework.Initialization; - -namespace DemoSite.Business.Initialization -{ - [InitializableModule] - public class BundleConfig : IInitializableModule - { - public void Initialize(InitializationEngine context) - { - if (context.HostType == HostType.WebApplication) - { - RegisterBundles(BundleTable.Bundles); - } - } - - // For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254725 - public static void RegisterBundles(BundleCollection bundles) - { - bundles.Add(new ScriptBundle("~/bundles/js").Include( - "~/Static/js/jquery.js", //jquery.js can be removed and linked from CDN instead, we use a local one for demo purposes without internet connectionzz - "~/Static/js/bootstrap.js")); - - bundles.Add(new StyleBundle("~/bundles/css") - .Include("~/Static/css/bootstrap.css", new CssRewriteUrlTransform()) - .Include("~/Static/css/bootstrap-responsive.css") - .Include("~/Static/css/media.css") - .Include("~/Static/css/style.css", new CssRewriteUrlTransform()) - .Include("~/Static/css/editmode.css")); - } - - public void Uninitialize(InitializationEngine context) - { - } - - public void Preload(string[] parameters) - { - } - } -} diff --git a/src/DemoSite461/Business/Initialization/CustomizedRenderingInitialization.cs b/src/DemoSite461/Business/Initialization/CustomizedRenderingInitialization.cs deleted file mode 100644 index c97c7ff..0000000 --- a/src/DemoSite461/Business/Initialization/CustomizedRenderingInitialization.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Web.Mvc; -using EPiServer.Framework; -using EPiServer.Framework.Initialization; -using EPiServer.ServiceLocation; -using DemoSite.Business.Rendering; -using EPiServer.Web; - -namespace DemoSite.Business.Initialization -{ - /// - /// Module for customizing templates and rendering. - /// - [ModuleDependency(typeof(EPiServer.Web.InitializationModule))] - public class CustomizedRenderingInitialization : IInitializableModule - { - public void Initialize(InitializationEngine context) - { - //Add custom view engine allowing partials to be placed in additional locations - //Note that we add it first in the list to optimize view resolving when using DisplayFor/PropertyFor - ViewEngines.Engines.Insert(0, new SiteViewEngine()); - - context.Locate.TemplateResolver() - .TemplateResolved += TemplateCoordinator.OnTemplateResolved; - } - - public void Uninitialize(InitializationEngine context) - { - ServiceLocator.Current.GetInstance() - .TemplateResolved -= TemplateCoordinator.OnTemplateResolved; - } - - public void Preload(string[] parameters) - { - } - } -} diff --git a/src/DemoSite461/Business/Initialization/DependencyResolverInitialization.cs b/src/DemoSite461/Business/Initialization/DependencyResolverInitialization.cs deleted file mode 100644 index 2b6627a..0000000 --- a/src/DemoSite461/Business/Initialization/DependencyResolverInitialization.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Web.Mvc; -using EPiServer.Framework; -using EPiServer.Framework.Initialization; -using EPiServer.ServiceLocation; -using DemoSite.Business.Rendering; -using EPiServer.Web.Mvc; -using EPiServer.Web.Mvc.Html; - -namespace DemoSite.Business.Initialization -{ - [InitializableModule] - public class DependencyResolverInitialization : IConfigurableModule - { - public void ConfigureContainer(ServiceConfigurationContext context) - { - //Implementations for custom interfaces can be registered here. - - context.ConfigurationComplete += (o, e) => - { - //Register custom implementations that should be used in favour of the default implementations - context.Services.AddTransient() - .AddTransient(); - }; - } - - public void Initialize(InitializationEngine context) - { - DependencyResolver.SetResolver(new ServiceLocatorDependencyResolver(context.Locate.Advanced)); - } - - public void Uninitialize(InitializationEngine context) - { - } - - public void Preload(string[] parameters) - { - } - } -} diff --git a/src/DemoSite461/Business/Initialization/DisplayModesInitialization.cs b/src/DemoSite461/Business/Initialization/DisplayModesInitialization.cs deleted file mode 100644 index 568b1e6..0000000 --- a/src/DemoSite461/Business/Initialization/DisplayModesInitialization.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Linq; -using System.Web; -using System.Web.WebPages; -using EPiServer.Framework; -using EPiServer.Framework.Initialization; -using EPiServer.ServiceLocation; -using DemoSite.Business.Channels; -using EPiServer.Web; - -namespace DemoSite.Business.Initialization -{ - /// - /// Adds a new display mode for mobile which is active if the mobile channel is active in addition to if the request is from a mobile device (like the default one) - /// - /// - /// It's also possible to map a display mode as a channel through the DisplayChannelService.RegisterDisplayMode() method. - /// Adding channels that way does not however enable specifying ResolutionId which we want to do for the mobile channel. - /// - [ModuleDependency(typeof(EPiServer.Web.InitializationModule))] - public class DisplayModesInitialization : IInitializableModule - { - public void Initialize(InitializationEngine context) - { - var mobileChannelDisplayMode = new DefaultDisplayMode("mobile") - { - ContextCondition = IsMobileDisplayModeActive - }; - DisplayModeProvider.Instance.Modes.Insert(0, mobileChannelDisplayMode); - } - - private static bool IsMobileDisplayModeActive(HttpContextBase httpContext) - { - if (httpContext.GetOverriddenBrowser().IsMobileDevice) - { - return true; - } - var displayChannelService = ServiceLocator.Current.GetInstance(); - return displayChannelService.GetActiveChannels(httpContext).Any(x => x.ChannelName == MobileChannel.Name); - } - - public void Uninitialize(InitializationEngine context) - { - } - - public void Preload(string[] parameters) - { - } - } -} diff --git a/src/DemoSite461/Business/Initialization/DisplayRegistryInitialization.cs b/src/DemoSite461/Business/Initialization/DisplayRegistryInitialization.cs deleted file mode 100644 index 9940ef5..0000000 --- a/src/DemoSite461/Business/Initialization/DisplayRegistryInitialization.cs +++ /dev/null @@ -1,34 +0,0 @@ -using EPiServer.Framework; -using EPiServer.Framework.Initialization; -using EPiServer.ServiceLocation; -using EPiServer.Web; -using System.Collections.Generic; -using System.Web.Mvc; - -namespace DemoSite.Business.Initialization -{ - [InitializableModule] - [ModuleDependency(typeof(EPiServer.Web.InitializationModule))] - public class DisplayRegistryInitialization : IInitializableModule - { - public void Initialize(InitializationEngine context) - { - if (context.HostType == HostType.WebApplication) - { - // Register Display Options - var options = ServiceLocator.Current.GetInstance(); - options - .Add("full", "/displayoptions/full", Global.ContentAreaTags.FullWidth, "", "epi-icon__layout--full") - .Add("wide", "/displayoptions/wide", Global.ContentAreaTags.TwoThirdsWidth, "", "epi-icon__layout--two-thirds") - .Add("narrow", "/displayoptions/narrow", Global.ContentAreaTags.OneThirdWidth, "", "epi-icon__layout--one-third"); - - AreaRegistration.RegisterAllAreas(); - - } - } - - public void Preload(string[] parameters){} - - public void Uninitialize(InitializationEngine context){} - } -} diff --git a/src/DemoSite461/Business/Initialization/ExtendedTinyMceInitialization.cs b/src/DemoSite461/Business/Initialization/ExtendedTinyMceInitialization.cs deleted file mode 100644 index 091ec50..0000000 --- a/src/DemoSite461/Business/Initialization/ExtendedTinyMceInitialization.cs +++ /dev/null @@ -1,43 +0,0 @@ -using DemoSite.Models.Blocks; -using DemoSite.Models.Pages; -using EPiServer.Cms.TinyMce.Core; -using EPiServer.Framework; -using EPiServer.Framework.Initialization; -using EPiServer.ServiceLocation; - -namespace DemoSite.Business.Initialization -{ - [ModuleDependency(typeof(TinyMceInitialization))] - public class ExtendedTinyMceInitialization : IConfigurableModule - { - public void Initialize(InitializationEngine context) - { - } - - public void Uninitialize(InitializationEngine context) - { - } - - public void ConfigureContainer(ServiceConfigurationContext context) - { - context.Services.Configure(config => - { - // Add content CSS to the default settings. - config.Default() - .ContentCss("/static/css/editor.css"); - - // This will clone the default settings object and extend it by - // limiting the block formats for the MainBody property of an ArticlePage. - config.For(t => t.MainBody) - .BlockFormats("Paragraph=p;Header 1=h1;Header 2=h2;Header 3=h3"); - - // Passing a second argument to For<> will clone the given settings object - // instead of the default one and extend it with some basic toolbar commands. - config.For(t => t.MainBody, config.Empty()) - .AddEpiserverSupport() - .DisableMenubar() - .Toolbar("bold italic underline strikethrough"); - }); - } - } -} diff --git a/src/DemoSite461/Business/Initialization/FilterConfig.cs b/src/DemoSite461/Business/Initialization/FilterConfig.cs deleted file mode 100644 index 1e704d4..0000000 --- a/src/DemoSite461/Business/Initialization/FilterConfig.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Web.Mvc; -using EPiServer.Framework; -using EPiServer.Framework.Initialization; -using EPiServer.ServiceLocation; - -namespace DemoSite.Business.Initialization -{ - /// - /// Module for registering filters which will be applied to controller actions. - /// - [ModuleDependency(typeof(EPiServer.Web.InitializationModule))] - public class FilterConfig : IInitializableModule - { - public void Initialize(InitializationEngine context) - { - GlobalFilters.Filters.Add(ServiceLocator.Current.GetInstance()); - } - - public void Uninitialize(InitializationEngine context) - { - } - - public void Preload(string[] parameters) - { - } - } -} diff --git a/src/DemoSite461/Business/PageContextActionFilter.cs b/src/DemoSite461/Business/PageContextActionFilter.cs deleted file mode 100644 index 97a5c49..0000000 --- a/src/DemoSite461/Business/PageContextActionFilter.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Web.Mvc; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; -using EPiServer.Web.Routing; - -namespace DemoSite.Business -{ - /// - /// Intercepts actions with view models of type IPageViewModel and populates the view models - /// Layout and Section properties. - /// - /// - /// This filter frees controllers for pages from having to care about common context needed by layouts - /// and other page framework components allowing the controllers to focus on the specifics for the page types - /// and actions that they handle. - /// - public class PageContextActionFilter : IResultFilter - { - private readonly PageViewContextFactory _contextFactory; - public PageContextActionFilter(PageViewContextFactory contextFactory) - { - _contextFactory = contextFactory; - } - - public void OnResultExecuting(ResultExecutingContext filterContext) - { - var viewModel = filterContext.Controller.ViewData.Model; - - var model = viewModel as IPageViewModel; - if (model != null) - { - var currentContentLink = filterContext.RequestContext.GetContentLink(); - - var layoutModel = model.Layout ?? _contextFactory.CreateLayoutModel(currentContentLink, filterContext.RequestContext); - - var layoutController = filterContext.Controller as IModifyLayout; - if(layoutController != null) - { - layoutController.ModifyLayout(layoutModel); - } - - model.Layout = layoutModel; - - if (model.Section == null) - { - model.Section = _contextFactory.GetSection(currentContentLink); - } - } - } - - public void OnResultExecuted(ResultExecutedContext filterContext) - { - } - } -} diff --git a/src/DemoSite461/Business/PageTypeExtensions.cs b/src/DemoSite461/Business/PageTypeExtensions.cs deleted file mode 100644 index 10c3d63..0000000 --- a/src/DemoSite461/Business/PageTypeExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using EPiServer.DataAbstraction; -using EPiServer.ServiceLocation; - -namespace DemoSite.Business -{ - /// - /// Provides extension methods for types intended to be used when working with page types - /// - public static class PageTypeExtensions - { - /// - /// Returns the definition for a specific page type - /// - /// - /// - public static PageType GetPageType(this Type pageType) - { - var pageTypeRepository = ServiceLocator.Current.GetInstance>(); - - return pageTypeRepository.Load(pageType); - } - } -} diff --git a/src/DemoSite461/Business/PageViewContextFactory.cs b/src/DemoSite461/Business/PageViewContextFactory.cs deleted file mode 100644 index 58adbe5..0000000 --- a/src/DemoSite461/Business/PageViewContextFactory.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System.Linq; -using System.Web; -using System.Web.Mvc; -using System.Web.Routing; -using System.Web.Security; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; -using EPiServer; -using EPiServer.Core; -using EPiServer.Data; -using EPiServer.Web; -using EPiServer.Web.Routing; - -namespace DemoSite.Business -{ - public class PageViewContextFactory - { - private readonly IContentLoader _contentLoader; - private readonly UrlResolver _urlResolver; - private readonly IDatabaseMode _databaseMode; - - public PageViewContextFactory(IContentLoader contentLoader, UrlResolver urlResolver, IDatabaseMode databaseMode) - { - _contentLoader = contentLoader; - _urlResolver = urlResolver; - _databaseMode = databaseMode; - } - - public virtual LayoutModel CreateLayoutModel(ContentReference currentContentLink, RequestContext requestContext) - { - var startPageContentLink = SiteDefinition.Current.StartPage; - - // Use the content link with version information when editing the startpage, - // otherwise the published version will be used when rendering the props below. - if (currentContentLink.CompareToIgnoreWorkID(startPageContentLink)) - { - startPageContentLink = currentContentLink; - } - - var startPage = _contentLoader.Get(startPageContentLink); - - return new LayoutModel - { - Logotype = startPage.SiteLogotype, - LogotypeLinkUrl = new MvcHtmlString(_urlResolver.GetUrl(SiteDefinition.Current.StartPage)), - ProductPages = startPage.ProductPageLinks, - CompanyInformationPages = startPage.CompanyInformationPageLinks, - NewsPages = startPage.NewsPageLinks, - CustomerZonePages = startPage.CustomerZonePageLinks, - LoggedIn = requestContext.HttpContext.User.Identity.IsAuthenticated, - LoginUrl = new MvcHtmlString(GetLoginUrl(currentContentLink)), - SearchActionUrl = new MvcHtmlString(EPiServer.Web.Routing.UrlResolver.Current.GetUrl(startPage.SearchPageLink)), - IsInReadonlyMode = _databaseMode.DatabaseMode == DatabaseMode.ReadOnly - }; - } - - private string GetLoginUrl(ContentReference returnToContentLink) - { - return string.Format( - "{0}?ReturnUrl={1}", - (FormsAuthentication.IsEnabled ? FormsAuthentication.LoginUrl : VirtualPathUtility.ToAbsolute(Global.AppRelativeLoginPath)), - _urlResolver.GetUrl(returnToContentLink)); - } - - public virtual IContent GetSection(ContentReference contentLink) - { - var currentContent = _contentLoader.Get(contentLink); - if (currentContent.ParentLink != null && currentContent.ParentLink.CompareToIgnoreWorkID(SiteDefinition.Current.StartPage)) - { - return currentContent; - } - - return _contentLoader.GetAncestors(contentLink) - .OfType() - .SkipWhile(x => x.ParentLink == null || !x.ParentLink.CompareToIgnoreWorkID(SiteDefinition.Current.StartPage)) - .FirstOrDefault(); - } - } -} diff --git a/src/DemoSite461/Business/Rendering/AlloyContentAreaRenderer.cs b/src/DemoSite461/Business/Rendering/AlloyContentAreaRenderer.cs deleted file mode 100644 index f860a5a..0000000 --- a/src/DemoSite461/Business/Rendering/AlloyContentAreaRenderer.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Web.Mvc; -using EPiServer.Core; -using EPiServer.Core.Html.StringParsing; -using EPiServer.Web; -using EPiServer.Web.Mvc; -using EPiServer.Web.Mvc.Html; -using EPiServer; - -namespace DemoSite.Business.Rendering -{ - /// - /// Extends the default to apply custom CSS classes to each . - /// - public class AlloyContentAreaRenderer : ContentAreaRenderer - { - protected override string GetContentAreaItemCssClass(HtmlHelper htmlHelper, ContentAreaItem contentAreaItem) - { - var baseItemClass = base.GetContentAreaItemCssClass(htmlHelper, contentAreaItem); - - var tag = GetContentAreaItemTemplateTag(htmlHelper, contentAreaItem); - return $"block {baseItemClass} {GetTypeSpecificCssClasses(contentAreaItem, ContentRepository)} {GetCssClassForTag(tag)} {tag}"; - } - - /// - /// Gets a CSS class used for styling based on a tag name (ie a Bootstrap class name) - /// - /// Any tag name available, see - private static string GetCssClassForTag(string tagName) - { - if (string.IsNullOrEmpty(tagName)) - { - return ""; - } - switch (tagName.ToLower()) - { - case "span12": - return "full"; - case "span8": - return "wide"; - case "span6": - return "half"; - default: - return string.Empty; - } - } - - private static string GetTypeSpecificCssClasses(ContentAreaItem contentAreaItem, IContentRepository contentRepository) - { - var content = contentAreaItem.GetContent(); - var cssClass = content == null ? String.Empty : content.GetOriginalType().Name.ToLowerInvariant(); - - var customClassContent = content as ICustomCssInContentArea; - if (customClassContent != null && !string.IsNullOrWhiteSpace(customClassContent.ContentAreaCssClass)) - { - cssClass += string.Format(" {0}", customClassContent.ContentAreaCssClass); - } - - return cssClass; - } - } -} diff --git a/src/DemoSite461/Business/Rendering/ErrorHandlingContentRenderer.cs b/src/DemoSite461/Business/Rendering/ErrorHandlingContentRenderer.cs deleted file mode 100644 index f68a81c..0000000 --- a/src/DemoSite461/Business/Rendering/ErrorHandlingContentRenderer.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; -using System.IO; -using System.Web; -using System.Web.Mvc; -using System.Web.Mvc.Html; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.Security; -using DemoSite.Models.ViewModels; -using EPiServer.Web.Mvc; - -namespace DemoSite.Business.Rendering -{ - /// - /// Wraps an MvcContentRenderer and adds error handling to ensure that blocks and other content - /// rendered as parts of pages won't crash the entire page if a non-critical exception occurs while rendering it. - /// - /// - /// Prints an error message for editors so that they can easily report errors to developers. - /// - public class ErrorHandlingContentRenderer : IContentRenderer - { - private readonly MvcContentRenderer _mvcRenderer; - public ErrorHandlingContentRenderer(MvcContentRenderer mvcRenderer) - { - _mvcRenderer = mvcRenderer; - } - - /// - /// Renders the contentData using the wrapped renderer and catches common, non-critical exceptions. - /// - public void Render(HtmlHelper helper, PartialRequest partialRequestHandler, IContentData contentData, TemplateModel templateModel) - { - try - { - _mvcRenderer.Render(helper, partialRequestHandler, contentData, templateModel); - } - catch (NullReferenceException ex) - { - if (HttpContext.Current.IsDebuggingEnabled) - { - //If debug="true" we assume a developer is making the request - throw; - } - HandlerError(helper, contentData, ex); - } - catch (ArgumentException ex) - { - if (HttpContext.Current.IsDebuggingEnabled) - { - throw; - } - HandlerError(helper, contentData, ex); - } - catch (ApplicationException ex) - { - if (HttpContext.Current.IsDebuggingEnabled) - { - throw; - } - HandlerError(helper, contentData, ex); - } - catch (InvalidOperationException ex) - { - if (HttpContext.Current.IsDebuggingEnabled) - { - throw; - } - HandlerError(helper, contentData, ex); - } - catch (NotImplementedException ex) - { - if (HttpContext.Current.IsDebuggingEnabled) - { - throw; - } - HandlerError(helper, contentData, ex); - } - catch (IOException ex) - { - if (HttpContext.Current.IsDebuggingEnabled) - { - throw; - } - HandlerError(helper, contentData, ex); - } - catch (EPiServerException ex) - { - if (HttpContext.Current.IsDebuggingEnabled) - { - throw; - } - HandlerError(helper, contentData, ex); - } - } - - private void HandlerError(HtmlHelper helper, IContentData contentData, Exception renderingException) - { - if (PrincipalInfo.HasEditAccess) - { - var errorModel = new ContentRenderingErrorModel(contentData, renderingException); - helper.RenderPartial("TemplateError", errorModel); - } - } - } -} diff --git a/src/DemoSite461/Business/Rendering/IContainerPage.cs b/src/DemoSite461/Business/Rendering/IContainerPage.cs deleted file mode 100644 index cf0eb55..0000000 --- a/src/DemoSite461/Business/Rendering/IContainerPage.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace DemoSite.Business.Rendering -{ - /// - /// Marker interface for content types which should not be handled by DefaultPageController. - /// - interface IContainerPage - { - } -} diff --git a/src/DemoSite461/Business/Rendering/ICustomCssInContentArea.cs b/src/DemoSite461/Business/Rendering/ICustomCssInContentArea.cs deleted file mode 100644 index a06acaa..0000000 --- a/src/DemoSite461/Business/Rendering/ICustomCssInContentArea.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace DemoSite.Business.Rendering -{ - /// - /// Defines a property for CSS class(es) which will be added to the class - /// attribute of containing elements when rendered in a content area with a size tag. - /// - interface ICustomCssInContentArea - { - string ContentAreaCssClass { get; } - } -} diff --git a/src/DemoSite461/Business/Rendering/SiteViewEngine.cs b/src/DemoSite461/Business/Rendering/SiteViewEngine.cs deleted file mode 100644 index d5818ae..0000000 --- a/src/DemoSite461/Business/Rendering/SiteViewEngine.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Linq; -using System.Web.Mvc; - -namespace DemoSite.Business.Rendering -{ - /// - /// Extends the Razor view engine to include the folders ~/Views/Shared/Blocks/ and ~/Views/Shared/PagePartials/ - /// when looking for partial views. - /// - public class SiteViewEngine : RazorViewEngine - { - private static readonly string[] AdditionalPartialViewFormats = new[] - { - TemplateCoordinator.BlockFolder + "{0}.cshtml", - TemplateCoordinator.PagePartialsFolder + "{0}.cshtml" - }; - - public SiteViewEngine() - { - PartialViewLocationFormats = PartialViewLocationFormats.Union(AdditionalPartialViewFormats).ToArray(); - } - } -} diff --git a/src/DemoSite461/Business/Rendering/TemplateCoordinator.cs b/src/DemoSite461/Business/Rendering/TemplateCoordinator.cs deleted file mode 100644 index f8faa3b..0000000 --- a/src/DemoSite461/Business/Rendering/TemplateCoordinator.cs +++ /dev/null @@ -1,100 +0,0 @@ -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.ServiceLocation; -using DemoSite.Controllers; -using DemoSite.Models.Blocks; -using DemoSite.Models.Pages; -using EPiServer.Web; -using EPiServer.Web.Mvc; - -namespace DemoSite.Business.Rendering -{ - [ServiceConfiguration(typeof(IViewTemplateModelRegistrator))] - public class TemplateCoordinator : IViewTemplateModelRegistrator - { - public const string BlockFolder = "~/Views/Shared/Blocks/"; - public const string PagePartialsFolder = "~/Views/Shared/PagePartials/"; - - public static void OnTemplateResolved(object sender, TemplateResolverEventArgs args) - { - //Disable DefaultPageController for page types that shouldn't have any renderer as pages - if (args.ItemToRender is IContainerPage && args.SelectedTemplate != null && args.SelectedTemplate.TemplateType == typeof(DefaultPageController)) - { - args.SelectedTemplate = null; - } - } - - /// - /// Registers renderers/templates which are not automatically discovered, - /// i.e. partial views whose names does not match a content type's name. - /// - /// - /// Using only partial views instead of controllers for blocks and page partials - /// has performance benefits as they will only require calls to RenderPartial instead of - /// RenderAction for controllers. - /// Registering partial views as templates this way also enables specifying tags and - /// that a template supports all types inheriting from the content type/model type. - /// - public void Register(TemplateModelCollection viewTemplateModelRegistrator) - { - viewTemplateModelRegistrator.Add(typeof(JumbotronBlock), new TemplateModel - { - Tags = new[] { Global.ContentAreaTags.FullWidth }, - AvailableWithoutTag = false, - Path = BlockPath("JumbotronBlockWide.cshtml") - }); - - viewTemplateModelRegistrator.Add(typeof(TeaserBlock), new TemplateModel - { - Name = "TeaserBlockWide", - Tags = new[] { Global.ContentAreaTags.TwoThirdsWidth, Global.ContentAreaTags.FullWidth }, - AvailableWithoutTag = false, - Path = BlockPath("TeaserBlockWide.cshtml") - }); - - viewTemplateModelRegistrator.Add(typeof(SitePageData), new TemplateModel - { - Name = "PagePartial", - Inherit = true, - AvailableWithoutTag = true, - Path = PagePartialPath("Page.cshtml") - }); - - viewTemplateModelRegistrator.Add(typeof(SitePageData), new TemplateModel - { - Name = "PagePartialWide", - Inherit = true, - Tags = new[] { Global.ContentAreaTags.TwoThirdsWidth, Global.ContentAreaTags.FullWidth }, - AvailableWithoutTag = false, - Path = PagePartialPath("PageWide.cshtml") - }); - - viewTemplateModelRegistrator.Add(typeof(ContactPage), new TemplateModel - { - Name = "ContactPagePartialWide", - Tags = new[] { Global.ContentAreaTags.TwoThirdsWidth, Global.ContentAreaTags.FullWidth }, - AvailableWithoutTag = false, - Path = PagePartialPath("ContactPageWide.cshtml") - }); - - viewTemplateModelRegistrator.Add(typeof(IContentData), new TemplateModel - { - Name = "NoRendererMessage", - Inherit = true, - Tags = new[] { Global.ContentAreaTags.NoRenderer }, - AvailableWithoutTag = false, - Path = BlockPath("NoRenderer.cshtml") - }); - } - - private static string BlockPath(string fileName) - { - return string.Format("{0}{1}", BlockFolder, fileName); - } - - private static string PagePartialPath(string fileName) - { - return string.Format("{0}{1}", PagePartialsFolder, fileName); - } - } -} diff --git a/src/DemoSite461/Business/SearchService.cs b/src/DemoSite461/Business/SearchService.cs deleted file mode 100644 index 9bcd62e..0000000 --- a/src/DemoSite461/Business/SearchService.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System.Collections.Generic; -using System.Web; -using EPiServer.Core; -using EPiServer.Search; -using EPiServer.Search.Queries; -using EPiServer.Search.Queries.Lucene; -using EPiServer.Security; -using EPiServer; -using EPiServer.ServiceLocation; - -namespace DemoSite.Business -{ - public class SearchService - { - private readonly SearchHandler _searchHandler; - private readonly IContentLoader _contentLoader; - - public SearchService(SearchHandler searchHandler, IContentLoader contentLoader) - { - _searchHandler = searchHandler; - _contentLoader = contentLoader; - } - - public virtual bool IsActive - { - get { return ServiceLocator.Current.GetInstance().Active; } - } - - public virtual SearchResults Search(string searchText, IEnumerable searchRoots, HttpContextBase context, string languageBranch, int maxResults) - { - var query = CreateQuery(searchText, searchRoots, context, languageBranch); - return _searchHandler.GetSearchResults(query, 1, maxResults); - } - - private IQueryExpression CreateQuery(string searchText, IEnumerable searchRoots, HttpContextBase context, string languageBranch) - { - //Main query which groups other queries. Each query added - //must match in order for a page or file to be returned. - var query = new GroupQuery(LuceneOperator.AND); - - //Add free text query to the main query - query.QueryExpressions.Add(new FieldQuery(searchText)); - - //Search for pages using the provided language - var pageTypeQuery = new GroupQuery(LuceneOperator.AND); - pageTypeQuery.QueryExpressions.Add(new ContentQuery()); - pageTypeQuery.QueryExpressions.Add(new FieldQuery(languageBranch, Field.Culture)); - - //Search for media without languages - var contentTypeQuery = new GroupQuery(LuceneOperator.OR); - contentTypeQuery.QueryExpressions.Add(new ContentQuery()); - contentTypeQuery.QueryExpressions.Add(pageTypeQuery); - - query.QueryExpressions.Add(contentTypeQuery); - - //Create and add query which groups type conditions using OR - var typeQueries = new GroupQuery(LuceneOperator.OR); - query.QueryExpressions.Add(typeQueries); - - foreach (var root in searchRoots) - { - var contentRootQuery = new VirtualPathQuery(); - contentRootQuery.AddContentNodes(root); - typeQueries.QueryExpressions.Add(contentRootQuery); - } - - var accessRightsQuery = new AccessControlListQuery(); - accessRightsQuery.AddAclForUser(PrincipalInfo.Current, context); - query.QueryExpressions.Add(accessRightsQuery); - - return query; - } - } -} diff --git a/src/DemoSite461/Business/ServiceLocatorDependencyResolver.cs b/src/DemoSite461/Business/ServiceLocatorDependencyResolver.cs deleted file mode 100644 index a686055..0000000 --- a/src/DemoSite461/Business/ServiceLocatorDependencyResolver.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web.Mvc; -using EPiServer.ServiceLocation; - -namespace DemoSite.Business -{ - public class ServiceLocatorDependencyResolver : IDependencyResolver - { - readonly IServiceLocator _serviceLocator; - - public ServiceLocatorDependencyResolver(IServiceLocator serviceLocator) - { - _serviceLocator = serviceLocator; - } - - public object GetService(Type serviceType) - { - if (serviceType.IsInterface || serviceType.IsAbstract) - { - return GetInterfaceService(serviceType); - } - return GetConcreteService(serviceType); - } - - private object GetConcreteService(Type serviceType) - { - try - { - // Can't use TryGetInstance here because it won’t create concrete types - return _serviceLocator.GetInstance(serviceType); - } - catch (ActivationException) - { - return null; - } - } - - private object GetInterfaceService(Type serviceType) - { - object instance; - return _serviceLocator.TryGetExistingInstance(serviceType, out instance) ? instance : null; - } - - public IEnumerable GetServices(Type serviceType) - { - return _serviceLocator.GetAllInstances(serviceType).Cast(); - } - } -} diff --git a/src/DemoSite461/Business/UIDescriptors/ContainerPageUIDescriptor.cs b/src/DemoSite461/Business/UIDescriptors/ContainerPageUIDescriptor.cs deleted file mode 100644 index 485d99e..0000000 --- a/src/DemoSite461/Business/UIDescriptors/ContainerPageUIDescriptor.cs +++ /dev/null @@ -1,19 +0,0 @@ -using EPiServer.Editor; -using EPiServer.Shell; -using DemoSite.Models.Pages; - -namespace DemoSite.Business.UIDescriptors -{ - /// - /// Describes how the UI should appear for content. - /// - [UIDescriptorRegistration] - public class ContainerPageUIDescriptor : UIDescriptor - { - public ContainerPageUIDescriptor() - : base(ContentTypeCssClassNames.Container) - { - DefaultView = CmsViewNames.AllPropertiesView; - } - } -} diff --git a/src/DemoSite461/ClientResources/Images/icons/layoutIcons24x24.png b/src/DemoSite461/ClientResources/Images/icons/layoutIcons24x24.png deleted file mode 100644 index 9cecefa..0000000 Binary files a/src/DemoSite461/ClientResources/Images/icons/layoutIcons24x24.png and /dev/null differ diff --git a/src/DemoSite461/ClientResources/Scripts/Editors/StringList.js b/src/DemoSite461/ClientResources/Scripts/Editors/StringList.js deleted file mode 100644 index 0f3b905..0000000 --- a/src/DemoSite461/ClientResources/Scripts/Editors/StringList.js +++ /dev/null @@ -1,159 +0,0 @@ -/* -Dojo widget for editing a list of strings. Also see property type PropertyStringList in /Models/Properties. -*/ - -define([ - "dojo/_base/array", - "dojo/_base/connect", - "dojo/_base/declare", - "dojo/_base/lang", - - "dijit/_CssStateMixin", - "dijit/_Widget", - "dijit/_TemplatedMixin", - "dijit/_WidgetsInTemplateMixin", - - "dijit/form/Textarea", - - "epi/epi", - "epi/shell/widget/_ValueRequiredMixin" -], -function ( - array, - connect, - declare, - lang, - - _CssStateMixin, - _Widget, - _TemplatedMixin, - _WidgetsInTemplateMixin, - - Textarea, - epi, - _ValueRequiredMixin -) { - - return declare("alloy.editors.StringList", [_Widget, _TemplatedMixin, _WidgetsInTemplateMixin, _CssStateMixin, _ValueRequiredMixin], { - - templateString: "
\ -
\ -
\ -
\ -
\ - ${helptext}\ -
", - - baseClass: "epiStringList", - - helptext: "Place items on separate lines", - - intermediateChanges: false, - - value: null, - - multiple: true, - - onChange: function (value) { - // Event - }, - - postCreate: function () { - // call base implementation - this.inherited(arguments); - - // Init textarea and bind event - this.textArea.set("intermediateChanges", this.intermediateChanges); - this.connect(this.textArea, "onChange", this._onTextAreaChanged); - }, - - isValid: function () { - // summary: - // Check if widget's value is valid. - // tags: - // protected, override - - return !this.required || lang.isArray(this.value) && this.value.length > 0 && this.value.join() !== ""; - }, - - // Setter for value property - _setValueAttr: function (value) { - this._setValue(value, true); - }, - - _getValueAttr: function () { - // summary: - // Returns the textbox value as array. - // tags: - // protected, override - - var val = this.textArea && this.textArea.get("value"); - return this._stringToList(val); - }, - - _setReadOnlyAttr: function (value) { - this._set("readOnly", value); - this.textArea.set("readOnly", value); - }, - - // Setter for intermediateChanges - _setIntermediateChangesAttr: function (value) { - this.textArea.set("intermediateChanges", value); - this._set("intermediateChanges", value); - }, - - // Event handler for textarea - _onTextAreaChanged: function (value) { - this._setValue(value, false); - }, - - _setValue: function (value, updateTextarea) { - // Assume value is an array - var list = value; - - if (typeof value === "string") { - // Split list - list = this._stringToList(value); - - } else if (!value) { - // use empty array for empty value - list = []; - } - - if (this._started && epi.areEqual(this.value, list)) { - return; - } - - // set value to this widget (and notify observers) - this._set("value", list); - - // set value to textarea - updateTextarea && this.textArea.set("value", list.join("\n")); - - if (this._started && this.validate()) { - // Trigger change event - this.onChange(list); - } - }, - - // Convert a string to a list - _stringToList: function (value) { - - // Return empty array for - if (!value || typeof value !== "string") { - return []; - } - - // Trim whitespace at start and end - var trimmed = value.replace(/^\s+|\s+$/g, ""); - - // Trim whitespace around each linebreak - var trimmedLines = trimmed.replace(/(\s*\n+\s*)/g, "\n"); - - // Split into list - var list = trimmedLines.split("\n"); - - return list; - } - }); -}); diff --git a/src/DemoSite461/ClientResources/Styles/LayoutIcons.css b/src/DemoSite461/ClientResources/Styles/LayoutIcons.css deleted file mode 100644 index f7577fd..0000000 --- a/src/DemoSite461/ClientResources/Styles/LayoutIcons.css +++ /dev/null @@ -1,25 +0,0 @@ -.Sleek .epi-icon__layout--full { - background: url('../Images/Icons/layoutIcons24x24.png') 0px -24px no-repeat; - height: 24px; - width: 24px; -} -.Sleek .epi-icon__layout--half { - background: url('../Images/Icons/layoutIcons24x24.png') 0px -48px no-repeat; - height: 24px; - width: 24px; -} -.Sleek .epi-icon__layout--two-thirds { - background: url('../Images/Icons/layoutIcons24x24.png') 0px -72px no-repeat; - height: 24px; - width: 24px; -} -.Sleek .epi-icon__layout--one-third { - background: url('../Images/Icons/layoutIcons24x24.png') 0px -96px no-repeat; - height: 24px; - width: 24px; -} -.Sleek .epi-icon__layout--one-quarter { - background: url('../Images/Icons/layoutIcons24x24.png') 0px -120px no-repeat; - height: 24px; - width: 24px; -} diff --git a/src/DemoSite461/ClientResources/Styles/Styles.css b/src/DemoSite461/ClientResources/Styles/Styles.css deleted file mode 100644 index f37a1c4..0000000 --- a/src/DemoSite461/ClientResources/Styles/Styles.css +++ /dev/null @@ -1,9 +0,0 @@ -@import url("LayoutIcons.css"); - -.epiStringList .dijitTextArea { - width: 250px; -} - -.epiStringList .epiStringListError .dijitTextArea { - border: solid 1px #d46464; -} diff --git a/src/DemoSite461/Controllers/ContactBlockController.cs b/src/DemoSite461/Controllers/ContactBlockController.cs deleted file mode 100644 index 05cd32f..0000000 --- a/src/DemoSite461/Controllers/ContactBlockController.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Web; -using System.Web.Mvc; -using EPiServer.Core; -using DemoSite.Helpers; -using DemoSite.Models.Blocks; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; -using EPiServer.Web; -using EPiServer.Web.Mvc; -using EPiServer; - -namespace DemoSite.Controllers -{ - public class ContactBlockController : BlockController - { - private readonly IContentLoader _contentLoader; - private readonly IPermanentLinkMapper _permanentLinkMapper; - - public ContactBlockController(IContentLoader contentLoader, IPermanentLinkMapper permanentLinkMapper) - { - _contentLoader = contentLoader; - _permanentLinkMapper = permanentLinkMapper; - } - - public override ActionResult Index(ContactBlock currentBlock) - { - ContactPage contactPage = null; - if(!ContentReference.IsNullOrEmpty(currentBlock.ContactPageLink)) - { - contactPage = _contentLoader.Get(currentBlock.ContactPageLink); - } - - var linkUrl = GetLinkUrl(currentBlock); - - var model = new ContactBlockModel - { - Heading = currentBlock.Heading, - Image = currentBlock.Image, - ContactPage = contactPage, - LinkUrl = GetLinkUrl(currentBlock), - LinkText = currentBlock.LinkText, - ShowLink = linkUrl != null - }; - - //As we're using a separate view model with different property names than the content object - //we connect the view models properties with the content objects so that they can be edited. - ViewData.GetEditHints() - .AddConnection(x => x.Heading, x => x.Heading) - .AddConnection(x => x.Image, x => x.Image) - .AddConnection(x => (object) x.ContactPage, x => (object) x.ContactPageLink) - .AddConnection(x => x.LinkText, x => x.LinkText); - - return PartialView(model); - } - - private IHtmlString GetLinkUrl(ContactBlock contactBlock) - { - if (contactBlock.LinkUrl != null && !contactBlock.LinkUrl.IsEmpty()) - { - var linkUrl = contactBlock.LinkUrl.ToString(); - - //If the url maps to a page on the site we convert it from the internal (permanent, GUID-like) format - //to the human readable and pretty public format - var linkMap = _permanentLinkMapper.Find(new UrlBuilder(linkUrl)); - if (linkMap != null && !ContentReference.IsNullOrEmpty(linkMap.ContentReference)) - { - return Url.PageLinkUrl(linkMap.ContentReference); - } - - return new MvcHtmlString(contactBlock.LinkUrl.ToString()); - } - - return null; - } - - } -} diff --git a/src/DemoSite461/Controllers/DefaultPageController.cs b/src/DemoSite461/Controllers/DefaultPageController.cs deleted file mode 100644 index 3d13fec..0000000 --- a/src/DemoSite461/Controllers/DefaultPageController.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Web.Mvc; -using EPiServer; -using EPiServer.Framework.DataAnnotations; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; - -namespace DemoSite.Controllers -{ - /// - /// Concrete controller that handles all page types that don't have their own specific controllers. - /// - /// - /// Note that as the view file name is hard coded it won't work with DisplayModes (ie Index.mobile.cshtml). - /// For page types requiring such views add specific controllers for them. Alterntively the Index action - /// could be modified to set ControllerContext.RouteData.Values["controller"] to type name of the currentPage - /// argument. That may however have side effects. - /// - [TemplateDescriptor(Inherited = true)] - public class DefaultPageController : PageControllerBase - { - public ViewResult Index(SitePageData currentPage) - { - var model = CreateModel(currentPage); - return View(string.Format("~/Views/{0}/Index.cshtml", currentPage.GetOriginalType().Name), model); - } - - /// - /// Creates a PageViewModel where the type parameter is the type of the page. - /// - /// - /// Used to create models of a specific type without the calling method having to know that type. - /// - private static IPageViewModel CreateModel(SitePageData page) - { - var type = typeof(PageViewModel<>).MakeGenericType(page.GetOriginalType()); - return Activator.CreateInstance(type, page) as IPageViewModel; - } - } -} diff --git a/src/DemoSite461/Controllers/ImageFileController.cs b/src/DemoSite461/Controllers/ImageFileController.cs deleted file mode 100644 index b5940b2..0000000 --- a/src/DemoSite461/Controllers/ImageFileController.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Web.Mvc; -using DemoSite.Models.Media; -using DemoSite.Models.ViewModels; -using EPiServer.Web.Mvc; -using EPiServer.Web.Routing; - -namespace DemoSite.Controllers -{ - /// - /// Controller for the image file. - /// - public class ImageFileController : PartialContentController - { - private readonly UrlResolver _urlResolver; - - public ImageFileController(UrlResolver urlResolver) - { - _urlResolver = urlResolver; - } - - /// - /// The index action for the image file. Creates the view model and renders the view. - /// - /// The current image file. - public override ActionResult Index(ImageFile currentContent) - { - var model = new ImageViewModel - { - Url = _urlResolver.GetUrl(currentContent.ContentLink), - Name = currentContent.Name, - Copyright = currentContent.Copyright - }; - - return PartialView(model); - } - } -} diff --git a/src/DemoSite461/Controllers/PageControllerBase.cs b/src/DemoSite461/Controllers/PageControllerBase.cs deleted file mode 100644 index b4a5743..0000000 --- a/src/DemoSite461/Controllers/PageControllerBase.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Web.Mvc; -using DemoSite.Business; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; -using EPiServer.Web.Mvc; -using EPiServer.Shell.Security; - -namespace DemoSite.Controllers -{ - /// - /// All controllers that renders pages should inherit from this class so that we can - /// apply action filters, such as for output caching site wide, should we want to. - /// - public abstract class PageControllerBase : PageController, IModifyLayout - where T : SitePageData - { - - protected EPiServer.ServiceLocation.Injected UISignInManager; - - /// - /// Signs out the current user and redirects to the Index action of the same controller. - /// - /// - /// There's a log out link in the footer which should redirect the user to the same page. - /// As we don't have a specific user/account/login controller but rely on the login URL for - /// forms authentication for login functionality we add an action for logging out to all - /// controllers inheriting from this class. - /// - public ActionResult Logout() - { - UISignInManager.Service.SignOut(); - return RedirectToAction("Index"); - } - - public virtual void ModifyLayout(LayoutModel layoutModel) - { - var page = PageContext.Page as SitePageData; - if(page != null) - { - layoutModel.HideHeader = page.HideSiteHeader; - layoutModel.HideFooter = page.HideSiteFooter; - } - } - } -} diff --git a/src/DemoSite461/Controllers/PageListBlockController.cs b/src/DemoSite461/Controllers/PageListBlockController.cs deleted file mode 100644 index 970accd..0000000 --- a/src/DemoSite461/Controllers/PageListBlockController.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Web.Mvc; -using EPiServer.Core; -using EPiServer.Filters; -using DemoSite.Business; -using DemoSite.Models.Blocks; -using DemoSite.Models.ViewModels; -using EPiServer.Web.Mvc; -using EPiServer; - -namespace DemoSite.Controllers -{ - public class PageListBlockController : BlockController - { - private ContentLocator contentLocator; - private IContentLoader contentLoader; - public PageListBlockController(ContentLocator contentLocator, IContentLoader contentLoader) - { - this.contentLocator = contentLocator; - this.contentLoader = contentLoader; - } - - public override ActionResult Index(PageListBlock currentBlock) - { - var pages = FindPages(currentBlock); - - pages = Sort(pages, currentBlock.SortOrder); - - if(currentBlock.Count > 0) - { - pages = pages.Take(currentBlock.Count); - } - - var model = new PageListModel(currentBlock) - { - Pages = pages - }; - - ViewData.GetEditHints() - .AddConnection(x => x.Heading, x => x.Heading); - - return PartialView(model); - } - - private IEnumerable FindPages(PageListBlock currentBlock) - { - IEnumerable pages; - var listRoot = currentBlock.Root; - if (currentBlock.Recursive) - { - if (currentBlock.PageTypeFilter != null) - { - pages = contentLocator.FindPagesByPageType(listRoot, true, currentBlock.PageTypeFilter.ID); - } - else - { - pages = contentLocator.GetAll(listRoot); - } - } - else - { - if (currentBlock.PageTypeFilter != null) - { - pages = contentLoader.GetChildren(listRoot) - .Where(p => p.ContentTypeID == currentBlock.PageTypeFilter.ID); - } - else - { - pages = contentLoader.GetChildren(listRoot); - } - } - - if (currentBlock.CategoryFilter != null && currentBlock.CategoryFilter.Any()) - { - pages = pages.Where(x => x.Category.Intersect(currentBlock.CategoryFilter).Any()); - } - return pages; - } - - private IEnumerable Sort(IEnumerable pages, FilterSortOrder sortOrder) - { - var asCollection = new PageDataCollection(pages); - var sortFilter = new FilterSort(sortOrder); - sortFilter.Sort(asCollection); - return asCollection; - } - } -} diff --git a/src/DemoSite461/Controllers/PreviewController.cs b/src/DemoSite461/Controllers/PreviewController.cs deleted file mode 100644 index 050835c..0000000 --- a/src/DemoSite461/Controllers/PreviewController.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System.Linq; -using System.Web.Mvc; -using EPiServer.Core; -using EPiServer.Framework.DataAnnotations; -using EPiServer.Framework.Web; -using DemoSite.Business; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; -using EPiServer.Web; -using EPiServer.Web.Mvc; -using EPiServer; -using EPiServer.Framework.Web.Mvc; - -namespace DemoSite.Controllers -{ - /* Note: as the content area rendering on Alloy is customized we create ContentArea instances - * which we render in the preview view in order to provide editors with a preview which is as - * realistic as possible. In other contexts we could simply have passed the block to the - * view and rendered it using Html.RenderContentData */ - [TemplateDescriptor( - Inherited = true, - TemplateTypeCategory = TemplateTypeCategories.MvcController, //Required as controllers for blocks are registered as MvcPartialController by default - Tags = new[] { RenderingTags.Preview, RenderingTags.Edit }, - AvailableWithoutTag = false)] - [VisitorGroupImpersonation] - [RequireClientResources] - public class PreviewController : ActionControllerBase, IRenderTemplate, IModifyLayout - { - private readonly IContentLoader _contentLoader; - private readonly TemplateResolver _templateResolver; - private readonly DisplayOptions _displayOptions; - - public PreviewController(IContentLoader contentLoader, TemplateResolver templateResolver, DisplayOptions displayOptions) - { - _contentLoader = contentLoader; - _templateResolver = templateResolver; - _displayOptions = displayOptions; - } - - public ActionResult Index(IContent currentContent) - { - //As the layout requires a page for title etc we "borrow" the start page - var startPage = _contentLoader.Get(SiteDefinition.Current.StartPage); - - var model = new PreviewModel(startPage, currentContent); - - var supportedDisplayOptions = _displayOptions - .Select(x => new { Tag = x.Tag, Name = x.Name, Supported = SupportsTag(currentContent, x.Tag) }) - .ToList(); - - if (supportedDisplayOptions.Any(x => x.Supported)) - { - foreach (var displayOption in supportedDisplayOptions) - { - var contentArea = new ContentArea(); - contentArea.Items.Add(new ContentAreaItem - { - ContentLink = currentContent.ContentLink - }); - var areaModel = new PreviewModel.PreviewArea - { - Supported = displayOption.Supported, - AreaTag = displayOption.Tag, - AreaName = displayOption.Name, - ContentArea = contentArea - }; - model.Areas.Add(areaModel); - } - } - - return View(model); - } - - private bool SupportsTag(IContent content, string tag) - { - var templateModel = _templateResolver.Resolve(HttpContext, - content.GetOriginalType(), - content, - TemplateTypeCategories.MvcPartial, - tag); - - return templateModel != null; - } - - public void ModifyLayout(LayoutModel layoutModel) - { - layoutModel.HideHeader = true; - layoutModel.HideFooter = true; - } - } -} diff --git a/src/DemoSite461/Controllers/RegisterController.cs b/src/DemoSite461/Controllers/RegisterController.cs deleted file mode 100644 index 17f5c9b..0000000 --- a/src/DemoSite461/Controllers/RegisterController.cs +++ /dev/null @@ -1,117 +0,0 @@ -using DemoSite.Models; -using EPiServer.Core; -using EPiServer.ServiceLocation; -using EPiServer.Shell.Security; -using EPiServer.Web.Routing; -using System.Collections.Generic; -using System.Linq; -using System.Web.Mvc; -using System.Web.Profile; -using EPiServer.Security; -using EPiServer.DataAbstraction; -using EPiServer.Personalization; - -namespace DemoSite.Controllers -{ - /// - /// Used to register a user for first time - /// - public class RegisterController : Controller - { - const string AdminRoleName = "WebAdmins"; - public const string ErrorKey = "CreateError"; - - public ActionResult Index() - { - return View(); - } - - // - // POST: /Register - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - [ValidateInput(false)] - public ActionResult Index(RegisterViewModel model) - { - if (ModelState.IsValid) - { - UIUserCreateStatus status; - IEnumerable errors = Enumerable.Empty(); - var result = UIUserProvider.CreateUser(model.Username, model.Password, model.Email, null, null, true, out status, out errors); - if (status == UIUserCreateStatus.Success) - { - UIRoleProvider.CreateRole(AdminRoleName); - UIRoleProvider.AddUserToRoles(result.Username, new string[] { AdminRoleName }); - - if (ProfileManager.Enabled) - { - var profile = EPiServerProfile.Wrap(ProfileBase.Create(result.Username)); - profile.Email = model.Email; - profile.Save(); - } - - AdministratorRegistrationPage.IsEnabled = false; - SetFullAccessToWebAdmin(); - var resFromSignIn = UISignInManager.SignIn(UIUserProvider.Name, model.Username, model.Password); - if (resFromSignIn) - { - return Redirect(UrlResolver.Current.GetUrl(ContentReference.StartPage)); - } - } - AddErrors(errors); - } - // If we got this far, something failed, redisplay form - return View(model); - } - - private void SetFullAccessToWebAdmin() - { - var securityrep = ServiceLocator.Current.GetInstance(); - var permissions = securityrep.Get(ContentReference.RootPage).CreateWritableClone() as IContentSecurityDescriptor; - permissions.AddEntry(new AccessControlEntry(AdminRoleName, AccessLevel.FullAccess)); - securityrep.Save(ContentReference.RootPage, permissions, SecuritySaveType.Replace); - } - - private void AddErrors(IEnumerable errors) - { - foreach (var error in errors) - { - ModelState.AddModelError(ErrorKey, error); - } - } - - protected override void OnAuthorization(AuthorizationContext filterContext) - { - if (!AdministratorRegistrationPage.IsEnabled) - { - filterContext.Result = new HttpNotFoundResult(); - return; - } - base.OnAuthorization(filterContext); - } - - UIUserProvider UIUserProvider - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - UIRoleProvider UIRoleProvider - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - UISignInManager UISignInManager - { - get - { - return ServiceLocator.Current.GetInstance(); - } - } - - } -} diff --git a/src/DemoSite461/Controllers/SearchPageController.cs b/src/DemoSite461/Controllers/SearchPageController.cs deleted file mode 100644 index dc9e4c1..0000000 --- a/src/DemoSite461/Controllers/SearchPageController.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; -using EPiServer.Core; -using EPiServer.Framework.Web; -using EPiServer.Search; -using DemoSite.Business; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; -using EPiServer.Web; -using EPiServer.Web.Hosting; -using EPiServer.Web.Mvc.Html; -using EPiServer.Web.Routing; - -namespace DemoSite.Controllers -{ - public class SearchPageController : PageControllerBase - { - private const int MaxResults = 40; - private readonly SearchService _searchService; - private readonly ContentSearchHandler _contentSearchHandler; - private readonly UrlResolver _urlResolver; - private readonly TemplateResolver _templateResolver; - - public SearchPageController( - SearchService searchService, - ContentSearchHandler contentSearchHandler, - TemplateResolver templateResolver, - UrlResolver urlResolver) - { - _searchService = searchService; - _contentSearchHandler = contentSearchHandler; - _templateResolver = templateResolver; - _urlResolver = urlResolver; - } - - [ValidateInput(false)] - public ViewResult Index(SearchPage currentPage, string q) - { - var model = new SearchContentModel(currentPage) - { - SearchServiceDisabled = !_searchService.IsActive, - SearchedQuery = q - }; - - if(!string.IsNullOrWhiteSpace(q) && _searchService.IsActive) - { - var hits = Search(q.Trim(), - new[] { SiteDefinition.Current.StartPage, SiteDefinition.Current.GlobalAssetsRoot, SiteDefinition.Current.SiteAssetsRoot }, - ControllerContext.HttpContext, - currentPage.Language?.Name).ToList(); - model.Hits = hits; - model.NumberOfHits = hits.Count(); - } - - return View(model); - } - - /// - /// Performs a search for pages and media and maps each result to the view model class SearchHit. - /// - /// - /// The search functionality is handled by the injected SearchService in order to keep the controller simple. - /// Uses EPiServer Search. For more advanced search functionality such as keyword highlighting, - /// facets and search statistics consider using EPiServer Find. - /// - private IEnumerable Search(string searchText, IEnumerable searchRoots, HttpContextBase context, string languageBranch) - { - var searchResults = _searchService.Search(searchText, searchRoots, context, languageBranch, MaxResults); - - return searchResults.IndexResponseItems.SelectMany(CreateHitModel); - } - - private IEnumerable CreateHitModel(IndexResponseItem responseItem) - { - var content = _contentSearchHandler.GetContent(responseItem); - if (content != null && HasTemplate(content) && IsPublished(content as IVersionable)) - { - yield return CreatePageHit(content); - } - } - - private bool HasTemplate(IContent content) - { - return _templateResolver.HasTemplate(content, TemplateTypeCategories.Page); - } - - private bool IsPublished(IVersionable content) - { - if (content == null) - return true; - return content.Status.HasFlag(VersionStatus.Published); - } - - private SearchContentModel.SearchHit CreatePageHit(IContent content) - { - return new SearchContentModel.SearchHit - { - Title = content.Name, - Url = _urlResolver.GetUrl(content.ContentLink), - Excerpt = content is SitePageData ? ((SitePageData) content).TeaserText : string.Empty - }; - } - } -} diff --git a/src/DemoSite461/Controllers/StartPageController.cs b/src/DemoSite461/Controllers/StartPageController.cs deleted file mode 100644 index 0aa2ac2..0000000 --- a/src/DemoSite461/Controllers/StartPageController.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Web.Mvc; -using DemoSite.Models.Pages; -using DemoSite.Models.ViewModels; -using EPiServer.ServiceLocation; -using EPiServer.Shell.Security; -using EPiServer.Web; -using EPiServer.Web.Mvc; - -namespace DemoSite.Controllers -{ - public class StartPageController : PageControllerBase - { - public ActionResult Index(StartPage currentPage) - { - var model = PageViewModel.Create(currentPage); - - if (SiteDefinition.Current.StartPage.CompareToIgnoreWorkID(currentPage.ContentLink)) // Check if it is the StartPage or just a page of the StartPage type. - { - //Connect the view models logotype property to the start page's to make it editable - var editHints = ViewData.GetEditHints, StartPage>(); - editHints.AddConnection(m => m.Layout.Logotype, p => p.SiteLogotype); - editHints.AddConnection(m => m.Layout.ProductPages, p => p.ProductPageLinks); - editHints.AddConnection(m => m.Layout.CompanyInformationPages, p => p.CompanyInformationPageLinks); - editHints.AddConnection(m => m.Layout.NewsPages, p => p.NewsPageLinks); - editHints.AddConnection(m => m.Layout.CustomerZonePages, p => p.CustomerZonePageLinks); - } - - /* - var userManager = ServiceLocator.Current.GetInstance(); - var userProvider = ServiceLocator.Current.GetInstance(); - var user = userProvider.GetUser("admin"); - userManager.UnlockUser(user); - userManager.ResetPassword(user, "Welcome123!"); - */ - - return View(model); - - } - } -} diff --git a/src/DemoSite461/Controllers/VideoFileController.cs b/src/DemoSite461/Controllers/VideoFileController.cs deleted file mode 100644 index ada9153..0000000 --- a/src/DemoSite461/Controllers/VideoFileController.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Web.Mvc; -using DemoSite.Models.Media; -using DemoSite.Models.ViewModels; -using EPiServer.Web.Mvc; -using EPiServer.Web.Routing; -using System; -using EPiServer.Core; - -namespace DemoSite.Controllers -{ - /// - /// Controller for the video file. - /// - public class VideoFileController : PartialContentController - { - private readonly UrlResolver _urlResolver; - - public VideoFileController(UrlResolver urlResolver) - { - _urlResolver = urlResolver; - } - - /// - /// The index action for the video file. Creates the view model and renders the view. - /// - /// The current video file. - public override ActionResult Index(VideoFile currentContent) - { - var model = new VideoViewModel - { - Url = _urlResolver.GetUrl(currentContent.ContentLink), - PreviewImageUrl = ContentReference.IsNullOrEmpty(currentContent.PreviewImage) ? String.Empty : _urlResolver.GetUrl(currentContent.PreviewImage), - }; - - return PartialView(model); - } - } -} diff --git a/src/DemoSite461/DemoSite461.csproj b/src/DemoSite461/DemoSite461.csproj deleted file mode 100644 index cb53ff4..0000000 --- a/src/DemoSite461/DemoSite461.csproj +++ /dev/null @@ -1,594 +0,0 @@ - - - - - Debug - AnyCPU - - - 2.0 - {AFB17DE9-C385-4CAA-A4C5-CB051AD27C72} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - DemoSite - DemoSite - v4.8 - true - true - - - 4.0 - - - 44323 - - - - - - - ..\..\packages\WebGrease.1.5.2\lib - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\ - TRACE - prompt - 4 - - - - ..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll - - - ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - - ..\..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll - - - ..\..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll - - - ..\..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll - - - ..\..\packages\EPiServer.CMS.Core.11.20.12\lib\net461\EPiServer.dll - - - ..\..\packages\EPiServer.Framework.11.20.12\lib\net461\EPiServer.ApplicationModules.dll - - - ..\..\packages\EPiServer.CMS.AspNet.11.20.12\lib\net461\EPiServer.Cms.AspNet.dll - - - ..\..\packages\EPiServer.CMS.UI.Core.11.36.5\lib\net461\EPiServer.Cms.Shell.UI.dll - - - ..\..\packages\EPiServer.CMS.TinyMce.2.10.1\lib\net461\EPiServer.Cms.TinyMce.dll - - - ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.11.36.5\lib\net461\EPiServer.Cms.UI.AspNetIdentity.dll - - - ..\..\packages\EPiServer.CMS.AspNet.11.20.12\lib\net461\EPiServer.Configuration.dll - - - ..\..\packages\EPiServer.Framework.11.20.12\lib\net461\EPiServer.Data.dll - - - ..\..\packages\EPiServer.Framework.11.20.12\lib\net461\EPiServer.Data.Cache.dll - - - ..\..\packages\EPiServer.CMS.Core.11.20.12\lib\net461\EPiServer.Enterprise.dll - - - ..\..\packages\EPiServer.Framework.11.20.12\lib\net461\EPiServer.Events.dll - - - ..\..\packages\EPiServer.Framework.11.20.12\lib\net461\EPiServer.Framework.dll - - - ..\..\packages\EPiServer.Framework.AspNet.11.20.12\lib\net461\EPiServer.Framework.AspNet.dll - - - ..\..\packages\EPiServer.CMS.AspNet.11.20.12\lib\net461\EPiServer.ImageLibrary.dll - - - ..\..\packages\EPiServer.Framework.11.20.12\lib\net461\EPiServer.Licensing.dll - - - ..\..\packages\EPiServer.CMS.Core.11.20.12\lib\net461\EPiServer.LinkAnalyzer.dll - - - ..\..\packages\EPiServer.Logging.Log4Net.2.2.2\lib\net461\EPiServer.Logging.Log4Net.dll - - - ..\..\packages\EPiServer.Search.Cms.9.0.3\lib\net461\EPiServer.Search.Cms.dll - - - ..\..\packages\EPiServer.Search.9.0.3\lib\net461\EPiServer.Search.IndexingService.dll - - - ..\..\packages\EPiServer.ServiceLocation.StructureMap.2.0.3\lib\net461\EPiServer.ServiceLocation.StructureMap.dll - - - ..\..\packages\EPiServer.CMS.UI.Core.11.36.5\lib\net461\EPiServer.Shell.dll - - - ..\..\packages\EPiServer.CMS.UI.Core.11.36.5\lib\net461\EPiServer.Shell.UI.dll - - - ..\..\packages\EPiServer.CMS.UI.Core.11.36.5\lib\net461\EPiServer.UI.dll - - - ..\..\packages\EPiServer.CMS.AspNet.11.20.12\lib\net461\EPiServer.Web.WebControls.dll - - - ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - - - ..\..\packages\Microsoft.AspNet.Identity.Core.2.2.3\lib\net45\Microsoft.AspNet.Identity.Core.dll - - - ..\..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.3\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll - - - ..\..\packages\Microsoft.AspNet.Identity.Owin.2.2.3\lib\net45\Microsoft.AspNet.Identity.Owin.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.Configuration.ConfigurationBuilders.Base.2.0.0\lib\Net471\Microsoft.Configuration.ConfigurationBuilders.Base.dll - - - ..\..\packages\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.2.0.0\lib\Net471\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.dll - - - - ..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll - - - ..\..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - - ..\..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll - - - ..\..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll - - - ..\..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\Owin.1.0\lib\net40\Owin.dll - - - ..\..\packages\RestSharp.110.2.0\lib\net471\RestSharp.dll - - - ..\..\packages\StructureMap.4.7.1\lib\net45\StructureMap.dll - - - ..\..\packages\structuremap.web.4.0.0.315\lib\net40\StructureMap.Web.dll - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - ..\..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll - - - ..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - - - ..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - True - True - - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - - ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - ..\..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\..\packages\System.Security.Cryptography.Xml.4.4.2\lib\net461\System.Security.Cryptography.Xml.dll - - - ..\..\packages\System.Security.Permissions.4.4.0\lib\net461\System.Security.Permissions.dll - - - ..\..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll - - - ..\..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - - ..\..\packages\System.Text.Json.7.0.2\lib\net462\System.Text.Json.dll - - - ..\..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll - - - ..\..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - ..\..\packages\Microsoft.AspNet.Providers.Core.2.0.0\lib\net40\System.Web.Providers.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - - - ..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Global.asax - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EPiServerDB_13705f33.mdf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web.config - - - Web.config - - - - - {20c80199-4a83-465b-bb70-6a3ef79d45a0} - UNRVLD.ODP.VisitorGroups - - - - - - - True - True - 51980 - / - https://localhost:44323/ - False - False - - - False - - - - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/DemoSite461.csproj.user b/src/DemoSite461/DemoSite461.csproj.user deleted file mode 100644 index 5a6229d..0000000 --- a/src/DemoSite461/DemoSite461.csproj.user +++ /dev/null @@ -1,39 +0,0 @@ - - - - Debug|Any CPU - ShowAllFiles - true - - 44323 - - - - - - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - False - - - - - \ No newline at end of file diff --git a/src/DemoSite461/EPiServerLog.config b/src/DemoSite461/EPiServerLog.config deleted file mode 100644 index 2fd3e81..0000000 --- a/src/DemoSite461/EPiServerLog.config +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/Global.asax b/src/DemoSite461/Global.asax deleted file mode 100644 index 8ea7a64..0000000 --- a/src/DemoSite461/Global.asax +++ /dev/null @@ -1 +0,0 @@ -<%@ Application Codebehind="Global.asax.cs" Language="C#" Inherits="DemoSite.EPiServerApplication" %> \ No newline at end of file diff --git a/src/DemoSite461/Global.asax.cs b/src/DemoSite461/Global.asax.cs deleted file mode 100644 index 6753073..0000000 --- a/src/DemoSite461/Global.asax.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Web.Mvc; - -namespace DemoSite -{ - public class EPiServerApplication : EPiServer.Global - { - protected void Application_Start() - { - AreaRegistration.RegisterAllAreas(); - - //Tip: Want to call the EPiServer API on startup? Add an initialization module instead (Add -> New Item.. -> EPiServer -> Initialization Module) - } - } -} \ No newline at end of file diff --git a/src/DemoSite461/Global.cs b/src/DemoSite461/Global.cs deleted file mode 100644 index 6069eaf..0000000 --- a/src/DemoSite461/Global.cs +++ /dev/null @@ -1,88 +0,0 @@ -using EPiServer.DataAnnotations; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - - -namespace DemoSite -{ - - public class Global - { - public static readonly string LoginPath = "/util/login.aspx"; - public static readonly string AppRelativeLoginPath = string.Format("~{0}", LoginPath); - - /// - /// Group names for content types and properties - /// - [GroupDefinitions()] - public static class GroupNames - { - [Display(Name = "Contact", Order = 1)] - public const string Contact = "Contact"; - - [Display(Name = "Default", Order = 2)] - public const string Default = "Default"; - - [Display(Name = "Metadata", Order = 3)] - public const string MetaData = "Metadata"; - - [Display(Name = "News", Order = 4)] - public const string News = "News"; - - [Display(Name = "Products", Order = 5)] - public const string Products = "Products"; - - [Display(Name = "SiteSettings", Order = 6)] - public const string SiteSettings = "SiteSettings"; - - [Display(Name = "Specialized", Order = 7)] - public const string Specialized = "Specialized"; - } - - /// - /// Tags to use for the main widths used in the Bootstrap HTML framework - /// - public static class ContentAreaTags - { - public const string FullWidth = "span12"; - public const string TwoThirdsWidth = "span8"; - public const string HalfWidth = "span6"; - public const string OneThirdWidth = "span4"; - public const string NoRenderer = "norenderer"; - } - - /// - /// Main widths used in the Bootstrap HTML framework - /// - public static class ContentAreaWidths - { - public const int FullWidth = 12; - public const int TwoThirdsWidth = 8; - public const int HalfWidth = 6; - public const int OneThirdWidth = 4; - } - - public static Dictionary ContentAreaTagWidths = new Dictionary - { - { ContentAreaTags.FullWidth, ContentAreaWidths.FullWidth }, - { ContentAreaTags.TwoThirdsWidth, ContentAreaWidths.TwoThirdsWidth }, - { ContentAreaTags.HalfWidth, ContentAreaWidths.HalfWidth }, - { ContentAreaTags.OneThirdWidth, ContentAreaWidths.OneThirdWidth } - }; - - /// - /// Names used for UIHint attributes to map specific rendering controls to page properties - /// - public static class SiteUIHints - { - public const string Contact = "contact"; - public const string Strings = "StringList"; - public const string StringsCollection = "StringsCollection"; - } - - /// - /// Virtual path to folder with static graphics, such as "~/Static/gfx/" - /// - public const string StaticGraphicsFolderPath = "~/Static/gfx/"; - } -} diff --git a/src/DemoSite461/Helpers/CategorizableExtensions.cs b/src/DemoSite461/Helpers/CategorizableExtensions.cs deleted file mode 100644 index 6fc8b5a..0000000 --- a/src/DemoSite461/Helpers/CategorizableExtensions.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using EPiServer; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.ServiceLocation; - -namespace DemoSite.Helpers -{ - /// - /// Provides extension methods for categorizable content - /// - /// ICategorizable content includes for example pages and blocks. - public static class CategorizableExtensions - { - /// - /// Returns the CSS classes (if any) associated with the theme(s) of the content, as decided by its categories - /// - /// - /// CSS classes associated with the content's theme(s), or an empty string array if no theme is applicable - /// Content's categorization may map to more than one theme. This method assumes there are website categories called "Meet", "Track", and "Plan" - public static string[] GetThemeCssClassNames(this ICategorizable content) - { - if (content.Category == null) - { - return new string[0]; - } - - var cssClasses = new HashSet(); // Although with some overhead, a HashSet allows us to ensure we never add a CSS class more than once - var categoryRepository = ServiceLocator.Current.GetInstance(); - - foreach (var categoryName in content.Category.Select(category => categoryRepository.Get(category).Name.ToLower())) - { - switch (categoryName) - { - case "meet": - cssClasses.Add("theme1"); - break; - case "track": - cssClasses.Add("theme2"); - break; - case "plan": - cssClasses.Add("theme3"); - break; - } - } - - return cssClasses.ToArray(); - } - } -} diff --git a/src/DemoSite461/Helpers/HtmlHelpers.cs b/src/DemoSite461/Helpers/HtmlHelpers.cs deleted file mode 100644 index 0b9db90..0000000 --- a/src/DemoSite461/Helpers/HtmlHelpers.cs +++ /dev/null @@ -1,184 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Web; -using System.Web.Mvc; -using System.Web.WebPages; -using EPiServer.Core; -using EPiServer.ServiceLocation; -using DemoSite.Business; -using EPiServer.Web.Mvc.Html; -using EPiServer.Web.Routing; -using EPiServer; - -namespace DemoSite.Helpers -{ - public static class HtmlHelpers - { - /// - /// Returns an element for each child page of the rootLink using the itemTemplate. - /// - /// The html helper in whose context the list should be created - /// A reference to the root whose children should be listed - /// A template for each page which will be used to produce the return value. Can be either a delegate or a Razor helper. - /// Wether an element for the root page should be returned - /// Wether pages that do not have the "Display in navigation" checkbox checked should be excluded - /// Wether page that do not have a template (i.e. container pages) should be excluded - /// - /// Filter by access rights and publication status. - /// - public static IHtmlString MenuList( - this HtmlHelper helper, - ContentReference rootLink, - Func itemTemplate = null, - bool includeRoot = false, - bool requireVisibleInMenu = true, - bool requirePageTemplate = true) - { - itemTemplate = itemTemplate ?? GetDefaultItemTemplate(helper); - var currentContentLink = helper.ViewContext.RequestContext.GetContentLink(); - var contentLoader = ServiceLocator.Current.GetInstance(); - - Func, IEnumerable> filter = - pages => pages.FilterForDisplay(requirePageTemplate, requireVisibleInMenu); - - var pagePath = contentLoader.GetAncestors(currentContentLink) - .Reverse() - .Select(x => x.ContentLink) - .SkipWhile(x => !x.CompareToIgnoreWorkID(rootLink)) - .ToList(); - - var menuItems = contentLoader.GetChildren(rootLink) - .FilterForDisplay(requirePageTemplate, requireVisibleInMenu) - .Select(x => CreateMenuItem(x, currentContentLink, pagePath, contentLoader, filter)) - .ToList(); - - if(includeRoot) - { - menuItems.Insert(0, CreateMenuItem(contentLoader.Get(rootLink), currentContentLink, pagePath, contentLoader, filter)); - } - - var buffer = new StringBuilder(); - var writer = new StringWriter(buffer); - foreach (var menuItem in menuItems) - { - itemTemplate(menuItem).WriteTo(writer); - } - - return new MvcHtmlString(buffer.ToString()); - } - - private static MenuItem CreateMenuItem(PageData page, ContentReference currentContentLink, List pagePath, IContentLoader contentLoader, Func, IEnumerable> filter) - { - var menuItem = new MenuItem(page) - { - Selected = page.ContentLink.CompareToIgnoreWorkID(currentContentLink) || - pagePath.Contains(page.ContentLink), - HasChildren = - new Lazy(() => filter(contentLoader.GetChildren(page.ContentLink)).Any()) - }; - return menuItem; - } - - private static Func GetDefaultItemTemplate(HtmlHelper helper) - { - return x => new HelperResult(writer => writer.Write(helper.PageLink(x.Page))); - } - - public class MenuItem - { - public MenuItem(PageData page) - { - Page = page; - } - public PageData Page { get; set; } - public bool Selected { get; set; } - public Lazy HasChildren { get; set; } - } - - /// - /// Writes an opening ]]> tag to the response if the shouldWriteLink argument is true. - /// Returns a ConditionalLink object which when disposed will write a closing ]]> tag - /// to the response if the shouldWriteLink argument is true. - /// - public static ConditionalLink BeginConditionalLink(this HtmlHelper helper, bool shouldWriteLink, IHtmlString url, string title = null, string cssClass = null) - { - if(shouldWriteLink) - { - var linkTag = new TagBuilder("a"); - linkTag.Attributes.Add("href", url.ToHtmlString()); - - if(!string.IsNullOrWhiteSpace(title)) - { - linkTag.Attributes.Add("title", helper.Encode(title)); - } - - if (!string.IsNullOrWhiteSpace(cssClass)) - { - linkTag.Attributes.Add("class", cssClass); - } - - helper.ViewContext.Writer.Write(linkTag.ToString(TagRenderMode.StartTag)); - } - return new ConditionalLink(helper.ViewContext, shouldWriteLink); - } - - /// - /// Writes an opening ]]> tag to the response if the shouldWriteLink argument is true. - /// Returns a ConditionalLink object which when disposed will write a closing ]]> tag - /// to the response if the shouldWriteLink argument is true. - /// - /// - /// Overload which only executes the delegate for retrieving the URL if the link should be written. - /// This may be used to prevent null reference exceptions by adding null checkes to the shouldWriteLink condition. - /// - public static ConditionalLink BeginConditionalLink(this HtmlHelper helper, bool shouldWriteLink, Func urlGetter, string title = null, string cssClass = null) - { - IHtmlString url = MvcHtmlString.Empty; - - if(shouldWriteLink) - { - url = urlGetter(); - } - - return helper.BeginConditionalLink(shouldWriteLink, url, title, cssClass); - } - - public class ConditionalLink : IDisposable - { - private readonly ViewContext _viewContext; - private readonly bool _linked; - private bool _disposed; - - public ConditionalLink(ViewContext viewContext, bool isLinked) - { - _viewContext = viewContext; - _linked = isLinked; - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - - } - - protected virtual void Dispose(bool disposing) - { - if (_disposed) - { - return; - } - - _disposed = true; - - if (_linked) - { - _viewContext.Writer.Write(""); - } - } - } - } -} diff --git a/src/DemoSite461/Helpers/UrlHelpers.cs b/src/DemoSite461/Helpers/UrlHelpers.cs deleted file mode 100644 index 750a2b5..0000000 --- a/src/DemoSite461/Helpers/UrlHelpers.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System.Web; -using System.Web.Mvc; -using System.Web.Routing; -using EPiServer.Core; -using EPiServer.Globalization; -using EPiServer.ServiceLocation; -using EPiServer.Web.Routing; -using EPiServer; - -namespace DemoSite.Helpers -{ - public static class UrlHelpers - { - /// - /// Returns the target URL for a ContentReference. Respects the page's shortcut setting - /// so if the page is set as a shortcut to another page or an external URL that URL - /// will be returned. - /// - public static IHtmlString PageLinkUrl(this UrlHelper urlHelper, ContentReference contentLink) - { - if(ContentReference.IsNullOrEmpty(contentLink)) - { - return MvcHtmlString.Empty; - } - - var contentLoader = ServiceLocator.Current.GetInstance(); - var page = contentLoader.Get(contentLink); - - return PageLinkUrl(urlHelper, page); - } - - /// - /// Returns the target URL for a page. Respects the page's shortcut setting - /// so if the page is set as a shortcut to another page or an external URL that URL - /// will be returned. - /// - public static IHtmlString PageLinkUrl(this UrlHelper urlHelper, PageData page) - { - var urlResolver = ServiceLocator.Current.GetInstance(); - switch (page.LinkType) - { - case PageShortcutType.Normal: - case PageShortcutType.FetchData: - return new MvcHtmlString(urlResolver.GetUrl(page.ContentLink)); - - case PageShortcutType.Shortcut: - var shortcutProperty = page.Property["PageShortcutLink"] as PropertyPageReference; - if (shortcutProperty != null && !ContentReference.IsNullOrEmpty(shortcutProperty.ContentLink)) - { - return urlHelper.PageLinkUrl(shortcutProperty.ContentLink); - } - break; - - case PageShortcutType.External: - return new MvcHtmlString(page.LinkURL); - } - return MvcHtmlString.Empty; - } - - public static RouteValueDictionary GetPageRoute(this RequestContext requestContext, ContentReference contentLink) - { - var values = new RouteValueDictionary(); - values[RoutingConstants.NodeKey] = contentLink; - values[RoutingConstants.LanguageKey] = ContentLanguage.PreferredCulture.Name; - return values; - } - } -} diff --git a/src/DemoSite461/IndexingService/IndexingService.svc b/src/DemoSite461/IndexingService/IndexingService.svc deleted file mode 100644 index cb68987..0000000 --- a/src/DemoSite461/IndexingService/IndexingService.svc +++ /dev/null @@ -1,17 +0,0 @@ -<%@ ServiceHost Language="C#" Debug="false" Service="EPiServer.Search.IndexingService.IndexingService" Factory="IndexingServiceHostFactory" %> - -using System.ServiceModel; -using System.ServiceModel.Activation; - -public class IndexingServiceHostFactory : WebServiceHostFactory -{ - protected override ServiceHost CreateServiceHost(System.Type serviceType, System.Uri[] baseAddresses) - { - var host = base.CreateServiceHost(serviceType, baseAddresses); - - WebHttpBinding binding = new WebHttpBinding("IndexingServiceCustomBinding"); - var endpoint = host.AddServiceEndpoint(typeof(EPiServer.Search.IndexingService.IIndexingService), binding, ""); - - return host; - } -} diff --git a/src/DemoSite461/Models/Blocks/ButtonBlock.cs b/src/DemoSite461/Models/Blocks/ButtonBlock.cs deleted file mode 100644 index a803a59..0000000 --- a/src/DemoSite461/Models/Blocks/ButtonBlock.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.DataAbstraction; -using EPiServer; - -namespace DemoSite.Models.Blocks -{ - /// - /// Used to insert a link which is styled as a button - /// - [SiteContentType(GUID = "426CF12F-1F01-4EA0-922F-0778314DDAF0")] - [SiteImageUrl] - public class ButtonBlock : SiteBlockData - { - [Display(Order = 1, GroupName = SystemTabNames.Content)] - [Required] - public virtual string ButtonText { get; set; } - - [Display(Order = 2, GroupName = SystemTabNames.Content)] - [Required] - public virtual Url ButtonLink { get; set; } - } -} diff --git a/src/DemoSite461/Models/Blocks/ContactBlock.cs b/src/DemoSite461/Models/Blocks/ContactBlock.cs deleted file mode 100644 index 23d8f21..0000000 --- a/src/DemoSite461/Models/Blocks/ContactBlock.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using EPiServer.Web; -using EPiServer; - -namespace DemoSite.Models.Blocks -{ - /// - /// Used to present contact information with a call-to-action link - /// - /// Actual contact details are retrieved from a contact page specified using the ContactPageLink property - [SiteContentType(GUID = "7E932EAF-6BC2-4753-902A-8670EDC5F363")] - [SiteImageUrl] - public class ContactBlock : SiteBlockData - { - [Display( - GroupName = SystemTabNames.Content, - Order = 1)] - [CultureSpecific] - [UIHint(UIHint.Image)] - public virtual ContentReference Image { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 2)] - [CultureSpecific] - public virtual string Heading { get; set; } - - /// - /// Gets or sets the contact page from which contact information should be retrieved - /// - [Display( - GroupName = SystemTabNames.Content, - Order = 3)] - [UIHint(Global.SiteUIHints.Contact)] - public virtual PageReference ContactPageLink { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 4)] - [CultureSpecific] - public virtual string LinkText { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 5)] - [CultureSpecific] - public virtual Url LinkUrl { get; set; } - } -} diff --git a/src/DemoSite461/Models/Blocks/EditorialBlock.cs b/src/DemoSite461/Models/Blocks/EditorialBlock.cs deleted file mode 100644 index d058e33..0000000 --- a/src/DemoSite461/Models/Blocks/EditorialBlock.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; - -namespace DemoSite.Models.Blocks -{ - /// - /// Used to insert editorial content edited using a rich-text editor - /// - [SiteContentType( - GUID = "67F617A4-2175-4360-975E-75EDF2B924A7", - GroupName = SystemTabNames.Content)] - [SiteImageUrl] - public class EditorialBlock : SiteBlockData - { - [Display(GroupName = SystemTabNames.Content)] - [CultureSpecific] - public virtual XhtmlString MainBody { get; set; } - } -} diff --git a/src/DemoSite461/Models/Blocks/JumbotronBlock.cs b/src/DemoSite461/Models/Blocks/JumbotronBlock.cs deleted file mode 100644 index 59a2000..0000000 --- a/src/DemoSite461/Models/Blocks/JumbotronBlock.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using EPiServer.Web; -using EPiServer.Core; -using EPiServer; - -namespace DemoSite.Models.Blocks -{ - /// - /// Used for a primary message on a page, commonly used on start pages and landing pages - /// - [SiteContentType( - GroupName = Global.GroupNames.Specialized, - GUID = "9FD1C860-7183-4122-8CD4-FF4C55E096F9")] - [SiteImageUrl] - public class JumbotronBlock : SiteBlockData - { - [Display( - GroupName = SystemTabNames.Content, - Order = 1 - )] - [CultureSpecific] - [UIHint(UIHint.Image)] - public virtual ContentReference Image { get; set; } - - /// - /// Gets or sets a description for the image, for example used as the alt text for the image when rendered - /// - [Display( - GroupName = SystemTabNames.Content, - Order = 1 - )] - [CultureSpecific] - [UIHint(UIHint.Textarea)] - public virtual string ImageDescription - { - get - { - var propertyValue = this["ImageDescription"] as string; - - // Return image description with fall back to the heading if no description has been specified - return string.IsNullOrWhiteSpace(propertyValue) ? Heading : propertyValue; - } - set { this["ImageDescription"] = value; } - } - - [Display( - GroupName = SystemTabNames.Content, - Order = 1 - )] - [CultureSpecific] - public virtual string Heading { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 2 - )] - [CultureSpecific] - [UIHint(UIHint.Textarea)] - public virtual string SubHeading { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 3 - )] - [CultureSpecific] - [Required] - public virtual string ButtonText { get; set; } - - //The link must be required as an anchor tag requires an href in order to be valid and focusable - [Display( - GroupName = SystemTabNames.Content, - Order = 4 - )] - [CultureSpecific] - [Required] - public virtual Url ButtonLink { get; set; } - } -} diff --git a/src/DemoSite461/Models/Blocks/PageListBlock.cs b/src/DemoSite461/Models/Blocks/PageListBlock.cs deleted file mode 100644 index a02f369..0000000 --- a/src/DemoSite461/Models/Blocks/PageListBlock.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using EPiServer.Filters; - -namespace DemoSite.Models.Blocks -{ - /// - /// Used to insert a list of pages, for example a news list - /// - [SiteContentType(GUID = "30685434-33DE-42AF-88A7-3126B936AEAD")] - [SiteImageUrl] - public class PageListBlock : SiteBlockData - { - [Display( - GroupName = SystemTabNames.Content, - Order = 1)] - [CultureSpecific] - public virtual string Heading { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 2)] - [DefaultValue(false)] - public virtual bool IncludePublishDate { get; set; } - - /// - /// Gets or sets whether a page introduction/description should be included in the list - /// - [Display( - GroupName = SystemTabNames.Content, - Order = 3)] - [DefaultValue(true)] - public virtual bool IncludeIntroduction { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 4)] - [DefaultValue(3)] - [Required] - public virtual int Count { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 4)] - [DefaultValue(FilterSortOrder.PublishedDescending)] - [UIHint("SortOrder")] - [BackingType(typeof(PropertyNumber))] - public virtual FilterSortOrder SortOrder { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 5)] - [Required] - public virtual PageReference Root { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 6)] - public virtual PageType PageTypeFilter{get; set;} - - [Display( - GroupName = SystemTabNames.Content, - Order = 7)] - public virtual CategoryList CategoryFilter { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 8)] - public virtual bool Recursive { get; set; } - - #region IInitializableContent - - /// - /// Sets the default property values on the content data. - /// - /// Type of the content. - public override void SetDefaultValues(ContentType contentType) - { - base.SetDefaultValues(contentType); - - Count = 3; - IncludeIntroduction = true; - IncludePublishDate = false; - SortOrder = FilterSortOrder.PublishedDescending; - } - - #endregion - } -} diff --git a/src/DemoSite461/Models/Blocks/SiteBlockData.cs b/src/DemoSite461/Models/Blocks/SiteBlockData.cs deleted file mode 100644 index 92d9b4e..0000000 --- a/src/DemoSite461/Models/Blocks/SiteBlockData.cs +++ /dev/null @@ -1,10 +0,0 @@ - -namespace DemoSite.Models.Blocks -{ - /// - /// Base class for all block types on the site - /// - public abstract class SiteBlockData : EPiServer.Core.BlockData - { - } -} diff --git a/src/DemoSite461/Models/Blocks/SiteLogotypeBlock.cs b/src/DemoSite461/Models/Blocks/SiteLogotypeBlock.cs deleted file mode 100644 index 60fd341..0000000 --- a/src/DemoSite461/Models/Blocks/SiteLogotypeBlock.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAnnotations; -using EPiServer.Shell.ObjectEditing; -using EPiServer.Web; -using EPiServer; - -namespace DemoSite.Models.Blocks -{ - /// - /// Used to provide a composite property on the start page to set site logotype settings - /// - [SiteContentType( - GUID = "09854019-91A5-4B93-8623-17F038346001", - AvailableInEditMode = false)] // Should not be created and added to content areas by editors, the SiteLogotypeBlock is only used as a property type - [SiteImageUrl] - public class SiteLogotypeBlock : SiteBlockData - { - /// - /// Gets the site logotype URL - /// - /// If not specified a default logotype will be used - [DefaultDragAndDropTarget] - [UIHint(UIHint.Image)] - public virtual Url Url - { - get - { - var url = this.GetPropertyValue(b => b.Url); - - return url == null || url.IsEmpty() - ? new Url("/Static/gfx/logotype.png") - : url; - } - set - { - this.SetPropertyValue(b => b.Url, value); - } - } - - [CultureSpecific] - public virtual string Title { get; set; } - } -} diff --git a/src/DemoSite461/Models/Blocks/TeaserBlock.cs b/src/DemoSite461/Models/Blocks/TeaserBlock.cs deleted file mode 100644 index 5582641..0000000 --- a/src/DemoSite461/Models/Blocks/TeaserBlock.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using EPiServer.Web; - -namespace DemoSite.Models.Blocks -{ - /// - /// Used to provide a stylized entry point to a page on the site - /// - [SiteContentType(GUID = "EB67A99A-E239-41B8-9C59-20EAA5936047")] // BEST PRACTICE TIP: Always assign a GUID explicitly when creating a new block type - [SiteImageUrl] // Use site's default thumbnail - public class TeaserBlock : SiteBlockData - { - [CultureSpecific] - [Required(AllowEmptyStrings = false)] - [Display( - GroupName = SystemTabNames.Content, - Order = 1)] - public virtual string Heading { get; set; } - - [CultureSpecific] - [Required(AllowEmptyStrings = false)] - [Display( - GroupName = SystemTabNames.Content, - Order = 2)] - [UIHint(UIHint.Textarea)] - public virtual string Text { get; set; } - - [CultureSpecific] - [Required(AllowEmptyStrings = false)] - [UIHint(UIHint.Image)] - [Display( - GroupName = SystemTabNames.Content, - Order = 3)] - public virtual ContentReference Image { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 4)] - public virtual PageReference Link { get; set; } - } -} diff --git a/src/DemoSite461/Models/Media/GenericMedia.cs b/src/DemoSite461/Models/Media/GenericMedia.cs deleted file mode 100644 index c999b3d..0000000 --- a/src/DemoSite461/Models/Media/GenericMedia.cs +++ /dev/null @@ -1,15 +0,0 @@ -using EPiServer.Core; -using EPiServer.DataAnnotations; -using System; - -namespace DemoSite.Models.Media -{ - [ContentType(GUID = "EE3BD195-7CB0-4756-AB5F-E5E223CD9820")] - public class GenericMedia : MediaData - { - /// - /// Gets or sets the description. - /// - public virtual String Description { get; set; } - } -} diff --git a/src/DemoSite461/Models/Media/ImageFile.cs b/src/DemoSite461/Models/Media/ImageFile.cs deleted file mode 100644 index bf9e12e..0000000 --- a/src/DemoSite461/Models/Media/ImageFile.cs +++ /dev/null @@ -1,20 +0,0 @@ -using EPiServer.Core; -using EPiServer.DataAnnotations; -using EPiServer.Framework.DataAnnotations; -using System.ComponentModel.DataAnnotations; - -namespace DemoSite.Models.Media -{ - [ContentType(GUID = "0A89E464-56D4-449F-AEA8-2BF774AB8730")] - [MediaDescriptor(ExtensionString = "jpg,jpeg,jpe,ico,gif,bmp,png")] - public class ImageFile : ImageData - { - /// - /// Gets or sets the copyright. - /// - /// - /// The copyright. - /// - public virtual string Copyright { get; set; } - } -} diff --git a/src/DemoSite461/Models/Media/VideoFile.cs b/src/DemoSite461/Models/Media/VideoFile.cs deleted file mode 100644 index ba071fb..0000000 --- a/src/DemoSite461/Models/Media/VideoFile.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAnnotations; -using EPiServer.Framework.DataAnnotations; -using EPiServer.Web; - -namespace DemoSite.Models.Media -{ - [ContentType(GUID = "85468104-E06F-47E5-A317-FC9B83D3CBA6")] - [MediaDescriptor(ExtensionString = "flv,mp4,webm")] - public class VideoFile : VideoData - { - /// - /// Gets or sets the copyright. - /// - public virtual string Copyright { get; set; } - - /// - /// Gets or sets the URL to the preview image. - /// - [UIHint(UIHint.Image)] - public virtual ContentReference PreviewImage { get; set; } - } -} diff --git a/src/DemoSite461/Models/Pages/ArticlePage.cs b/src/DemoSite461/Models/Pages/ArticlePage.cs deleted file mode 100644 index 8695c98..0000000 --- a/src/DemoSite461/Models/Pages/ArticlePage.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace DemoSite.Models.Pages -{ - /// - /// Used primarily for publishing news articles on the website - /// - [SiteContentType( - GroupName = Global.GroupNames.News, - GUID = "AEECADF2-3E89-4117-ADEB-F8D43565D2F4")] - [SiteImageUrl(Global.StaticGraphicsFolderPath + "page-type-thumbnail-article.png")] - public class ArticlePage : StandardPage - { - - } -} diff --git a/src/DemoSite461/Models/Pages/ContactPage.cs b/src/DemoSite461/Models/Pages/ContactPage.cs deleted file mode 100644 index ed6a0d8..0000000 --- a/src/DemoSite461/Models/Pages/ContactPage.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using DemoSite.Business.Rendering; -using EPiServer.Web; -using EPiServer.Core; - -namespace DemoSite.Models.Pages -{ - /// - /// Represents contact details for a contact person - /// - [SiteContentType( - GUID = "F8D47655-7B50-4319-8646-3369BA9AF05B", - GroupName = Global.GroupNames.Specialized)] - [SiteImageUrl(Global.StaticGraphicsFolderPath + "page-type-thumbnail-contact.png")] - public class ContactPage : SitePageData, IContainerPage - { - [Display(GroupName = Global.GroupNames.Contact)] - [UIHint(UIHint.Image)] - public virtual ContentReference Image { get; set; } - - [Display(GroupName = Global.GroupNames.Contact)] - public virtual string Phone { get; set; } - - [Display(GroupName = Global.GroupNames.Contact)] - [EmailAddress] - public virtual string Email { get; set; } - } -} diff --git a/src/DemoSite461/Models/Pages/ContainerPage.cs b/src/DemoSite461/Models/Pages/ContainerPage.cs deleted file mode 100644 index 62571e4..0000000 --- a/src/DemoSite461/Models/Pages/ContainerPage.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DemoSite.Business.Rendering; - -namespace DemoSite.Models.Pages -{ - /// - /// Used to logically group pages in the page tree - /// - [SiteContentType( - GUID = "D178950C-D20E-4A46-90BD-5338B2424745", - GroupName = Global.GroupNames.Specialized)] - [SiteImageUrl] - public class ContainerPage : SitePageData, IContainerPage - { - - } -} diff --git a/src/DemoSite461/Models/Pages/IHasRelatedContent.cs b/src/DemoSite461/Models/Pages/IHasRelatedContent.cs deleted file mode 100644 index 72d24c5..0000000 --- a/src/DemoSite461/Models/Pages/IHasRelatedContent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using EPiServer.Core; - -namespace DemoSite.Models.Pages -{ - public interface IHasRelatedContent - { - ContentArea RelatedContentArea { get; } - } -} diff --git a/src/DemoSite461/Models/Pages/ISearchPage.cs b/src/DemoSite461/Models/Pages/ISearchPage.cs deleted file mode 100644 index 7c4fdfe..0000000 --- a/src/DemoSite461/Models/Pages/ISearchPage.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace DemoSite.Models.Pages -{ - /// - /// Marker interface for search implementation - /// - public interface ISearchPage - { - } -} diff --git a/src/DemoSite461/Models/Pages/LandingPage.cs b/src/DemoSite461/Models/Pages/LandingPage.cs deleted file mode 100644 index 92f843d..0000000 --- a/src/DemoSite461/Models/Pages/LandingPage.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; - -namespace DemoSite.Models.Pages -{ - /// - /// Used for campaign or landing pages, commonly used for pages linked in online advertising such as AdWords - /// - [SiteContentType( - GUID = "DBED4258-8213-48DB-A11F-99C034172A54", - GroupName = Global.GroupNames.Specialized)] - [SiteImageUrl] - public class LandingPage : SitePageData - { - [Display( - GroupName = SystemTabNames.Content, - Order=310)] - [CultureSpecific] - public virtual ContentArea MainContentArea { get; set; } - - public override void SetDefaultValues(ContentType contentType) - { - base.SetDefaultValues(contentType); - - HideSiteFooter = true; - HideSiteHeader = true; - } - } -} diff --git a/src/DemoSite461/Models/Pages/NewsPage.cs b/src/DemoSite461/Models/Pages/NewsPage.cs deleted file mode 100644 index de87d16..0000000 --- a/src/DemoSite461/Models/Pages/NewsPage.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.DataAbstraction; -using EPiServer.Filters; -using EPiServer.Framework.Localization; -using EPiServer.ServiceLocation; -using DemoSite.Business; -using DemoSite.Models.Blocks; - -namespace DemoSite.Models.Pages -{ - /// - /// Presents a news section including a list of the most recent articles on the site - /// - [SiteContentType(GUID = "638D8271-5CA3-4C72-BABC-3E8779233263")] - [SiteImageUrl] - public class NewsPage : StandardPage - { - [Display( - GroupName = SystemTabNames.Content, - Order = 305)] - public virtual PageListBlock NewsList { get; set; } - - public override void SetDefaultValues(ContentType contentType) - { - base.SetDefaultValues(contentType); - - NewsList.Count = 20; - NewsList.Heading = ServiceLocator.Current.GetInstance().GetString("/newspagetemplate/latestnews"); - NewsList.IncludeIntroduction = true; - NewsList.IncludePublishDate = true; - NewsList.Recursive = true; - NewsList.PageTypeFilter = typeof(ArticlePage).GetPageType(); - NewsList.SortOrder = FilterSortOrder.PublishedDescending; - } - } -} diff --git a/src/DemoSite461/Models/Pages/ProductPage.cs b/src/DemoSite461/Models/Pages/ProductPage.cs deleted file mode 100644 index af30bf2..0000000 --- a/src/DemoSite461/Models/Pages/ProductPage.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using DemoSite.Models.Blocks; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using DemoSite.Models.Properties; - -namespace DemoSite.Models.Pages -{ - /// - /// Used to present a single product - /// - [SiteContentType( - GUID = "17583DCD-3C11-49DD-A66D-0DEF0DD601FC", - GroupName = Global.GroupNames.Products)] - [SiteImageUrl(Global.StaticGraphicsFolderPath + "page-type-thumbnail-product.png")] - [AvailableContentTypes( - Availability = Availability.Specific, - IncludeOn = new[] { typeof(StartPage) })] - public class ProductPage : StandardPage, IHasRelatedContent - { - [Required] - [Display(Order = 305)] - [UIHint(Global.SiteUIHints.StringsCollection)] - [CultureSpecific] - public virtual IList UniqueSellingPoints { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 330)] - [CultureSpecific] - [AllowedTypes(new[] { typeof(IContentData) },new[] { typeof(JumbotronBlock) })] - public virtual ContentArea RelatedContentArea { get; set; } - } -} diff --git a/src/DemoSite461/Models/Pages/SearchPage.cs b/src/DemoSite461/Models/Pages/SearchPage.cs deleted file mode 100644 index b55cfc8..0000000 --- a/src/DemoSite461/Models/Pages/SearchPage.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using DemoSite.Models.Blocks; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; - -namespace DemoSite.Models.Pages -{ - /// - /// Used to provide on-site search - /// - [SiteContentType( - GUID = "AAC25733-1D21-4F82-B031-11E626C91E30", - GroupName = Global.GroupNames.Specialized)] - [SiteImageUrl] - public class SearchPage : SitePageData, IHasRelatedContent, ISearchPage - { - [Display( - GroupName = SystemTabNames.Content, - Order = 310)] - [CultureSpecific] - [AllowedTypes(new[] { typeof(IContentData) }, new[] { typeof(JumbotronBlock) })] - public virtual ContentArea RelatedContentArea { get; set; } - } -} diff --git a/src/DemoSite461/Models/Pages/SitePageData.cs b/src/DemoSite461/Models/Pages/SitePageData.cs deleted file mode 100644 index 9de0a19..0000000 --- a/src/DemoSite461/Models/Pages/SitePageData.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using DemoSite.Business.Rendering; -using DemoSite.Models.Properties; -using EPiServer.Web; - -namespace DemoSite.Models.Pages -{ - /// - /// Base class for all page types - /// - public abstract class SitePageData : PageData, ICustomCssInContentArea - { - [Display( - GroupName = Global.GroupNames.MetaData, - Order = 100)] - [CultureSpecific] - public virtual string MetaTitle - { - get - { - var metaTitle = this.GetPropertyValue(p => p.MetaTitle); - - // Use explicitly set meta title, otherwise fall back to page name - return !string.IsNullOrWhiteSpace(metaTitle) - ? metaTitle - : PageName; - } - set { this.SetPropertyValue(p => p.MetaTitle, value); } - } - - [Display( - GroupName = Global.GroupNames.MetaData, - Order = 200)] - [CultureSpecific] - [BackingType(typeof(PropertyStringList))] - public virtual string[] MetaKeywords { get; set; } - - [Display( - GroupName = Global.GroupNames.MetaData, - Order = 300)] - [CultureSpecific] - [UIHint(UIHint.Textarea)] - public virtual string MetaDescription { get; set; } - - [Display( - GroupName = Global.GroupNames.MetaData, - Order = 400)] - [CultureSpecific] - public virtual bool DisableIndexing { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 100)] - [UIHint(UIHint.Image)] - public virtual ContentReference PageImage { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 200)] - [CultureSpecific] - [UIHint(UIHint.Textarea)] - public virtual string TeaserText - { - get - { - var teaserText = this.GetPropertyValue(p => p.TeaserText); - - // Use explicitly set teaser text, otherwise fall back to description - return !string.IsNullOrWhiteSpace(teaserText) - ? teaserText - : MetaDescription; - } - set { this.SetPropertyValue(p => p.TeaserText, value); } - } - - [Display( - GroupName = SystemTabNames.Settings, - Order = 200)] - [CultureSpecific] - public virtual bool HideSiteHeader { get; set; } - - [Display( - GroupName = SystemTabNames.Settings, - Order = 300)] - [CultureSpecific] - public virtual bool HideSiteFooter { get; set; } - - public string ContentAreaCssClass - { - get { return "teaserblock"; } //Page partials should be style like teasers - } - } -} diff --git a/src/DemoSite461/Models/Pages/StandardPage.cs b/src/DemoSite461/Models/Pages/StandardPage.cs deleted file mode 100644 index 3bd3b35..0000000 --- a/src/DemoSite461/Models/Pages/StandardPage.cs +++ /dev/null @@ -1,26 +0,0 @@ -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using System.ComponentModel.DataAnnotations; - -namespace DemoSite.Models.Pages -{ - /// - /// Used for the pages mainly consisting of manually created content such as text, images, and blocks - /// - [SiteContentType(GUID = "9CCC8A41-5C8C-4BE0-8E73-520FF3DE8267")] - [SiteImageUrl(Global.StaticGraphicsFolderPath + "page-type-thumbnail-standard.png")] - public class StandardPage : SitePageData - { - [Display( - GroupName = SystemTabNames.Content, - Order = 310)] - [CultureSpecific] - public virtual XhtmlString MainBody { get; set; } - - [Display( - GroupName = SystemTabNames.Content, - Order = 320)] - public virtual ContentArea MainContentArea { get; set; } - } -} diff --git a/src/DemoSite461/Models/Pages/StartPage.cs b/src/DemoSite461/Models/Pages/StartPage.cs deleted file mode 100644 index ecc4a6a..0000000 --- a/src/DemoSite461/Models/Pages/StartPage.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using EPiServer.Core; -using EPiServer.DataAbstraction; -using EPiServer.DataAnnotations; -using EPiServer.SpecializedProperties; -using DemoSite.Models.Blocks; - -namespace DemoSite.Models.Pages -{ - /// - /// Used for the site's start page and also acts as a container for site settings - /// - [ContentType( - GUID = "19671657-B684-4D95-A61F-8DD4FE60D559", - GroupName = Global.GroupNames.Specialized)] - [SiteImageUrl] - [AvailableContentTypes( - Availability.Specific, - Include = new[] { typeof(ContainerPage), typeof(ProductPage), typeof(StandardPage), typeof(ISearchPage), typeof(LandingPage), typeof(ContentFolder) }, // Pages we can create under the start page... - ExcludeOn = new[] { typeof(ContainerPage), typeof(ProductPage), typeof(StandardPage), typeof(ISearchPage), typeof(LandingPage) })] // ...and underneath those we can't create additional start pages - public class StartPage : SitePageData - { - [Display( - GroupName = SystemTabNames.Content, - Order = 320)] - [CultureSpecific] - public virtual ContentArea MainContentArea { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings, Order = 300)] - public virtual LinkItemCollection ProductPageLinks { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings, Order = 350)] - public virtual LinkItemCollection CompanyInformationPageLinks { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings, Order = 400)] - public virtual LinkItemCollection NewsPageLinks { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings, Order = 450)] - public virtual LinkItemCollection CustomerZonePageLinks { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings)] - public virtual PageReference GlobalNewsPageLink { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings)] - public virtual PageReference ContactsPageLink { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings)] - public virtual PageReference SearchPageLink { get; set; } - - [Display(GroupName = Global.GroupNames.SiteSettings)] - public virtual SiteLogotypeBlock SiteLogotype { get; set; } - - } -} diff --git a/src/DemoSite461/Models/Properties/PropertyStringList.cs b/src/DemoSite461/Models/Properties/PropertyStringList.cs deleted file mode 100644 index 8349631..0000000 --- a/src/DemoSite461/Models/Properties/PropertyStringList.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using EPiServer.Core; -using EPiServer.Framework.DataAnnotations; -using EPiServer.PlugIn; - -namespace DemoSite.Models.Properties -{ - /// - /// Property type for storing a list of strings - /// - /// For an example, see where this property type is used for the MetaKeywords property - [EditorHint(Global.SiteUIHints.Strings)] - [PropertyDefinitionTypePlugIn(Description = "A property for list of strings", DisplayName = "String List")] - public class PropertyStringList : PropertyLongString - { - protected String Separator = "\n"; - - public String[] List - { - get - { - return (String[])Value; - } - } - - public override Type PropertyValueType - { - get - { - return typeof(String[]); - } - } - - public override object SaveData(PropertyDataCollection properties) - { - return LongString; - } - - public override object Value - { - get - { - var value = base.Value as string; - - if (value == null) - { - return null; - } - - return value.Split(Separator.ToCharArray(), StringSplitOptions.RemoveEmptyEntries); - } - set - { - if (value is String[]) - { - var s = String.Join(Separator, value as String[]); - base.Value = s; - } - else - { - base.Value = value; - } - - } - } - } -} diff --git a/src/DemoSite461/Models/Register/RegisterViewModel.cs b/src/DemoSite461/Models/Register/RegisterViewModel.cs deleted file mode 100644 index b0a1ef6..0000000 --- a/src/DemoSite461/Models/Register/RegisterViewModel.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; - -namespace DemoSite.Models -{ - public class RegisterViewModel - { - [Required] - [Display(Name = "Username")] - [RegularExpression(@"^[a-zA-Z0-9_-]+$", ErrorMessage = "Username can only contain letters a-z, numbers, underscores and hyphens.")] - [StringLength(20, ErrorMessage ="The {0} field can not be more than {1} characters long.")] - public string Username { get; set; } - - [Required] - [EmailAddress] - [Display(Name = "Email")] - public string Email { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "Password")] - [AllowHtml] - public string Password { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm password")] - [System.ComponentModel.DataAnnotations.Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - [AllowHtml] - public string ConfirmPassword { get; set; } - - } -} diff --git a/src/DemoSite461/Models/SiteContentType.cs b/src/DemoSite461/Models/SiteContentType.cs deleted file mode 100644 index 8fc326d..0000000 --- a/src/DemoSite461/Models/SiteContentType.cs +++ /dev/null @@ -1,15 +0,0 @@ -using EPiServer.DataAnnotations; - -namespace DemoSite.Models -{ - /// - /// Attribute used for site content types to set default attribute values - /// - public class SiteContentType : ContentTypeAttribute - { - public SiteContentType() - { - GroupName = Global.GroupNames.Default; - } - } -} diff --git a/src/DemoSite461/Models/SiteImageUrl.cs b/src/DemoSite461/Models/SiteImageUrl.cs deleted file mode 100644 index 563f3ab..0000000 --- a/src/DemoSite461/Models/SiteImageUrl.cs +++ /dev/null @@ -1,23 +0,0 @@ -using EPiServer.DataAnnotations; - -namespace DemoSite.Models -{ - /// - /// Attribute to set the default thumbnail for site page and block types - /// - public class SiteImageUrl : ImageUrlAttribute - { - /// - /// The parameterless constructor will initialize a SiteImageUrl attribute with a default thumbnail - /// - public SiteImageUrl() : base("~/Static/gfx/page-type-thumbnail.png") - { - - } - - public SiteImageUrl(string path) : base(path) - { - - } - } -} diff --git a/src/DemoSite461/Models/ViewModels/ContactBlockModel.cs b/src/DemoSite461/Models/ViewModels/ContactBlockModel.cs deleted file mode 100644 index 48775e4..0000000 --- a/src/DemoSite461/Models/ViewModels/ContactBlockModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Web; -using System.ComponentModel.DataAnnotations; -using DemoSite.Models.Pages; -using EPiServer.Web; -using EPiServer.Core; - -namespace DemoSite.Models.ViewModels -{ - public class ContactBlockModel - { - [UIHint(UIHint.Image)] - public ContentReference Image { get; set; } - public string Heading { get; set; } - public string LinkText { get; set; } - public IHtmlString LinkUrl { get; set; } - public bool ShowLink { get; set; } - public ContactPage ContactPage { get; set; } - } -} diff --git a/src/DemoSite461/Models/ViewModels/ContentRenderingErrorModel.cs b/src/DemoSite461/Models/ViewModels/ContentRenderingErrorModel.cs deleted file mode 100644 index 19f5467..0000000 --- a/src/DemoSite461/Models/ViewModels/ContentRenderingErrorModel.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using EPiServer; -using EPiServer.Core; - -namespace DemoSite.Models.ViewModels -{ - public class ContentRenderingErrorModel - { - public ContentRenderingErrorModel(IContentData contentData, Exception exception) - { - var content = contentData as IContent; - if(content != null) - { - ContentName = content.Name; - } - else - { - ContentName = string.Empty; - } - - ContentTypeName = contentData.GetOriginalType().Name; - - Exception = exception; - } - - public string ContentName { get; set; } - public string ContentTypeName { get; set; } - public Exception Exception { get; set; } - } -} diff --git a/src/DemoSite461/Models/ViewModels/IPageViewModel.cs b/src/DemoSite461/Models/ViewModels/IPageViewModel.cs deleted file mode 100644 index bdbfc52..0000000 --- a/src/DemoSite461/Models/ViewModels/IPageViewModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using EPiServer.Core; -using DemoSite.Models.Pages; - -namespace DemoSite.Models.ViewModels -{ - /// - /// Defines common characteristics for view models for pages, including properties used by layout files. - /// - /// - /// Views which should handle several page types (T) can use this interface as model type rather than the - /// concrete PageViewModel class, utilizing the that this interface is covariant. - /// - public interface IPageViewModel where T : SitePageData - { - T CurrentPage { get; } - LayoutModel Layout { get; set; } - IContent Section { get; set; } - } -} diff --git a/src/DemoSite461/Models/ViewModels/ImageViewModel.cs b/src/DemoSite461/Models/ViewModels/ImageViewModel.cs deleted file mode 100644 index 774d24f..0000000 --- a/src/DemoSite461/Models/ViewModels/ImageViewModel.cs +++ /dev/null @@ -1,24 +0,0 @@ - -namespace DemoSite.Models.ViewModels -{ - /// - /// View model for the image file - /// - public class ImageViewModel - { - /// - /// Gets or sets the URL to the image. - /// - public string Url { get; set; } - - /// - /// Gets or sets the name of the image. - /// - public string Name { get; set; } - - /// - /// Gets or sets the copyright information of the image. - /// - public string Copyright { get; set; } - } -} diff --git a/src/DemoSite461/Models/ViewModels/LayoutModel.cs b/src/DemoSite461/Models/ViewModels/LayoutModel.cs deleted file mode 100644 index 778014e..0000000 --- a/src/DemoSite461/Models/ViewModels/LayoutModel.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Web; -using System.Web.Mvc; -using EPiServer.SpecializedProperties; -using DemoSite.Models.Blocks; - -namespace DemoSite.Models.ViewModels -{ - public class LayoutModel - { - public SiteLogotypeBlock Logotype { get; set; } - public IHtmlString LogotypeLinkUrl { get; set; } - public bool HideHeader { get; set; } - public bool HideFooter { get; set; } - public LinkItemCollection ProductPages { get; set; } - public LinkItemCollection CompanyInformationPages { get; set; } - public LinkItemCollection NewsPages { get; set; } - public LinkItemCollection CustomerZonePages { get; set; } - public bool LoggedIn { get; set; } - public MvcHtmlString LoginUrl { get; set; } - public MvcHtmlString LogOutUrl { get; set; } - public MvcHtmlString SearchActionUrl { get; set; } - - public bool IsInReadonlyMode {get;set;} - } -} diff --git a/src/DemoSite461/Models/ViewModels/PageListModel.cs b/src/DemoSite461/Models/ViewModels/PageListModel.cs deleted file mode 100644 index ecf2a93..0000000 --- a/src/DemoSite461/Models/ViewModels/PageListModel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Generic; -using EPiServer.Core; -using DemoSite.Models.Blocks; - -namespace DemoSite.Models.ViewModels -{ - public class PageListModel - { - public PageListModel(PageListBlock block) - { - Heading = block.Heading; - ShowIntroduction = block.IncludeIntroduction; - ShowPublishDate = block.IncludePublishDate; - } - public string Heading { get; set; } - public IEnumerable Pages { get; set; } - public bool ShowIntroduction { get; set; } - public bool ShowPublishDate { get; set; } - } -} diff --git a/src/DemoSite461/Models/ViewModels/PageViewModel.cs b/src/DemoSite461/Models/ViewModels/PageViewModel.cs deleted file mode 100644 index 917e656..0000000 --- a/src/DemoSite461/Models/ViewModels/PageViewModel.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using EPiServer.Core; -using DemoSite.Models.Pages; - -namespace DemoSite.Models.ViewModels -{ - public class PageViewModel : IPageViewModel where T : SitePageData - { - public PageViewModel(T currentPage) - { - CurrentPage = currentPage; - } - - public T CurrentPage { get; private set; } - public LayoutModel Layout { get; set; } - public IContent Section { get; set; } - } - - public static class PageViewModel - { - /// - /// Returns a PageViewModel of type . - /// - /// - /// Convenience method for creating PageViewModels without having to specify the type as methods can use type inference while constructors cannot. - /// - public static PageViewModel Create(T page) where T : SitePageData - { - return new PageViewModel(page); - } - } -} diff --git a/src/DemoSite461/Models/ViewModels/PreviewModel.cs b/src/DemoSite461/Models/ViewModels/PreviewModel.cs deleted file mode 100644 index 35d77cc..0000000 --- a/src/DemoSite461/Models/ViewModels/PreviewModel.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; -using EPiServer.Core; -using DemoSite.Models.Pages; - -namespace DemoSite.Models.ViewModels -{ - public class PreviewModel : PageViewModel - { - public PreviewModel(SitePageData currentPage, IContent previewContent) - : base(currentPage) - { - PreviewContent = previewContent; - Areas = new List(); - } - - public IContent PreviewContent { get; set; } - public List Areas { get; set; } - - public class PreviewArea - { - public bool Supported { get; set; } - public string AreaName { get; set; } - public string AreaTag { get; set; } - public ContentArea ContentArea { get; set; } - } - } -} diff --git a/src/DemoSite461/Models/ViewModels/SearchContentModel.cs b/src/DemoSite461/Models/ViewModels/SearchContentModel.cs deleted file mode 100644 index 440c670..0000000 --- a/src/DemoSite461/Models/ViewModels/SearchContentModel.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using DemoSite.Models.Pages; - -namespace DemoSite.Models.ViewModels -{ - public class SearchContentModel : PageViewModel - { - public SearchContentModel(SearchPage currentPage) : base(currentPage) - { - } - - public bool SearchServiceDisabled { get; set; } - public string SearchedQuery { get; set; } - public int NumberOfHits { get; set; } - public IEnumerable Hits { get; set; } - - public class SearchHit - { - public string Title { get; set; } - public string Url { get; set; } - public string Excerpt { get; set; } - } - } -} diff --git a/src/DemoSite461/Models/ViewModels/VideoViewModel.cs b/src/DemoSite461/Models/ViewModels/VideoViewModel.cs deleted file mode 100644 index 9c2de2b..0000000 --- a/src/DemoSite461/Models/ViewModels/VideoViewModel.cs +++ /dev/null @@ -1,19 +0,0 @@ - -namespace DemoSite.Models.ViewModels -{ - /// - /// View model for the video file - /// - public class VideoViewModel - { - /// - /// Gets or sets the URL to the video. - /// - public string Url { get; set; } - - /// - /// Gets or sets the URL to a preview image for the video. - /// - public string PreviewImageUrl { get; set; } - } -} diff --git a/src/DemoSite461/Properties/AssemblyInfo.cs b/src/DemoSite461/Properties/AssemblyInfo.cs deleted file mode 100644 index a320d3c..0000000 --- a/src/DemoSite461/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DemoSite")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DemoSite")] -[assembly: AssemblyCopyright("Copyright © 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d8dac762-5173-4dac-b8ab-26393511be85")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/DemoSite461/Resources/LanguageFiles/ContentTypeNames.xml b/src/DemoSite461/Resources/LanguageFiles/ContentTypeNames.xml deleted file mode 100644 index d017d92..0000000 --- a/src/DemoSite461/Resources/LanguageFiles/ContentTypeNames.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - Page List - Displays a list of pages, for example to display recent news - - - Teaser - Used to insert a content teaser - - - Logotype - Used to set the logotype for the website - - - Video Player - Used to embed a video player - - - Editorial - Used to add simple editorial content - - - Contact - Used to add contact information - - - Button - Used to add a button with a link - - - Jumbotron - Used to add a large section - - - Article - Used to publish news articles on the website - - - Contact - Used to publish contact details for a specific contact - - - Container Page - Used to logically group pages in the content tree - - - Landing Page - Used to create a page consisting entirely of blocks - - - News Page - Used as a start page for a site's news section and commonly displays a list of the most recent articles - - - Product - Used to present a specific product - - - Search Page - Used to provide on-site search features - - - Start Page - The home page of the website - - - Standard Page - Used mainly for default editorial content such as text and images - - - Image - Used for image files (BMP, GIF, ICO, JPEG, PNG) - - - Video - Used for video files (FLV, MP4, WEBM) - - - Generic File - Used for media which doesn't have a specific content type - - - - diff --git a/src/DemoSite461/Resources/LanguageFiles/Display.xml b/src/DemoSite461/Resources/LanguageFiles/Display.xml deleted file mode 100644 index 8d0936c..0000000 --- a/src/DemoSite461/Resources/LanguageFiles/Display.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Mobile - - - Web - - - - Full - Wide - Narrow - - - Standard (1366x768) - iPad horizontal (1024x768) - iPhone vertical (320x568) - Android vertical (480x800) - - - \ No newline at end of file diff --git a/src/DemoSite461/Resources/LanguageFiles/EditorHints.xml b/src/DemoSite461/Resources/LanguageFiles/EditorHints.xml deleted file mode 100644 index 895e0dd..0000000 --- a/src/DemoSite461/Resources/LanguageFiles/EditorHints.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - Button Text - - - - - - This block type does not have a renderer for this type of content area. - - - - - - Error while rendering {0} {1} - - - - The block '{0}' when displayed as {1} - The block '{0}' cannot be displayed as {1} - No renderer found for '{0}' - - - - diff --git a/src/DemoSite461/Resources/LanguageFiles/GroupNames.xml b/src/DemoSite461/Resources/LanguageFiles/GroupNames.xml deleted file mode 100644 index baee814..0000000 --- a/src/DemoSite461/Resources/LanguageFiles/GroupNames.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - Default - - - News - - - Products - - - SEO - - - Site settings - - - Specialized - - - - - - diff --git a/src/DemoSite461/Resources/LanguageFiles/PropertyNames.xml b/src/DemoSite461/Resources/LanguageFiles/PropertyNames.xml deleted file mode 100644 index f5093b8..0000000 --- a/src/DemoSite461/Resources/LanguageFiles/PropertyNames.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - Disable indexing - Prevents the page from being indexed by search engines - - - Page description - Used as the meta description and commonly as an ingress - - - Keywords - - - Title - - - Teaser text - Can be used to display a text other than the description when the page is dropped in a content area - - - Teaser image - An image used in different contexts, for example when the page is dropped in a content area - - - Hide site header - Check this setting to hide the header including the main navigation - - - Hide site footer - Check this setting to hide the footer - - - - Main body - Main editorial content of the page - - - Large content area - - - - - - - - Unique selling points - - - Small content area - - - - - - - - Products - - - Company information - - - Customer zone - - - Local news - - - Global news - - - Contact pages - - - First content area - - - Second content area - - - Logotype - - - Search page - - - - - - - - Image - - - Heading - - - Contact - Select who you want to show contact details for - - - Link text - - - Link - - - - - - - - Heading - - - Include publish date - - - Include description - - - Sort order - - - Max count - - - Page list root - - - Include all levels - - - Filter by page type - - - Category filter - If set, only pages matching at least one of the specified categories will be included in the list - - - - - - - - Image - - - Image description - - - Large heading - - - Small heading - - - Button text - - - Button link - - - - - - - - Heading - - - Text - - - Image - - - Link - - - - - - - - Logotype - - - <caption>Title</caption> - - - - - - - - Copyright - - - - - - - - Copyright - - - Preview image - - - - - - diff --git a/src/DemoSite461/Resources/LanguageFiles/Views.xml b/src/DemoSite461/Resources/LanguageFiles/Views.xml deleted file mode 100644 index b6f97b2..0000000 --- a/src/DemoSite461/Resources/LanguageFiles/Views.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - E-mail - Phone - No contact selected - - -
- The Company - Customer Zone - Log in - Log out - News & Events - Products -
- - - Search - - - - Latest news - News list will be empty since no list root has been set - - - - no - Search result - Search - Your search for - resulted in - hits - EPiServer Search is not configured or is not active for this website. - - - - - diff --git a/src/DemoSite461/Resources/LanguageFiles/_ReadMe.txt b/src/DemoSite461/Resources/LanguageFiles/_ReadMe.txt deleted file mode 100644 index 98c4d84..0000000 --- a/src/DemoSite461/Resources/LanguageFiles/_ReadMe.txt +++ /dev/null @@ -1,11 +0,0 @@ -All language files in this folder are included in the LocalizationService. - -The path to this folder is configured in EPiServerFramework.config: - - - - - - diff --git a/src/DemoSite461/Startup.cs b/src/DemoSite461/Startup.cs deleted file mode 100644 index 0c36efc..0000000 --- a/src/DemoSite461/Startup.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Web; -using EPiServer.Cms.UI.AspNetIdentity; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.Owin; -using Microsoft.Owin; -using Microsoft.Owin.Security.Cookies; -using Owin; - -[assembly: OwinStartup(typeof(DemoSite.Startup))] - -namespace DemoSite -{ - public class Startup - { - - public void Configuration(IAppBuilder app) - { - - // Add CMS integration for ASP.NET Identity - app.AddCmsAspNetIdentity(); - - // Remove to block registration of administrators - app.UseAdministratorRegistrationPage(() => HttpContext.Current.Request.IsLocal); - - // Use cookie authentication - app.UseCookieAuthentication(new CookieAuthenticationOptions - { - AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie, - LoginPath = new PathString(Global.LoginPath), - Provider = new CookieAuthenticationProvider - { - // If the "/util/login.aspx" has been used for login otherwise you don't need it you can remove OnApplyRedirect. - OnApplyRedirect = cookieApplyRedirectContext => - { - app.CmsOnCookieApplyRedirect(cookieApplyRedirectContext, cookieApplyRedirectContext.OwinContext.Get>()); - }, - - // Enables the application to validate the security stamp when the user logs in. - // This is a security feature which is used when you change a password or add an external login to your account. - OnValidateIdentity = SecurityStampValidator.OnValidateIdentity, ApplicationUser>( - validateInterval: TimeSpan.FromMinutes(30), - regenerateIdentity: (manager, user) => manager.GenerateUserIdentityAsync(user)) - } - }); - } - } -} diff --git a/src/DemoSite461/Static/css/bootstrap-collapse.js b/src/DemoSite461/Static/css/bootstrap-collapse.js deleted file mode 100644 index d72982e..0000000 --- a/src/DemoSite461/Static/css/bootstrap-collapse.js +++ /dev/null @@ -1,158 +0,0 @@ -/* ============================================================= - * bootstrap-collapse.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}(window.jQuery);// JavaScript Document \ No newline at end of file diff --git a/src/DemoSite461/Static/css/bootstrap-responsive.css b/src/DemoSite461/Static/css/bootstrap-responsive.css deleted file mode 100644 index 161270f..0000000 --- a/src/DemoSite461/Static/css/bootstrap-responsive.css +++ /dev/null @@ -1,848 +0,0 @@ -/*! - * Bootstrap Responsive v2.0.4 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} - -.hidden { - display: none; - visibility: hidden; -} - -.visible-phone { - display: none !important; -} - -.visible-tablet { - display: none !important; -} - -.hidden-desktop { - display: none !important; -} - -@media (max-width: 767px) { - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 18px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .modal { - position: absolute; - top: 10px; - right: 10px; - left: 10px; - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - [class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: auto; - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 20px; - } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 28px; - margin-left: 2.762430939%; - *margin-left: 2.709239449638298%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 99.999999993%; - *width: 99.9468085036383%; - } - .row-fluid .span11 { - width: 91.436464082%; - *width: 91.38327259263829%; - } - .row-fluid .span10 { - width: 82.87292817100001%; - *width: 82.8197366816383%; - } - .row-fluid .span9 { - width: 74.30939226%; - *width: 74.25620077063829%; - } - .row-fluid .span8 { - width: 65.74585634900001%; - *width: 65.6926648596383%; - } - .row-fluid .span7 { - width: 57.182320438000005%; - *width: 57.129128948638304%; - } - .row-fluid .span6 { - width: 48.618784527%; - *width: 48.5655930376383%; - } - .row-fluid .span5 { - width: 40.055248616%; - *width: 40.0020571266383%; - } - .row-fluid .span4 { - width: 31.491712705%; - *width: 31.4385212156383%; - } - .row-fluid .span3 { - width: 22.928176794%; - *width: 22.874985304638297%; - } - .row-fluid .span2 { - width: 14.364640883%; - *width: 14.311449393638298%; - } - .row-fluid .span1 { - width: 5.801104972%; - *width: 5.747913482638298%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 714px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 652px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 590px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 528px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 466px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 404px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 342px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 280px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 218px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 156px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 94px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 32px; - } -} - -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 30px; - } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 28px; - margin-left: 2.564102564%; - *margin-left: 2.510911074638298%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145300001%; - *width: 91.3997999636383%; - } - .row-fluid .span10 { - width: 82.905982906%; - *width: 82.8527914166383%; - } - .row-fluid .span9 { - width: 74.358974359%; - *width: 74.30578286963829%; - } - .row-fluid .span8 { - width: 65.81196581200001%; - *width: 65.7587743226383%; - } - .row-fluid .span7 { - width: 57.264957265%; - *width: 57.2117657756383%; - } - .row-fluid .span6 { - width: 48.717948718%; - *width: 48.6647572286383%; - } - .row-fluid .span5 { - width: 40.170940171000005%; - *width: 40.117748681638304%; - } - .row-fluid .span4 { - width: 31.623931624%; - *width: 31.5707401346383%; - } - .row-fluid .span3 { - width: 23.076923077%; - *width: 23.0237315876383%; - } - .row-fluid .span2 { - width: 14.529914530000001%; - *width: 14.4767230406383%; - } - .row-fluid .span1 { - width: 5.982905983%; - *width: 5.929714493638298%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1160px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1060px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 960px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 860px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 760px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 660px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 560px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 460px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 360px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 260px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 160px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 60px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 18px; - } - .navbar-fixed-bottom { - margin-top: 18px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 9px; - text-align:center; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #999999; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 6px 15px; - font-weight: bold; - color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .dropdown-menu a:hover { - background-color: #222222; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: block; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - text-align:center; - margin: 9px 0; - border-top: none; - border-bottom: none; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - padding-bottom:8px; - background:#f1f1f1; - border-radius:0 0 4px 4px; - } - - .alloyMenu .navbar .nav-collapse .nav > li.active > a, .alloyMenu .navbar .nav-collapse .nav > li.active > a:hover, .alloyMenu .navbar .nav-collapse .nav > li > a:hover - { - background:#2980BD; - color:#fff; - border:none; - } - - .alloyMenu .navbar .nav-collapse .nav > li > a.theme1:hover, .alloyMenu .navbar .nav-collapse .nav>li.active>a.theme1 - { - background:#EB5E31; - color:#fff; - border:none; - } - - .alloyMenu .navbar .nav-collapse .nav > li > a.theme2:hover, .alloyMenu .navbar .nav-collapse .nav>li.active>a.theme2 - { - background:#BF5D8C; - color:#fff; - border:none; - } - - .alloyMenu .navbar .nav-collapse .nav > li > a.theme3:hover, .alloyMenu .navbar .nav-collapse .nav>li.active>a.theme3 - { - background:#9FC733; - color:#fff; - border:none; - } - - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/src/DemoSite461/Static/css/bootstrap.css b/src/DemoSite461/Static/css/bootstrap.css deleted file mode 100644 index 94a65f3..0000000 --- a/src/DemoSite461/Static/css/bootstrap.css +++ /dev/null @@ -1,5022 +0,0 @@ -/*! - * Bootstrap v2.0.4 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -audio:not([controls]) { - display: none; -} - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -a:hover, -a:active { - outline: 0; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -#map_canvas img { - max-width: none; -} - -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} - -button, -input { - *overflow: visible; - line-height: normal; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} - -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #333333; - background-color: #ffffff; -} - -a { - color: #2980bd; - text-decoration: none; -} - -a:hover { - color: #005580; - -} - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - content: ""; - clear:both; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - margin-left: 20px; -} - -.container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 28px; - margin-left: 2.127659574%; - *margin-left: 2.0744680846382977%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} - -.row-fluid [class*="span"]:first-child { - margin-left: 0; -} - -.row-fluid .span12 { - width: 99.99999998999999%; - *width: 99.94680850063828%; -} - -.row-fluid .span11 { - width: 91.489361693%; - *width: 91.4361702036383%; -} - -.row-fluid .span10 { - width: 82.97872339599999%; - *width: 82.92553190663828%; -} - -.row-fluid .span9 { - width: 74.468085099%; - *width: 74.4148936096383%; -} - -.row-fluid .span8 { - width: 65.95744680199999%; - *width: 65.90425531263828%; -} - -.row-fluid .span7 { - width: 57.446808505%; - *width: 57.3936170156383%; -} - -.row-fluid .span6 { - width: 48.93617020799999%; - *width: 48.88297871863829%; -} - -.row-fluid .span5 { - width: 40.425531911%; - *width: 40.3723404216383%; -} - -.row-fluid .span4 { - width: 31.914893614%; - *width: 31.8617021246383%; -} - -.row-fluid .span3 { - width: 23.404255317%; - *width: 23.3510638276383%; -} - -.row-fluid .span2 { - width: 14.89361702%; - *width: 14.8404255306383%; -} - -.row-fluid .span1 { - width: 6.382978723%; - *width: 6.329787233638298%; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 9px; -} - -p small { - font-size: 11px; - color: #999999; -} - -.lead { - margin-bottom: 18px; - font-size: 20px; - font-weight: 200; - line-height: 27px; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-family: inherit; - font-weight: bold; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} - -h1 { - font-size: 30px; - line-height: 36px; -} - -h1 small { - font-size: 18px; -} - -h2 { - font-size: 2em; - line-height: 36px; -} - -h2 small { - font-size: 18px; -} - -h3 { - font-size: 1.7em; - line-height: 30px; -} - -h3 small { - font-size: 14px; -} - -h4, -h5, -h6 { - line-height: 18px; -} - -h4 { - font-size: 14px; -} - -h4 small { - font-size: 12px; -} - -h5 { - font-size: 12px; -} - -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} - -.page-header { - padding-bottom: 17px; - margin: 18px 0; - border-bottom: 1px solid #eeeeee; -} - -.page-header h1 { - line-height: 1; -} - -ul, -ol { - padding: 0; - margin: 0 0 9px 25px; -} - -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} - -ul { - list-style: disc; -} - -ol { - list-style: decimal; -} - -li { - line-height: 18px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -dl { - margin-bottom: 18px; -} - -dt, -dd { - line-height: 18px; -} - -dt { - font-weight: bold; - line-height: 17px; -} - -dd { - margin-left: 9px; -} - -.dl-horizontal dt { - float: left; - width: 120px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 130px; -} - -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -.muted { - color: #999999; -} - -abbr[title] { - cursor: help; - border-bottom: 1px dotted #999999; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 22.5px; -} - -blockquote small { - display: block; - line-height: 18px; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 18px; - font-style: normal; - line-height: 18px; -} - -small { - font-size: 100%; -} - -cite { - font-style: normal; -} - -code, -pre { - padding: 0 3px 2px; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -code { - padding: 2px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -pre { - display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - 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; -} - -pre.prettyprint { - margin-bottom: 18px; -} - -pre code { - padding: 0; - color: inherit; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -form { - margin: 0 0 18px; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; -} - -legend small { - font-size: 13.5px; - color: #999999; -} - - -fieldset legend -{ - border:0; - font-size:1em; - margin-bottom:5px; - } - -label, -input, -button, -select, -textarea { - font-size: 13px; - font-weight: normal; - line-height: 18px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -label { - display: block; - margin-bottom: 5px; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: 18px; - padding: 4px; - margin-bottom: 15px; - font-size: 13px; - line-height: 18px; - color: #555555; -} - -input, -textarea { - width: 98%; - max-width:620px; -} - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - -input[type="radio"], -input[type="checkbox"] { - margin: -1px 0 0 0; - *margin-top: 0; - /* IE7 */ - - line-height: normal; - cursor: pointer; -} - -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; -} - -.uneditable-textarea { - width: auto; - height: auto; -} - -select, -input[type="file"] { - height: 28px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 28px; -} - -select { - width: 220px; - border: 1px solid #bbb; -} - -select[multiple], -select[size] { - height: auto; -} - -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.radio, -.checkbox { - min-height: 18px; - padding-left: 18px; -} - -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} - -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 930px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 850px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 770px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 690px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 610px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 530px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 450px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 370px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 290px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 210px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 130px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 50px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; - border-color: #ddd; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - -.control-group.warning > label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} - -.control-group.warning .checkbox, -.control-group.warning .radio, -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; - border-color: #c09853; -} - -.control-group.warning .checkbox:focus, -.control-group.warning .radio:focus, -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; -} - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.control-group.error > label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} - -.control-group.error .checkbox, -.control-group.error .radio, -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; - border-color: #b94a48; -} - -.control-group.error .checkbox:focus, -.control-group.error .radio:focus, -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; -} - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.control-group.success > label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} - -.control-group.success .checkbox, -.control-group.success .radio, -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; - border-color: #468847; -} - -.control-group.success .checkbox:focus, -.control-group.success .radio:focus, -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; -} - -.form-actions:before, -.form-actions:after { - display: table; - content: ""; -} - -.form-actions:after { - clear: both; -} - -.uneditable-input { - overflow: hidden; - white-space: nowrap; - cursor: not-allowed; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -:-moz-placeholder { - color: #999999; -} - -:-ms-input-placeholder { - color: #999999; -} - -::-webkit-input-placeholder { - color: #999999; -} - -.help-block, -.help-inline { - color: #555555; -} - -.help-block { - display: block; - margin-bottom: 9px; -} - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; -} - -.input-prepend, -.input-append { - margin-bottom: 5px; -} - -.input-prepend input, -.input-append input, -.input-prepend select, -.input-append select, -.input-prepend .uneditable-input, -.input-append .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: middle; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.input-prepend input:focus, -.input-append input:focus, -.input-prepend select:focus, -.input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { - z-index: 2; -} - -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} - -.input-prepend .add-on, -.input-append .add-on { - display: inline-block; - width: auto; - height: 18px; - min-width: 16px; - padding: 4px 5px; - font-weight: normal; - line-height: 18px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-prepend .add-on, -.input-append .add-on, -.input-prepend .btn, -.input-append .btn { - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend .active, -.input-append .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.input-append .uneditable-input { - border-right-color: #ccc; - border-left-color: #eee; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - *zoom: 1; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} - -.form-search label, -.form-inline label { - display: inline-block; -} - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 9px; -} - -legend + .control-group { - margin-top: 18px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 18px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 160px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 160px; -} - -.form-horizontal .help-block { - margin-top: 9px; - margin-bottom: 0; -} - -.form-horizontal .form-actions { - padding-left: 160px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 18px; -} - -.table th, -.table td { - padding: 8px; - line-height: 18px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapsed; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: #f9f9f9; -} - -.table tbody tr:hover td, -.table tbody tr:hover th { - background-color: #f5f5f5; -} - -table .span1 { - float: none; - width: 44px; - margin-left: 0; -} - -table .span2 { - float: none; - width: 124px; - margin-left: 0; -} - -table .span3 { - float: none; - width: 204px; - margin-left: 0; -} - -table .span4 { - float: none; - width: 284px; - margin-left: 0; -} - -table .span5 { - float: none; - width: 364px; - margin-left: 0; -} - -table .span6 { - float: none; - width: 444px; - margin-left: 0; -} - -table .span7 { - float: none; - width: 524px; - margin-left: 0; -} - -table .span8 { - float: none; - width: 604px; - margin-left: 0; -} - -table .span9 { - float: none; - width: 684px; - margin-left: 0; -} - -table .span10 { - float: none; - width: 764px; - margin-left: 0; -} - -table .span11 { - float: none; - width: 844px; - margin-left: 0; -} - -table .span12 { - float: none; - width: 924px; - margin-left: 0; -} - -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} - -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} - -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} - -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} - -table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} - -table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} - -table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} - -table .span20 { - float: none; - width: 1564px; - margin-left: 0; -} - -table .span21 { - float: none; - width: 1644px; - margin-left: 0; -} - -table .span22 { - float: none; - width: 1724px; - margin-left: 0; -} - -table .span23 { - float: none; - width: 1804px; - margin-left: 0; -} - -table .span24 { - float: none; - width: 1884px; - margin-left: 0; -} - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} - -[class^="icon-"]:last-child, -[class*=" icon-"]:last-child { - *margin-left: 0; -} - -.icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - background-position: -384px -120px; -} - -.icon-folder-open { - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} - -.dropup, -.dropdown { - position: relative; -} - -.dropdown-toggle { - *margin-bottom: -3px; -} - -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; - opacity: 0.3; - filter: alpha(opacity=30); -} - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -.dropdown:hover .caret, -.open .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 8px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #2980bd; -} - -.open { - *z-index: 1000; -} - -.open > .dropdown-menu { - display: block; -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: "\2191"; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -.typeahead { - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 18px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn, button[type="submit"], input[type="submit"] { - display: inline-block; - *display: inline; - padding: 4px 10px 4px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 1em; - line-height: 18px; - *line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(top, #ffffff, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #cccccc; - *border: 0; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-bottom-color: #b3b3b3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover { - color: #333333; - text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-color: #e6e6e6; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.btn-large [class^="icon-"] { - margin-top: 1px; -} - -.btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; -} - -.btn-small [class^="icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; -} - -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn { - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} - -.btn-primary { - background-color: #0074cc; - *background-color: #0055cc; - background-image: -ms-linear-gradient(top, #0088cc, #0055cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); - background-image: -o-linear-gradient(top, #0088cc, #0055cc); - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); - background-image: linear-gradient(top, #0088cc, #0055cc); - background-repeat: repeat-x; - border-color: #0055cc #0055cc #003580; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - background-color: #0055cc; - *background-color: #004ab3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #004099 \9; -} - -.btn-primary:hover, .btnCheckbox:hover, -.btn-primary:active, .btnCheckbox.active { - background-color: #0088cc; - *background-color: #0088cc; - background-image: -ms-linear-gradient(top, #0055cc, #0088cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0055cc), to(#0088cc)); - background-image: -webkit-linear-gradient(top, #0055cc, #0088cc); - background-image: -o-linear-gradient(top, #0055cc, #0088cc); - background-image: -moz-linear-gradient(top, #0055cc, #0088cc); - background-image: linear-gradient(top, #0055cc, #0088cc); - background-repeat: repeat-x; - border-color: #0088cc #0088cc #003580; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0055cc', endColorstr='#0088cc', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - color:#fff; - -} - -.btn-warning { - background-color: #faa732; - *background-color: #f89406; - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - background-color: #da4f49; - *background-color: #bd362f; - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - background-color: #5bb75b; - *background-color: #51a351; - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - background-color: #414141; - *background-color: #222222; - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn, input[type="submit"], button[type="submit"] { - *padding-top: 2px; - *padding-bottom: 2px; - width:100%; - max-width:170px; - height:50px; - border-radius:4px; - font-size:1.2em; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-group { - position: relative; - *margin-left: .3em; - *zoom: 1; -} - -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} - -.btn-group:after { - clear: both; -} - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; -} - -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group > .btn, .btn-group > .btnCheckbox { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn:first-child, .btn-group > .btnCheckbox:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, .btn-group > .btnCheckbox:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group > .dropdown-toggle { - *padding-top: 4px; - padding-right: 8px; - *padding-bottom: 4px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group > .btn-mini.dropdown-toggle { - padding-right: 5px; - padding-left: 5px; -} - -.btn-group > .btn-small.dropdown-toggle { - *padding-top: 4px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large.dropdown-toggle { - padding-right: 12px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; -} - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0055cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - -.btn .caret { - margin-top: 7px; - margin-left: 0; -} - -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.btn-mini .caret { - margin-top: 5px; -} - -.btn-small .caret { - margin-top: 6px; -} - -.btn-large .caret { - margin-top: 6px; - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; -} - -.dropup .btn-large .caret { - border-top: 0; - border-bottom: 5px solid #000000; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); -} - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 18px; - color: #c09853; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.alert-heading { - color: inherit; -} - -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - -.nav { - margin-bottom: 18px; - margin-left: 0; - list-style: none; -} - -.nav > li > a { - display: block; -} - -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > .pull-right { - float: right; -} - -.nav .nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 8px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -.nav-tabs > li { - margin-bottom: -1px; -} - -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 18px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} - -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li > a { - margin-right: 0; -} - -.nav-tabs.nav-stacked { - border-bottom: 0; -} - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.nav-tabs.nav-stacked > li > a:hover { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.tabs-left > .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 18px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - - -} -/*Removed from .navbar-inner class above - padding-right: 20px; - padding-left: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -*/ - - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; -} - -.navbar { - color: #999999; -} - -.navbar .brand:hover { - text-decoration: none; -} - -.navbar .brand { - display: block; - float: left; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #999999; -} - -.navbar .navbar-text { - margin-bottom: 0; - line-height: 40px; -} - -.navbar .navbar-link { - color: #999999; -} - -.navbar .navbar-link:hover { - color: #ffffff; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn { - margin: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 6px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} - -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-search .search-query:-moz-placeholder { - color: #aaa; -} - -.navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.navbar-fixed-top { - top: 0; -} - -.navbar-fixed-bottom { - bottom: 0; -} - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { - float: right; -} - -.navbar .nav > li { - display: block; - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 9px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.navbar .btn { - display: inline-block; - padding: 4px 10px 4px; - margin: 5px 5px 6px; - line-height: 18px; -} - -.navbar .btn-group { - padding: 5px 5px 6px; - margin: 0; -} - -.navbar .nav > li > a:hover { - color: #ffffff; - text-decoration: none; - background-color: transparent; -} - -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; -} - -.navbar .divider-vertical { - width: 1px; - height: 40px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} - -.navbar .nav.pull-right { - margin-right: 0; - margin-left: 10px; -} - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - background-color: #2677af; - *background-color: #2677af; - background-image: -ms-linear-gradient(top, #3989c2, #2677af); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3989c2), to(#2677af)); - background-image: -webkit-linear-gradient(top, #3989c2, #2677af); - background-image: -o-linear-gradient(top, #3989c2, #2677af); - background-image: linear-gradient(top, #3989c2, #2677af); - background-image: -moz-linear-gradient(top, #3989c2, #2677af); - background-repeat: repeat-x; - border-color: #3989c2 #3989c2 #2677af; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#3989c2', endColorstr='#2677af', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - background-color: #2677af; - *background-color: #2677af; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #2677af \9; -} - -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - -.navbar .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.navbar .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.navbar-fixed-bottom .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); -} - -.navbar-fixed-bottom .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; -} - -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.dropdown.open .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar .nav li.dropdown.active .caret { - opacity: 1; - filter: alpha(opacity=100); -} - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: transparent; -} - -.navbar .nav li.dropdown.active > .dropdown-toggle:hover { - color: #ffffff; -} - -.navbar .pull-right .dropdown-menu, -.navbar .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar .pull-right .dropdown-menu:before, -.navbar .dropdown-menu.pull-right:before { - right: 12px; - left: auto; -} - -.navbar .pull-right .dropdown-menu:after, -.navbar .dropdown-menu.pull-right:after { - right: 13px; - left: auto; -} - -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.breadcrumb li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; -} - -.breadcrumb .divider { - padding: 0 5px; - color: #999999; -} - -.breadcrumb .active a { - color: #333333; -} - -.pagination { - height: 36px; - margin: 18px 0; -} - -.pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.pagination li { - display: inline; -} - -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} - -.pagination a:hover, -.pagination .active a { - background-color: #f5f5f5; -} - -.pagination .active a { - color: #999999; - cursor: default; -} - -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { - color: #999999; - cursor: default; - background-color: transparent; -} - -.pagination li:first-child a { - border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} - -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} - -.pagination-centered { - text-align: center; -} - -.pagination-right { - text-align: right; -} - -.pager { - margin-bottom: 18px; - margin-left: 0; - text-align: center; - list-style: none; - *zoom: 1; -} - -.pager:before, -.pager:after { - display: table; - content: ""; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager a { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.pager a:hover { - text-decoration: none; - background-color: #f5f5f5; -} - -.pager .next a { - float: right; -} - -.pager .previous a { - float: left; -} - -.pager .disabled a, -.pager .disabled a:hover { - color: #999999; - cursor: default; - background-color: #fff; -} - -.modal-open .dropdown-menu { - z-index: 2050; -} - -.modal-open .dropdown.open { - *z-index: 2050; -} - -.modal-open .popover { - z-index: 2060; -} - -.modal-open .tooltip { - z-index: 2070; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 1050; - width: 560px; - margin: -250px 0 0 -280px; - overflow: auto; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -ms-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 50%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-body { - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.tooltip { - position: absolute; - z-index: 1020; - display: block; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - margin-top: -2px; -} - -.tooltip.right { - margin-left: 2px; -} - -.tooltip.bottom { - margin-top: 2px; -} - -.tooltip.left { - margin-left: -2px; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top: 5px solid #000000; - border-right: 5px solid transparent; - border-left: 5px solid transparent; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; - border-left: 5px solid transparent; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-right: 5px solid #000000; - border-bottom: 5px solid transparent; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} - -.popover.top { - margin-top: -5px; -} - -.popover.right { - margin-left: 5px; -} - -.popover.bottom { - margin-top: 5px; -} - -.popover.left { - margin-left: -5px; -} - -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top: 5px solid #000000; - border-right: 5px solid transparent; - border-left: 5px solid transparent; -} - -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-right: 5px solid #000000; - border-bottom: 5px solid transparent; -} - -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; - border-left: 5px solid transparent; -} - -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} - -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} - -.popover-inner { - width: 280px; - padding: 3px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} - -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} - -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 18px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} - -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; -} - -.label, -.badge { - font-size: 10.998px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; -} - -.label { - padding: 1px 4px 2px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding: 1px 9px 2px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 18px; - margin-bottom: 18px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress .bar { - width: 0; - height: 18px; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress-striped .bar { - background-color: #149bdf; - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-danger .bar { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} - -.progress-danger.progress-striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-success .bar { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} - -.progress-success.progress-striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-warning .bar { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); -} - -.progress-warning.progress-striped .bar { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.accordion { - margin-bottom: 18px; -} - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.accordion-heading { - border-bottom: 0; -} - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -.accordion-toggle { - cursor: pointer; -} - -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} - -.carousel { - position: relative; - margin-bottom: 18px; - line-height: 1; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel .item > img { - display: block; - line-height: 1; -} - -.carousel .active, -.carousel .next, -.carousel .prev { - display: block; -} - -.carousel .active { - left: 0; -} - -.carousel .next, -.carousel .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel .next { - left: 100%; -} - -.carousel .prev { - left: -100%; -} - -.carousel .next.left, -.carousel .prev.right { - left: 0; -} - -.carousel .active.left { - left: -100%; -} - -.carousel .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 10px 15px 5px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} - -.carousel-caption h4, -.carousel-caption p { - color: #ffffff; -} - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; -} - -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -.hide { - display: none; -} - -.show { - display: block; -} - -.invisible { - visibility: hidden; -} diff --git a/src/DemoSite461/Static/css/editmode.css b/src/DemoSite461/Static/css/editmode.css deleted file mode 100644 index 55318c8..0000000 --- a/src/DemoSite461/Static/css/editmode.css +++ /dev/null @@ -1,33 +0,0 @@ -/* CSS specific to edit mode, such as help content displayed to the editor */ - -.alert-info -{ - border-color: #B8C0C5; - color: black; - font-family: Verdana; - font-size: 1em; - font-style: italic; - background-color: #B8C0C5; - box-shadow: 3px 3px 5px #CCC; - text-align: center; - } - -.alert-error p { - text-align: left; -} - -.alert-error .heading { - font-weight: bold; - color: #ff0000; -} - -.alert-error .details { - font-size: 0.8em; - max-height: 100px; - overflow: scroll; -} - -.header.dim { - margin: 2% 0; - opacity: 0.3; -} \ No newline at end of file diff --git a/src/DemoSite461/Static/css/editor.css b/src/DemoSite461/Static/css/editor.css deleted file mode 100644 index 0b2e4ff..0000000 --- a/src/DemoSite461/Static/css/editor.css +++ /dev/null @@ -1,2 +0,0 @@ -@import "bootstrap.css"; -@import "style.css"; diff --git a/src/DemoSite461/Static/css/media.css b/src/DemoSite461/Static/css/media.css deleted file mode 100644 index 0431dd2..0000000 --- a/src/DemoSite461/Static/css/media.css +++ /dev/null @@ -1,145 +0,0 @@ -@charset "utf-8"; -/* CSS Document */ - - - -@media (max-width: 979px) { -.span12, .span8, .span6, .span4 { - float: none; - width: auto !important; - } - -.span4 h2, .span6 h2 -{ - clear:both; - } - -.teaserblock.full h2, .teaserblock.wide h2 { - font-size: 2.5em; -} - -.subHeader -{ - width:100% !important; - font-weight:normal !important; - } - -.jumbotronblock .span4 -{ - display:none; - } - -.media .mediaImg img -{ - width:75%;} - - -.hideMyTracks {display:none;} - -} - - - -@media (max-width: 834px) { - -.teaserblock.full h2, .teaserblock.wide h2 { - clear:both; -} - -.teaserblock.full h2, .teaserblock.wide h2, .teaserblock.full p, .teaserblock.wide p { - text-align:center; -} - -.teaserblock.full img, .teaserblock.wide img { - width:75%; -} - -#header .span2 -{ - float:left; - width:20% !important; - } - -#header .span10 -{ - float:right; - } - -.span12 .media .mediaText, .span8 .media .mediaText -{ - clear:both; - margin:0 2% 5px; - } - -} - -@media (max-width: 767px) { - -h1 -{ - font-size:35px !important; - } - -h2 -{ - font-size:20px !important; - } - -.introduction { - font-size:1.2em !important; - margin:2% 0 4% 0; - } - -.alloyMenu .navbar .nav>li>a { - color:#323335; - padding-bottom:12px; - line-height:23px; - text-shadow:none !important; - outline:none; - } - -.alloyMenu .navbar .nav>li>ul>li a:hover { - outline:1px solid; - background:#2980bd; - } - - -.span3 { - width:100% !important; - - } - -.teaserblock img { - width:75%; - } - -.btn-blue { - margin-right:1%; - float:left; - clear:none; - } - -.searchButton { - float:right; - margin-top:7px !important; - } - -.alloyMenu .navbar-search .search-query -{ - max-width:70%; - } - - -#header .span2 -{ - float:left; - width:20% !important; - } - -#header .span10 -{ - float:right; - } - -} - diff --git a/src/DemoSite461/Static/css/style.css b/src/DemoSite461/Static/css/style.css deleted file mode 100644 index 4056016..0000000 --- a/src/DemoSite461/Static/css/style.css +++ /dev/null @@ -1,639 +0,0 @@ -@charset "utf-8"; -/* CSS Document */ - -/*Headers*/ - -#header { - margin:2% 0; - } - - -/*General*/ - - -h1 { - font-family:verdana; - font-size:4.5em; - line-height:1.1em; - } - -h1.jumbotron { - font-family:verdana; - font-size:4.5em; - line-height:1.1em; - margin-top:4%; - word-wrap:break-word; - } - -.subHeader { - font-family:verdana; - font-size:1.5em; - font-weight:bold; - line-height:1.3em; - margin:2% 0 4% 0; - width:80%; - } - -.introduction { - font-family:verdana; - font-size:1.4em; - font-weight:bold; - line-height:1.3em; - margin:2% 0 2% 0; - } - -p { - font-size:1.1em; - } - -a { - outline:none; - } - -ul { - font-size:1.1em; - } - -.share { - margin:4% 0; - } - -.right { - float:right !important; - } - -/*Top*/ - - -.logotype { - margin:2% 0; - } - - -/*Search page*/ - -.grayHead { - border-radius:4px; - background:#f1f1f1; - margin-bottom:2%; - } - -.grayHead h2, .grayHead p { - margin:1%; - } - -.btnCheckbox { - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - background-color: #F5F5F5; - background-image: -moz-linear-gradient(center top , #FFFFFF, #E6E6E6); - background-repeat: repeat-x; - border-color: #E6E6E6 #E6E6E6 #A2A2A2; - border-image: none; - border-radius: 4px 4px 4px 4px; - border-style: solid; - border-width: 1px; - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); - color: #333333; - cursor: pointer; - display: inline-block; - font-size: 14px; - line-height: 20px; - margin-bottom: 0; - padding: 4px 14px; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; -} - -.btn-primary:hover, .btn-group .btnCheckbox, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - background-color: #0055cc; - *background-color: #004ab3; -} - -.SearchResults img, .listResult img { - float:left; - margin-bottom:1%; - margin-right:2%; - } - -.listResult h3 -{ - font-size:1.3em; - } - -.SearchResults hr, .listResult hr { - width:100%; - clear:both; - margin:2% 0; - } - -/*Content*/ - -.row { - margin-bottom:1%; - } - -.span2, .span3, .span4, .span5, .span6, .span7, .span8, .span9, .span10, .span11, .span12 -{ - margin-bottom:2%; - } - -.text-center { - text-align: center; -} - -#header .span2, #header .span10 -{ - margin-bottom:0px; - } - -.date { - font-size:0.8em; - margin-top:-9px; - } - -.pagelistblock div { - padding-left:5px; -} - -.pagelistblock .theme1 { - border-left:2px solid #EB5E31; - } - -.pagelistblock .theme2 { - border-left:2px solid #BF5D8C; - } - -.pagelistblock .theme3 { - border-left:2px solid #9FC733; - } - -.quotePuff { - height:250px; - } - -.quotePuff h3 { - margin:22% 10%; - text-align:center; - } - - - -.field-validation-error -{ - display: block; - color: #b94a48; -} - -.equal-height .teaserblock .border { - min-height: 245px; -} - -.teaserblock { - text-align:center; -} - -.teaserblock.full img, .teaserblock.wide img { - float:left; - margin-right:30px; - max-width:375px; - overflow:hidden; - } - -.teaserblock.full h2, .teaserblock.full p, .teaserblock.wide h2, .teaserblock.wide p { - text-align:left; - margin:0 10px 10px 0; - } - -.teaserblock.full p, .teaserblock.wide p { - font-size:1.3em; - } - -.teaserblock.full h2, .teaserblock.wide h2 { - margin:10px 10px 10px 0; - font-size:3em; - } - - -.teaserblock p { - width:96%; - margin-left:2%; - } - -.border { - border-radius:4px; - border:1px solid #d6d6d6; - text-align:center; - overflow:hidden; - } - -.border p { - width:96%; - margin-left:2%; - } - -.teaserblock h2, .teaserblock p, a h2, a p -{ - color:#333; - } - -.border a:hover h2 -{ - text-decoration:underline !important; - } - -.teaserblock a, .teaserblock a:hover, .teaserblock.full a, .teaserblock.full a:hover, .teaserblock.half a, .teaserblock.half a:hover, .teaserblock.wide a, .teaserblock.wide a:hover { - color:#333; - } - -.teaserblock h2, .teaserblock p -{ - text-align:center; - margin-left:1%; - width:98%; - } - -.colorBox { - border-radius:4px; - margin:10px 0; - padding-bottom:3px; - background:#bdbdbd; - background-image:-moz-linear-gradient(center top , #d9d9d9, #bdbdbd); - color:#333; - } - -.block.theme1 { - background:#eb5e31; - background-image:-moz-linear-gradient(center top , #eb8931, #eb5e31); - color:#fff; - } - -.block.theme2 { - background:#bf5d8c; - background-image:-moz-linear-gradient(center top , #db5a98, #bf5d8c); - color:#fff; - } - -.block.theme3 { - background:#9fc733; - background-image:-moz-linear-gradient(center top , #b1e031, #9fc733); - color:#fff; - } - -.colorBox ul { - list-style-type:none; - margin:0 0 2% 3%; - } - -.colorBox a, .colorBox a:hover { - color:#333; - } - -.block.theme1 a, .block.theme1 a:hover, .block.theme2 a, .block.theme2 a:hover, .block.theme3 a, .block.theme3 a:hover { - color:#fff; - } - -.colorBox h2, .colorBox p { - margin:1% 3%; - } - -.formContainer p { - margin-bottom:4px; - margin-top:4px; - } - -/* ====== media ====== */ -.media {margin:10px; margin-left:0px;} -.media, .mediaText {overflow:hidden; _overflow:visible; zoom:1;} -.media .mediaImg {float:left; margin-right: 30px;} -.media .mediaImg img{display:block; max-width:370px;} - -.span8 .media .mediaImg img{max-width:300px; margin-right:15px;} - -.media p { - font-size:1.3em; - } - -.media h2 { - font-size:3em; - margin:10px 0; - } - -/*Buttons*/ - -.btn-blue { - width:100%; - max-width:170px; - height:50px; - border-radius:4px; - background:#2677af; - background-image:-moz-linear-gradient(center top , #3989c2, #2677af); - color:#fff; - display: inline-block; - text-align:center; - line-height:50px; - font-size:1.2em; - letter-spacing:0.5px; - margin-bottom:10px; - clear:both; - font-weight:bold; - } - -.btn-blue:hover { - background:#4b8ab7; - background-image:-moz-linear-gradient(center top , #5f9eca, #4b8ab7); - text-decoration:none; - color:#fff; - } - -/*Image*/ -.image-file { - width: 100%; -} - -/*Video*/ - -.embed { - position: relative; - padding-bottom: 56.25%; - height: 0; - overflow: hidden; -} - -.embed iframe, .embed object, .embed embed, .embed video { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - -/*Footer*/ - -.footer ul { - list-style-type:none; - margin:1% 0; - } - -/*Fixes*/ - -.setMargins div.span4 { - margin-bottom:20px; - } - - - -/*Alloy Menu*/ - -.alloyMenu { - color:#323335; - letter-spacing:0.1px; - font-family:verdana; - text-shadow:none !important; - margin-top:3%; - margin-bottom: 18px; - } - -.alloyMenu .navbar-inner { - background:#fff; - color:#323335; - text-shadow:none !important; - box-shadow:none; - } - -.alloyMenu .navbar .nav>li>a { - color:#323335; - padding-bottom:12px; - line-height:23px; - text-shadow:none !important; - outline:none; - } - -.alloyMenu .navbar .nav>li>a:hover { - background:#fff; - text-shadow:none !important; - color:#2980bd; - border-bottom:1px solid #2980bd; - } - -.alloyMenu .navbar .nav>li>a.theme1:hover { - background:#fff; - text-shadow:none !important; - color:#EB5E31; - border-bottom:1px solid #EB5E31; - } - -.alloyMenu .navbar .nav>li>a.theme3:hover { - background:#fff; - text-shadow:none !important; - color:#9FC733; - border-bottom:1px solid #9FC733; - } - -.alloyMenu .navbar .nav>li>a.theme2:hover { - background:#fff; - text-shadow:none !important; - color:#BF5D8C; - border-bottom:1px solid #BF5D8C; - } - -.alloyMenu .navbar .nav>li.active>a { - background:#fff; - text-shadow:none !important; - color:#2980bd; - border-bottom:1px solid #2980bd; - } - -.alloyMenu .navbar .nav>li.active>a.theme1 { - background:#fff; - text-shadow:none !important; - color:#EB5E31; - border-bottom:1px solid #EB5E31; - } - -.alloyMenu .navbar .nav>li.active>a.theme3 { - background:#fff; - text-shadow:none !important; - color:#9FC733; - border-bottom:1px solid #9FC733; - } - -.alloyMenu .navbar .nav>li.active>a.theme2 { - background:#fff; - text-shadow:none !important; - color:#BF5D8C; - border-bottom:1px solid #BF5D8C; - } - -.alloyMenu .navbar ul { - font-size:1em; - } - -.alloyMenu .caret { - opacity:0.9; - color:#323335; - border-top-color:#323335 !important; - border-bottom-color:#323335 !important; - } - -.alloyMenu .navbar-search .search-query { - padding: 4px 5px 4px 13px; - text-shadow:none; - background:#fff; - margin-bottom:0; - border-color:#d9d9d9; - box-shadow:none; - } - -form.navbar-search { - background:#d6d6d6; - border:1px solid #d6d6d6; - border-radius:4px; - padding: 4px 5px; - margin-top:0; - } - -.alloyMenu .navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 4px 5px 4px 13px; - text-shadow:none; - border:1px solid #d9d9d9; - color:#aaa; - } - -.search-query -{ - margin-bottom:0px !important; - margin-top:7px; - width:200px; - color:#aaa; - } - -.searchButton { - height:28px !important; - width:28px !important; - background:url(../gfx/searchbuttonsmall.png) no-repeat top left !important; - border:none !important; - margin-top:7px !important; - } - -/*Alloy side navigation*/ - -#alloyDrop .accordion-group { - border:1px solid #ddd; - } - -#alloyDrop .accordion-group li { - line-height:40px; - } - -#alloyDrop .accordion-group .accordion-heading { - background:#fff; - font-weight:bold; - } - -#alloyDrop .accordion-group .accordion-heading a.accordion-toggle { - color:#323335; - outline:none; - } - -#alloyDrop .accordion-group ul { - margin:5px 0; - background:#fff; - list-style-type:none; - - } - -#alloyDrop .accordion-group ul ol, #alloyDrop .accordion-group ul ul { - margin:5px 0 0 0; - background:#fff; - list-style-type:none; - } - -#alloyDrop .accordion-group ul li { - width:100%; - } - -#alloyDrop .accordion-group ul li .icon-chevron-down { - margin-top:10px; - margin-right:15px; - } - - -#alloyDrop .accordion-group ul li a { - padding-left:30px; - width:100%; - color:#333; - } - -#alloyDrop .accordion-group ul li a:hover { - color: #2980BD !important; - } - -#alloyDrop .accordion-group ul li ol { - padding-left:0px; - background:#fff; - } - -#alloyDrop .accordion-group ul ol li, #alloyDrop .accordion-group ul ul li { - border-bottom:0px solid #d6d6d6; - border-top:1px solid #d6d6d6; - } - -#alloyDrop .accordion-group ul ol li a, #alloyDrop .accordion-group ul ul li a { - padding-left:50px; - } - -#alloyDrop a.active -{ - background: none repeat scroll 0 0 #2980BD; - color: #FFFFFF !important; - } - -/*Campaign*/ - -.campaign-wrapper -{ - margin:5% 0; - } - -/*Alloy Breadcrumb*/ - -.alloyBreadcrumb { - background:none; - list-style-type:none; - margin:0 0 -20px 0; - padding:7px 14px; - } - -.alloyBreadcrumb li { - display:inline; - } - -.alloyBreadcrumb .divider { - color:#999; - padding:0 5px; - } - -.thankyoumessage { - padding: 1em 0.5em; - margin: 0; - font-weight: bold; - } - -/* Search page */ -form.search-form { - margin-bottom: 0; -} - -/* Edit container style */ -.epi-editContainer { - min-height: 1.1em; - min-width: 1.6em; -} diff --git a/src/DemoSite461/Static/gfx/New_FDT_Press_Contact_.JPG b/src/DemoSite461/Static/gfx/New_FDT_Press_Contact_.JPG deleted file mode 100644 index 70450a9..0000000 Binary files a/src/DemoSite461/Static/gfx/New_FDT_Press_Contact_.JPG and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/carouselbackground.png b/src/DemoSite461/Static/gfx/carouselbackground.png deleted file mode 100644 index 2c6f912..0000000 Binary files a/src/DemoSite461/Static/gfx/carouselbackground.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/contact.jpg b/src/DemoSite461/Static/gfx/contact.jpg deleted file mode 100644 index 0ad79ee..0000000 Binary files a/src/DemoSite461/Static/gfx/contact.jpg and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/exampelspan4.png b/src/DemoSite461/Static/gfx/exampelspan4.png deleted file mode 100644 index 6ddff68..0000000 Binary files a/src/DemoSite461/Static/gfx/exampelspan4.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/experts.png b/src/DemoSite461/Static/gfx/experts.png deleted file mode 100644 index e8439ee..0000000 Binary files a/src/DemoSite461/Static/gfx/experts.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/fallows-media-wide.jpg b/src/DemoSite461/Static/gfx/fallows-media-wide.jpg deleted file mode 100644 index ea6374b..0000000 Binary files a/src/DemoSite461/Static/gfx/fallows-media-wide.jpg and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/leader.png b/src/DemoSite461/Static/gfx/leader.png deleted file mode 100644 index 7ac2b56..0000000 Binary files a/src/DemoSite461/Static/gfx/leader.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/leader2.png b/src/DemoSite461/Static/gfx/leader2.png deleted file mode 100644 index 9016088..0000000 Binary files a/src/DemoSite461/Static/gfx/leader2.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/logotype.png b/src/DemoSite461/Static/gfx/logotype.png deleted file mode 100644 index 4b786f7..0000000 Binary files a/src/DemoSite461/Static/gfx/logotype.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/meet.jpg b/src/DemoSite461/Static/gfx/meet.jpg deleted file mode 100644 index a063b0c..0000000 Binary files a/src/DemoSite461/Static/gfx/meet.jpg and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/page-type-thumbnail-article.png b/src/DemoSite461/Static/gfx/page-type-thumbnail-article.png deleted file mode 100644 index 236f213..0000000 Binary files a/src/DemoSite461/Static/gfx/page-type-thumbnail-article.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/page-type-thumbnail-contact.png b/src/DemoSite461/Static/gfx/page-type-thumbnail-contact.png deleted file mode 100644 index 23d7728..0000000 Binary files a/src/DemoSite461/Static/gfx/page-type-thumbnail-contact.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/page-type-thumbnail-product.png b/src/DemoSite461/Static/gfx/page-type-thumbnail-product.png deleted file mode 100644 index f5d4fb6..0000000 Binary files a/src/DemoSite461/Static/gfx/page-type-thumbnail-product.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/page-type-thumbnail-standard.png b/src/DemoSite461/Static/gfx/page-type-thumbnail-standard.png deleted file mode 100644 index 0f1ccff..0000000 Binary files a/src/DemoSite461/Static/gfx/page-type-thumbnail-standard.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/page-type-thumbnail.png b/src/DemoSite461/Static/gfx/page-type-thumbnail.png deleted file mode 100644 index 96a574a..0000000 Binary files a/src/DemoSite461/Static/gfx/page-type-thumbnail.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/person.png b/src/DemoSite461/Static/gfx/person.png deleted file mode 100644 index ef69dc5..0000000 Binary files a/src/DemoSite461/Static/gfx/person.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/plan.jpg b/src/DemoSite461/Static/gfx/plan.jpg deleted file mode 100644 index bf00d05..0000000 Binary files a/src/DemoSite461/Static/gfx/plan.jpg and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/play.png b/src/DemoSite461/Static/gfx/play.png deleted file mode 100644 index e12b279..0000000 Binary files a/src/DemoSite461/Static/gfx/play.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/playInactive.png b/src/DemoSite461/Static/gfx/playInactive.png deleted file mode 100644 index a5bc660..0000000 Binary files a/src/DemoSite461/Static/gfx/playInactive.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/productLandingv2.png b/src/DemoSite461/Static/gfx/productLandingv2.png deleted file mode 100644 index 1c8bc9a..0000000 Binary files a/src/DemoSite461/Static/gfx/productLandingv2.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/searchbutton.png b/src/DemoSite461/Static/gfx/searchbutton.png deleted file mode 100644 index eb5dc48..0000000 Binary files a/src/DemoSite461/Static/gfx/searchbutton.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/searchbuttonsmall.png b/src/DemoSite461/Static/gfx/searchbuttonsmall.png deleted file mode 100644 index 96665b2..0000000 Binary files a/src/DemoSite461/Static/gfx/searchbuttonsmall.png and /dev/null differ diff --git a/src/DemoSite461/Static/gfx/track.jpg b/src/DemoSite461/Static/gfx/track.jpg deleted file mode 100644 index 2682bdf..0000000 Binary files a/src/DemoSite461/Static/gfx/track.jpg and /dev/null differ diff --git a/src/DemoSite461/Static/html/error.htm b/src/DemoSite461/Static/html/error.htm deleted file mode 100644 index 298e5dd..0000000 --- a/src/DemoSite461/Static/html/error.htm +++ /dev/null @@ -1,13 +0,0 @@ - - - An error occured - - - - Logotype -

When things go wrong...

-

This error message can be modified by editing the /Static/html/error.htm file.

- - diff --git a/src/DemoSite461/Static/img/glyphicons-halflings-white.png b/src/DemoSite461/Static/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484..0000000 Binary files a/src/DemoSite461/Static/img/glyphicons-halflings-white.png and /dev/null differ diff --git a/src/DemoSite461/Static/img/glyphicons-halflings.png b/src/DemoSite461/Static/img/glyphicons-halflings.png deleted file mode 100644 index 79bc568..0000000 Binary files a/src/DemoSite461/Static/img/glyphicons-halflings.png and /dev/null differ diff --git a/src/DemoSite461/Static/js/bootstrap.js b/src/DemoSite461/Static/js/bootstrap.js deleted file mode 100644 index d5a9cfc..0000000 --- a/src/DemoSite461/Static/js/bootstrap.js +++ /dev/null @@ -1,1806 +0,0 @@ - -!function ($) { - - $(function () { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MSTransitionEnd' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = options - this.options.slide && this.slide(this.options.slide) - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e = $.Event('slide') - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if ($next.hasClass('active')) return - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else if (options.interval) data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , selector - , isActive - - if ($this.is('.disabled, :disabled')) return - - selector = $this.attr('data-target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) $parent.toggleClass('open') - - return false - } - - } - - function clearMenus() { - $(toggle).parent().removeClass('open') - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body') - .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (content, options) { - this.options = options - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - $('body').addClass('modal-open') - - this.isShown = true - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element.removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } - - } - - - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) - }) - } - - function hideModal(that) { - this.$element - .hide() - .trigger('hidden') - - backdrop.call(this) - } - - function backdrop(callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) - - } else if (callback) { - callback() - } - } - - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) - - e.preventDefault() - $target.modal(option) - }) - }) - -}(window.jQuery);/* =========================================================== - * bootstrap-tooltip.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , isHTML: function(text) { - // html string detection logic adapted from jQuery - return typeof text != 'string' - || ( text.charAt(0) === "<" - && text.charAt( text.length - 1 ) === ">" - && text.length >= 3 - ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text) - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
' - , trigger: 'hover' - , title: '' - , delay: 0 - } - -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title) - $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

' - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && href.length - && [[ $href.position().top, href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu')) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.0.4 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , keypress: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - if (e.type != 'keydown') break - e.preventDefault() - this.prev() - break - - case 40: // down arrow - if (e.type != 'keydown') break - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/src/DemoSite461/Static/js/jquery.js b/src/DemoSite461/Static/js/jquery.js deleted file mode 100644 index 2d2eaef..0000000 --- a/src/DemoSite461/Static/js/jquery.js +++ /dev/null @@ -1,9407 +0,0 @@ -/*! - * jQuery JavaScript Library v1.7.2 - * http://jquery.com/ - * - * Copyright 2011, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2011, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Wed Mar 21 12:46:34 2012 -0700 - */ -(function( window, undefined ) { - -// Use the correct document accordingly with window argument (sandbox) -var document = window.document, - navigator = window.navigator, - location = window.location; -var jQuery = (function() { - -// Define a local copy of jQuery -var jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context, rootjQuery ); - }, - - // Map over jQuery in case of overwrite - _jQuery = window.jQuery, - - // Map over the $ in case of overwrite - _$ = window.$, - - // A central reference to the root jQuery(document) - rootjQuery, - - // A simple way to check for HTML strings or ID strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, - - // Check if a string has a non-whitespace character in it - rnotwhite = /\S/, - - // Used for trimming whitespace - trimLeft = /^\s+/, - trimRight = /\s+$/, - - // Match a standalone tag - rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, - - // JSON RegExp - rvalidchars = /^[\],:{}\s]*$/, - rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, - rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, - rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, - - // Useragent RegExp - rwebkit = /(webkit)[ \/]([\w.]+)/, - ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, - rmsie = /(msie) ([\w.]+)/, - rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, - - // Matches dashed string for camelizing - rdashAlpha = /-([a-z]|[0-9])/ig, - rmsPrefix = /^-ms-/, - - // Used by jQuery.camelCase as callback to replace() - fcamelCase = function( all, letter ) { - return ( letter + "" ).toUpperCase(); - }, - - // Keep a UserAgent string for use with jQuery.browser - userAgent = navigator.userAgent, - - // For matching the engine and version of the browser - browserMatch, - - // The deferred used on DOM ready - readyList, - - // The ready event handler - DOMContentLoaded, - - // Save a reference to some core methods - toString = Object.prototype.toString, - hasOwn = Object.prototype.hasOwnProperty, - push = Array.prototype.push, - slice = Array.prototype.slice, - trim = String.prototype.trim, - indexOf = Array.prototype.indexOf, - - // [[Class]] -> type pairs - class2type = {}; - -jQuery.fn = jQuery.prototype = { - constructor: jQuery, - init: function( selector, context, rootjQuery ) { - var match, elem, ret, doc; - - // Handle $(""), $(null), or $(undefined) - if ( !selector ) { - return this; - } - - // Handle $(DOMElement) - if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - } - - // The body element only exists once, optimize finding it - if ( selector === "body" && !context && document.body ) { - this.context = document; - this[0] = document.body; - this.selector = selector; - this.length = 1; - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - // Are we dealing with HTML string or an ID? - if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = quickExpr.exec( selector ); - } - - // Verify a match, and that no context was specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; - doc = ( context ? context.ownerDocument || context : document ); - - // If a single string is passed in and it's a single tag - // just do a createElement and skip the rest - ret = rsingleTag.exec( selector ); - - if ( ret ) { - if ( jQuery.isPlainObject( context ) ) { - selector = [ document.createElement( ret[1] ) ]; - jQuery.fn.attr.call( selector, context, true ); - - } else { - selector = [ doc.createElement( ret[1] ) ]; - } - - } else { - ret = jQuery.buildFragment( [ match[1] ], [ doc ] ); - selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes; - } - - return jQuery.merge( this, selector ); - - // HANDLE: $("#id") - } else { - elem = document.getElementById( match[2] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || rootjQuery ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return rootjQuery.ready( selector ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }, - - // Start with an empty selector - selector: "", - - // The current version of jQuery being used - jquery: "1.7.2", - - // The default length of a jQuery object is 0 - length: 0, - - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - - toArray: function() { - return slice.call( this, 0 ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num == null ? - - // Return a 'clean' array - this.toArray() : - - // Return just the object - ( num < 0 ? this[ this.length + num ] : this[ num ] ); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems, name, selector ) { - // Build a new jQuery matched element set - var ret = this.constructor(); - - if ( jQuery.isArray( elems ) ) { - push.apply( ret, elems ); - - } else { - jQuery.merge( ret, elems ); - } - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - ret.context = this.context; - - if ( name === "find" ) { - ret.selector = this.selector + ( this.selector ? " " : "" ) + selector; - } else if ( name ) { - ret.selector = this.selector + "." + name + "(" + selector + ")"; - } - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - ready: function( fn ) { - // Attach the listeners - jQuery.bindReady(); - - // Add the callback - readyList.add( fn ); - - return this; - }, - - eq: function( i ) { - i = +i; - return i === -1 ? - this.slice( i ) : - this.slice( i, i + 1 ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ), - "slice", slice.call(arguments).join(",") ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { - return callback.call( elem, i, elem ); - })); - }, - - end: function() { - return this.prevObject || this.constructor(null); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: [].sort, - splice: [].splice -}; - -// Give the init function the jQuery prototype for later instantiation -jQuery.fn.init.prototype = jQuery.fn; - -jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, - target = arguments[0] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - target = arguments[1] || {}; - // skip the boolean and the target - i = 2; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { - target = {}; - } - - // extend jQuery itself if only one argument is passed - if ( length === i ) { - target = this; - --i; - } - - for ( ; i < length; i++ ) { - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { - if ( copyIsArray ) { - copyIsArray = false; - clone = src && jQuery.isArray(src) ? src : []; - - } else { - clone = src && jQuery.isPlainObject(src) ? src : {}; - } - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend({ - noConflict: function( deep ) { - if ( window.$ === jQuery ) { - window.$ = _$; - } - - if ( deep && window.jQuery === jQuery ) { - window.jQuery = _jQuery; - } - - return jQuery; - }, - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - // Either a released hold or an DOMready/load event and not yet ready - if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready, 1 ); - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.fireWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.trigger ) { - jQuery( document ).trigger( "ready" ).off( "ready" ); - } - } - }, - - bindReady: function() { - if ( readyList ) { - return; - } - - readyList = jQuery.Callbacks( "once memory" ); - - // Catch cases where $(document).ready() is called after the - // browser event has already occurred. - if ( document.readyState === "complete" ) { - // Handle it asynchronously to allow scripts the opportunity to delay ready - return setTimeout( jQuery.ready, 1 ); - } - - // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) { - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", jQuery.ready, false ); - - // If IE event model is used - } else if ( document.attachEvent ) { - // ensure firing before onload, - // maybe late but safe also for iframes - document.attachEvent( "onreadystatechange", DOMContentLoaded ); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", jQuery.ready ); - - // If IE and not a frame - // continually check to see if the document is ready - var toplevel = false; - - try { - toplevel = window.frameElement == null; - } catch(e) {} - - if ( document.documentElement.doScroll && toplevel ) { - doScrollCheck(); - } - } - }, - - // See test/unit/core.js for details concerning isFunction. - // Since version 1.3, DOM methods and functions like alert - // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { - return jQuery.type(obj) === "function"; - }, - - isArray: Array.isArray || function( obj ) { - return jQuery.type(obj) === "array"; - }, - - isWindow: function( obj ) { - return obj != null && obj == obj.window; - }, - - isNumeric: function( obj ) { - return !isNaN( parseFloat(obj) ) && isFinite( obj ); - }, - - type: function( obj ) { - return obj == null ? - String( obj ) : - class2type[ toString.call(obj) ] || "object"; - }, - - isPlainObject: function( obj ) { - // Must be an Object. - // Because of IE, we also have to check the presence of the constructor property. - // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { - return false; - } - - try { - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { - return false; - } - } catch ( e ) { - // IE8,9 Will throw exceptions on certain host objects #9897 - return false; - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own. - - var key; - for ( key in obj ) {} - - return key === undefined || hasOwn.call( obj, key ); - }, - - isEmptyObject: function( obj ) { - for ( var name in obj ) { - return false; - } - return true; - }, - - error: function( msg ) { - throw new Error( msg ); - }, - - parseJSON: function( data ) { - if ( typeof data !== "string" || !data ) { - return null; - } - - // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); - - // Attempt to parse using the native JSON parser first - if ( window.JSON && window.JSON.parse ) { - return window.JSON.parse( data ); - } - - // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js - if ( rvalidchars.test( data.replace( rvalidescape, "@" ) - .replace( rvalidtokens, "]" ) - .replace( rvalidbraces, "")) ) { - - return ( new Function( "return " + data ) )(); - - } - jQuery.error( "Invalid JSON: " + data ); - }, - - // Cross-browser xml parsing - parseXML: function( data ) { - if ( typeof data !== "string" || !data ) { - return null; - } - var xml, tmp; - try { - if ( window.DOMParser ) { // Standard - tmp = new DOMParser(); - xml = tmp.parseFromString( data , "text/xml" ); - } else { // IE - xml = new ActiveXObject( "Microsoft.XMLDOM" ); - xml.async = "false"; - xml.loadXML( data ); - } - } catch( e ) { - xml = undefined; - } - if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { - jQuery.error( "Invalid XML: " + data ); - } - return xml; - }, - - noop: function() {}, - - // Evaluates a script in a global context - // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context - globalEval: function( data ) { - if ( data && rnotwhite.test( data ) ) { - // We use execScript on Internet Explorer - // We use an anonymous function so that context is window - // rather than jQuery in Firefox - ( window.execScript || function( data ) { - window[ "eval" ].call( window, data ); - } )( data ); - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); - }, - - // args is for internal usage only - each: function( object, callback, args ) { - var name, i = 0, - length = object.length, - isObj = length === undefined || jQuery.isFunction( object ); - - if ( args ) { - if ( isObj ) { - for ( name in object ) { - if ( callback.apply( object[ name ], args ) === false ) { - break; - } - } - } else { - for ( ; i < length; ) { - if ( callback.apply( object[ i++ ], args ) === false ) { - break; - } - } - } - - // A special, fast, case for the most common use of each - } else { - if ( isObj ) { - for ( name in object ) { - if ( callback.call( object[ name ], name, object[ name ] ) === false ) { - break; - } - } - } else { - for ( ; i < length; ) { - if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) { - break; - } - } - } - } - - return object; - }, - - // Use native String.trim function wherever possible - trim: trim ? - function( text ) { - return text == null ? - "" : - trim.call( text ); - } : - - // Otherwise use our own trimming functionality - function( text ) { - return text == null ? - "" : - text.toString().replace( trimLeft, "" ).replace( trimRight, "" ); - }, - - // results is for internal usage only - makeArray: function( array, results ) { - var ret = results || []; - - if ( array != null ) { - // The window, strings (and functions) also have 'length' - // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 - var type = jQuery.type( array ); - - if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) { - push.call( ret, array ); - } else { - jQuery.merge( ret, array ); - } - } - - return ret; - }, - - inArray: function( elem, array, i ) { - var len; - - if ( array ) { - if ( indexOf ) { - return indexOf.call( array, elem, i ); - } - - len = array.length; - i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; - - for ( ; i < len; i++ ) { - // Skip accessing in sparse arrays - if ( i in array && array[ i ] === elem ) { - return i; - } - } - } - - return -1; - }, - - merge: function( first, second ) { - var i = first.length, - j = 0; - - if ( typeof second.length === "number" ) { - for ( var l = second.length; j < l; j++ ) { - first[ i++ ] = second[ j ]; - } - - } else { - while ( second[j] !== undefined ) { - first[ i++ ] = second[ j++ ]; - } - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, inv ) { - var ret = [], retVal; - inv = !!inv; - - // Go through the array, only saving the items - // that pass the validator function - for ( var i = 0, length = elems.length; i < length; i++ ) { - retVal = !!callback( elems[ i ], i ); - if ( inv !== retVal ) { - ret.push( elems[ i ] ); - } - } - - return ret; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var value, key, ret = [], - i = 0, - length = elems.length, - // jquery objects are treated as arrays - isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ; - - // Go through the array, translating each of the items to their - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - - // Go through every key on the object, - } else { - for ( key in elems ) { - value = callback( elems[ key ], key, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - } - - // Flatten any nested arrays - return ret.concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function( fn, context ) { - if ( typeof context === "string" ) { - var tmp = fn[ context ]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { - return undefined; - } - - // Simulated bind - var args = slice.call( arguments, 2 ), - proxy = function() { - return fn.apply( context, args.concat( slice.call( arguments ) ) ); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; - - return proxy; - }, - - // Mutifunctional method to get and set values to a collection - // The value/s can optionally be executed if it's a function - access: function( elems, fn, key, value, chainable, emptyGet, pass ) { - var exec, - bulk = key == null, - i = 0, - length = elems.length; - - // Sets many values - if ( key && typeof key === "object" ) { - for ( i in key ) { - jQuery.access( elems, fn, i, key[i], 1, emptyGet, value ); - } - chainable = 1; - - // Sets one value - } else if ( value !== undefined ) { - // Optionally, function values get executed if exec is true - exec = pass === undefined && jQuery.isFunction( value ); - - if ( bulk ) { - // Bulk operations only iterate when executing function values - if ( exec ) { - exec = fn; - fn = function( elem, key, value ) { - return exec.call( jQuery( elem ), value ); - }; - - // Otherwise they run against the entire set - } else { - fn.call( elems, value ); - fn = null; - } - } - - if ( fn ) { - for (; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); - } - } - - chainable = 1; - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call( elems ) : - length ? fn( elems[0], key ) : emptyGet; - }, - - now: function() { - return ( new Date() ).getTime(); - }, - - // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser - uaMatch: function( ua ) { - ua = ua.toLowerCase(); - - var match = rwebkit.exec( ua ) || - ropera.exec( ua ) || - rmsie.exec( ua ) || - ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || - []; - - return { browser: match[1] || "", version: match[2] || "0" }; - }, - - sub: function() { - function jQuerySub( selector, context ) { - return new jQuerySub.fn.init( selector, context ); - } - jQuery.extend( true, jQuerySub, this ); - jQuerySub.superclass = this; - jQuerySub.fn = jQuerySub.prototype = this(); - jQuerySub.fn.constructor = jQuerySub; - jQuerySub.sub = this.sub; - jQuerySub.fn.init = function init( selector, context ) { - if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) { - context = jQuerySub( context ); - } - - return jQuery.fn.init.call( this, selector, context, rootjQuerySub ); - }; - jQuerySub.fn.init.prototype = jQuerySub.fn; - var rootjQuerySub = jQuerySub(document); - return jQuerySub; - }, - - browser: {} -}); - -// Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -}); - -browserMatch = jQuery.uaMatch( userAgent ); -if ( browserMatch.browser ) { - jQuery.browser[ browserMatch.browser ] = true; - jQuery.browser.version = browserMatch.version; -} - -// Deprecated, use jQuery.browser.webkit instead -if ( jQuery.browser.webkit ) { - jQuery.browser.safari = true; -} - -// IE doesn't match non-breaking spaces with \s -if ( rnotwhite.test( "\xA0" ) ) { - trimLeft = /^[\s\xA0]+/; - trimRight = /[\s\xA0]+$/; -} - -// All jQuery objects should point back to these -rootjQuery = jQuery(document); - -// Cleanup functions for the document ready method -if ( document.addEventListener ) { - DOMContentLoaded = function() { - document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - jQuery.ready(); - }; - -} else if ( document.attachEvent ) { - DOMContentLoaded = function() { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( document.readyState === "complete" ) { - document.detachEvent( "onreadystatechange", DOMContentLoaded ); - jQuery.ready(); - } - }; -} - -// The DOM ready check for Internet Explorer -function doScrollCheck() { - if ( jQuery.isReady ) { - return; - } - - try { - // If IE is used, use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - document.documentElement.doScroll("left"); - } catch(e) { - setTimeout( doScrollCheck, 1 ); - return; - } - - // and execute any waiting functions - jQuery.ready(); -} - -return jQuery; - -})(); - - -// String to Object flags format cache -var flagsCache = {}; - -// Convert String-formatted flags into Object-formatted ones and store in cache -function createFlags( flags ) { - var object = flagsCache[ flags ] = {}, - i, length; - flags = flags.split( /\s+/ ); - for ( i = 0, length = flags.length; i < length; i++ ) { - object[ flags[i] ] = true; - } - return object; -} - -/* - * Create a callback list using the following parameters: - * - * flags: an optional list of space-separated flags that will change how - * the callback list behaves - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible flags: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( flags ) { - - // Convert flags from String-formatted to Object-formatted - // (we check in cache first) - flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {}; - - var // Actual callback list - list = [], - // Stack of fire calls for repeatable lists - stack = [], - // Last fire value (for non-forgettable lists) - memory, - // Flag to know if list was already fired - fired, - // Flag to know if list is currently firing - firing, - // First callback to fire (used internally by add and fireWith) - firingStart, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, - // Add one or several callbacks to the list - add = function( args ) { - var i, - length, - elem, - type, - actual; - for ( i = 0, length = args.length; i < length; i++ ) { - elem = args[ i ]; - type = jQuery.type( elem ); - if ( type === "array" ) { - // Inspect recursively - add( elem ); - } else if ( type === "function" ) { - // Add if not in unique mode and callback is not in - if ( !flags.unique || !self.has( elem ) ) { - list.push( elem ); - } - } - } - }, - // Fire callbacks - fire = function( context, args ) { - args = args || []; - memory = !flags.memory || [ context, args ]; - fired = true; - firing = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) { - memory = true; // Mark as halted - break; - } - } - firing = false; - if ( list ) { - if ( !flags.once ) { - if ( stack && stack.length ) { - memory = stack.shift(); - self.fireWith( memory[ 0 ], memory[ 1 ] ); - } - } else if ( memory === true ) { - self.disable(); - } else { - list = []; - } - } - }, - // Actual Callbacks object - self = { - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - var length = list.length; - add( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away, unless previous - // firing was halted (stopOnFalse) - } else if ( memory && memory !== true ) { - firingStart = length; - fire( memory[ 0 ], memory[ 1 ] ); - } - } - return this; - }, - // Remove a callback from the list - remove: function() { - if ( list ) { - var args = arguments, - argIndex = 0, - argLength = args.length; - for ( ; argIndex < argLength ; argIndex++ ) { - for ( var i = 0; i < list.length; i++ ) { - if ( args[ argIndex ] === list[ i ] ) { - // Handle firingIndex and firingLength - if ( firing ) { - if ( i <= firingLength ) { - firingLength--; - if ( i <= firingIndex ) { - firingIndex--; - } - } - } - // Remove the element - list.splice( i--, 1 ); - // If we have some unicity property then - // we only need to do this once - if ( flags.unique ) { - break; - } - } - } - } - } - return this; - }, - // Control if a given callback is in the list - has: function( fn ) { - if ( list ) { - var i = 0, - length = list.length; - for ( ; i < length; i++ ) { - if ( fn === list[ i ] ) { - return true; - } - } - } - return false; - }, - // Remove all callbacks from the list - empty: function() { - list = []; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory || memory === true ) { - self.disable(); - } - return this; - }, - // Is it locked? - locked: function() { - return !stack; - }, - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( stack ) { - if ( firing ) { - if ( !flags.once ) { - stack.push( [ context, args ] ); - } - } else if ( !( flags.once && memory ) ) { - fire( context, args ); - } - } - return this; - }, - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; - - - - -var // Static reference to slice - sliceDeferred = [].slice; - -jQuery.extend({ - - Deferred: function( func ) { - var doneList = jQuery.Callbacks( "once memory" ), - failList = jQuery.Callbacks( "once memory" ), - progressList = jQuery.Callbacks( "memory" ), - state = "pending", - lists = { - resolve: doneList, - reject: failList, - notify: progressList - }, - promise = { - done: doneList.add, - fail: failList.add, - progress: progressList.add, - - state: function() { - return state; - }, - - // Deprecated - isResolved: doneList.fired, - isRejected: failList.fired, - - then: function( doneCallbacks, failCallbacks, progressCallbacks ) { - deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks ); - return this; - }, - always: function() { - deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments ); - return this; - }, - pipe: function( fnDone, fnFail, fnProgress ) { - return jQuery.Deferred(function( newDefer ) { - jQuery.each( { - done: [ fnDone, "resolve" ], - fail: [ fnFail, "reject" ], - progress: [ fnProgress, "notify" ] - }, function( handler, data ) { - var fn = data[ 0 ], - action = data[ 1 ], - returned; - if ( jQuery.isFunction( fn ) ) { - deferred[ handler ](function() { - returned = fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify ); - } else { - newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); - } - }); - } else { - deferred[ handler ]( newDefer[ action ] ); - } - }); - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - if ( obj == null ) { - obj = promise; - } else { - for ( var key in promise ) { - obj[ key ] = promise[ key ]; - } - } - return obj; - } - }, - deferred = promise.promise({}), - key; - - for ( key in lists ) { - deferred[ key ] = lists[ key ].fire; - deferred[ key + "With" ] = lists[ key ].fireWith; - } - - // Handle state - deferred.done( function() { - state = "resolved"; - }, failList.disable, progressList.lock ).fail( function() { - state = "rejected"; - }, doneList.disable, progressList.lock ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( firstParam ) { - var args = sliceDeferred.call( arguments, 0 ), - i = 0, - length = args.length, - pValues = new Array( length ), - count = length, - pCount = length, - deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ? - firstParam : - jQuery.Deferred(), - promise = deferred.promise(); - function resolveFunc( i ) { - return function( value ) { - args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; - if ( !( --count ) ) { - deferred.resolveWith( deferred, args ); - } - }; - } - function progressFunc( i ) { - return function( value ) { - pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value; - deferred.notifyWith( promise, pValues ); - }; - } - if ( length > 1 ) { - for ( ; i < length; i++ ) { - if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) { - args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) ); - } else { - --count; - } - } - if ( !count ) { - deferred.resolveWith( deferred, args ); - } - } else if ( deferred !== firstParam ) { - deferred.resolveWith( deferred, length ? [ firstParam ] : [] ); - } - return promise; - } -}); - - - - -jQuery.support = (function() { - - var support, - all, - a, - select, - opt, - input, - fragment, - tds, - events, - eventName, - i, - isSupported, - div = document.createElement( "div" ), - documentElement = document.documentElement; - - // Preliminary tests - div.setAttribute("className", "t"); - div.innerHTML = "
    a"; - - all = div.getElementsByTagName( "*" ); - a = div.getElementsByTagName( "a" )[ 0 ]; - - // Can't get basic test support - if ( !all || !all.length || !a ) { - return {}; - } - - // First batch of supports tests - select = document.createElement( "select" ); - opt = select.appendChild( document.createElement("option") ); - input = div.getElementsByTagName( "input" )[ 0 ]; - - support = { - // IE strips leading whitespace when .innerHTML is used - leadingWhitespace: ( div.firstChild.nodeType === 3 ), - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - tbody: !div.getElementsByTagName("tbody").length, - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName("link").length, - - // Get the style information from getAttribute - // (IE uses .cssText instead) - style: /top/.test( a.getAttribute("style") ), - - // Make sure that URLs aren't manipulated - // (IE normalizes it by default) - hrefNormalized: ( a.getAttribute("href") === "/a" ), - - // Make sure that element opacity exists - // (IE uses filter instead) - // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.55/.test( a.style.opacity ), - - // Verify style float existence - // (IE uses styleFloat instead of cssFloat) - cssFloat: !!a.style.cssFloat, - - // Make sure that if no value is specified for a checkbox - // that it defaults to "on". - // (WebKit defaults to "" instead) - checkOn: ( input.value === "on" ), - - // Make sure that a selected-by-default option has a working selected property. - // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) - optSelected: opt.selected, - - // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) - getSetAttribute: div.className !== "t", - - // Tests for enctype support on a form(#6743) - enctype: !!document.createElement("form").enctype, - - // Makes sure cloning an html5 element does not cause problems - // Where outerHTML is undefined, this still works - html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>", - - // Will be defined later - submitBubbles: true, - changeBubbles: true, - focusinBubbles: false, - deleteExpando: true, - noCloneEvent: true, - inlineBlockNeedsLayout: false, - shrinkWrapBlocks: false, - reliableMarginRight: true, - pixelMargin: true - }; - - // jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead - jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat"); - - // Make sure checked status is properly cloned - input.checked = true; - support.noCloneChecked = input.cloneNode( true ).checked; - - // Make sure that the options inside disabled selects aren't marked as disabled - // (WebKit marks them as disabled) - select.disabled = true; - support.optDisabled = !opt.disabled; - - // Test to see if it's possible to delete an expando from an element - // Fails in Internet Explorer - try { - delete div.test; - } catch( e ) { - support.deleteExpando = false; - } - - if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { - div.attachEvent( "onclick", function() { - // Cloning a node shouldn't copy over any - // bound event handlers (IE does this) - support.noCloneEvent = false; - }); - div.cloneNode( true ).fireEvent( "onclick" ); - } - - // Check if a radio maintains its value - // after being appended to the DOM - input = document.createElement("input"); - input.value = "t"; - input.setAttribute("type", "radio"); - support.radioValue = input.value === "t"; - - input.setAttribute("checked", "checked"); - - // #11217 - WebKit loses check when the name is after the checked attribute - input.setAttribute( "name", "t" ); - - div.appendChild( input ); - fragment = document.createDocumentFragment(); - fragment.appendChild( div.lastChild ); - - // WebKit doesn't clone checked state correctly in fragments - support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Check if a disconnected checkbox will retain its checked - // value of true after appended to the DOM (IE6/7) - support.appendChecked = input.checked; - - fragment.removeChild( input ); - fragment.appendChild( div ); - - // Technique from Juriy Zaytsev - // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/ - // We only care about the case where non-standard event systems - // are used, namely in IE. Short-circuiting here helps us to - // avoid an eval call (in setAttribute) which can cause CSP - // to go haywire. See: https://developer.mozilla.org/en/Security/CSP - if ( div.attachEvent ) { - for ( i in { - submit: 1, - change: 1, - focusin: 1 - }) { - eventName = "on" + i; - isSupported = ( eventName in div ); - if ( !isSupported ) { - div.setAttribute( eventName, "return;" ); - isSupported = ( typeof div[ eventName ] === "function" ); - } - support[ i + "Bubbles" ] = isSupported; - } - } - - fragment.removeChild( div ); - - // Null elements to avoid leaks in IE - fragment = select = opt = div = input = null; - - // Run tests that need a body at doc ready - jQuery(function() { - var container, outer, inner, table, td, offsetSupport, - marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight, - paddingMarginBorderVisibility, paddingMarginBorder, - body = document.getElementsByTagName("body")[0]; - - if ( !body ) { - // Return for frameset docs that don't have a body - return; - } - - conMarginTop = 1; - paddingMarginBorder = "padding:0;margin:0;border:"; - positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;"; - paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;"; - style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;"; - html = "
    " + - "" + - "
    "; - - container = document.createElement("div"); - container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px"; - body.insertBefore( container, body.firstChild ); - - // Construct the test element - div = document.createElement("div"); - container.appendChild( div ); - - // Check if table cells still have offsetWidth/Height when they are set - // to display:none and there are still other visible table cells in a - // table row; if so, offsetWidth/Height are not reliable for use when - // determining if an element has been hidden directly using - // display:none (it is still safe to use offsets if a parent element is - // hidden; don safety goggles and see bug #4512 for more information). - // (only IE 8 fails this test) - div.innerHTML = "
    t
    "; - tds = div.getElementsByTagName( "td" ); - isSupported = ( tds[ 0 ].offsetHeight === 0 ); - - tds[ 0 ].style.display = ""; - tds[ 1 ].style.display = "none"; - - // Check if empty table cells still have offsetWidth/Height - // (IE <= 8 fail this test) - support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); - - // Check if div with explicit width and no margin-right incorrectly - // gets computed margin-right based on width of container. For more - // info see bug #3333 - // Fails in WebKit before Feb 2011 nightlies - // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right - if ( window.getComputedStyle ) { - div.innerHTML = ""; - marginDiv = document.createElement( "div" ); - marginDiv.style.width = "0"; - marginDiv.style.marginRight = "0"; - div.style.width = "2px"; - div.appendChild( marginDiv ); - support.reliableMarginRight = - ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0; - } - - if ( typeof div.style.zoom !== "undefined" ) { - // Check if natively block-level elements act like inline-block - // elements when setting their display to 'inline' and giving - // them layout - // (IE < 8 does this) - div.innerHTML = ""; - div.style.width = div.style.padding = "1px"; - div.style.border = 0; - div.style.overflow = "hidden"; - div.style.display = "inline"; - div.style.zoom = 1; - support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 ); - - // Check if elements with layout shrink-wrap their children - // (IE 6 does this) - div.style.display = "block"; - div.style.overflow = "visible"; - div.innerHTML = "
    "; - support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); - } - - div.style.cssText = positionTopLeftWidthHeight + paddingMarginBorderVisibility; - div.innerHTML = html; - - outer = div.firstChild; - inner = outer.firstChild; - td = outer.nextSibling.firstChild.firstChild; - - offsetSupport = { - doesNotAddBorder: ( inner.offsetTop !== 5 ), - doesAddBorderForTableAndCells: ( td.offsetTop === 5 ) - }; - - inner.style.position = "fixed"; - inner.style.top = "20px"; - - // safari subtracts parent border width here which is 5px - offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 ); - inner.style.position = inner.style.top = ""; - - outer.style.overflow = "hidden"; - outer.style.position = "relative"; - - offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 ); - offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop ); - - if ( window.getComputedStyle ) { - div.style.marginTop = "1%"; - support.pixelMargin = ( window.getComputedStyle( div, null ) || { marginTop: 0 } ).marginTop !== "1%"; - } - - if ( typeof container.style.zoom !== "undefined" ) { - container.style.zoom = 1; - } - - body.removeChild( container ); - marginDiv = div = container = null; - - jQuery.extend( support, offsetSupport ); - }); - - return support; -})(); - - - - -var rbrace = /^(?:\{.*\}|\[.*\])$/, - rmultiDash = /([A-Z])/g; - -jQuery.extend({ - cache: {}, - - // Please use with caution - uuid: 0, - - // Unique for each copy of jQuery on the page - // Non-digits removed to match rinlinejQuery - expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ), - - // The following elements throw uncatchable exceptions if you - // attempt to add expando properties to them. - noData: { - "embed": true, - // Ban all objects except for Flash (which handle expandos) - "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", - "applet": true - }, - - hasData: function( elem ) { - elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; - return !!elem && !isEmptyDataObject( elem ); - }, - - data: function( elem, name, data, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var privateCache, thisCache, ret, - internalKey = jQuery.expando, - getByName = typeof name === "string", - - // We have to handle DOM nodes and JS objects differently because IE6-7 - // can't GC object references properly across the DOM-JS boundary - isNode = elem.nodeType, - - // Only DOM nodes need the global jQuery cache; JS object data is - // attached directly to the object so GC can occur automatically - cache = isNode ? jQuery.cache : elem, - - // Only defining an ID for JS objects if its cache already exists allows - // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey, - isEvents = name === "events"; - - // Avoid doing any more work than we need to when trying to get data on an - // object that has no data at all - if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) { - return; - } - - if ( !id ) { - // Only DOM nodes need a new unique ID for each element since their data - // ends up in the global cache - if ( isNode ) { - elem[ internalKey ] = id = ++jQuery.uuid; - } else { - id = internalKey; - } - } - - if ( !cache[ id ] ) { - cache[ id ] = {}; - - // Avoids exposing jQuery metadata on plain JS objects when the object - // is serialized using JSON.stringify - if ( !isNode ) { - cache[ id ].toJSON = jQuery.noop; - } - } - - // An object can be passed to jQuery.data instead of a key/value pair; this gets - // shallow copied over onto the existing cache - if ( typeof name === "object" || typeof name === "function" ) { - if ( pvt ) { - cache[ id ] = jQuery.extend( cache[ id ], name ); - } else { - cache[ id ].data = jQuery.extend( cache[ id ].data, name ); - } - } - - privateCache = thisCache = cache[ id ]; - - // jQuery data() is stored in a separate object inside the object's internal data - // cache in order to avoid key collisions between internal data and user-defined - // data. - if ( !pvt ) { - if ( !thisCache.data ) { - thisCache.data = {}; - } - - thisCache = thisCache.data; - } - - if ( data !== undefined ) { - thisCache[ jQuery.camelCase( name ) ] = data; - } - - // Users should not attempt to inspect the internal events object using jQuery.data, - // it is undocumented and subject to change. But does anyone listen? No. - if ( isEvents && !thisCache[ name ] ) { - return privateCache.events; - } - - // Check for both converted-to-camel and non-converted data property names - // If a data property was specified - if ( getByName ) { - - // First Try to find as-is property data - ret = thisCache[ name ]; - - // Test for null|undefined property data - if ( ret == null ) { - - // Try to find the camelCased property - ret = thisCache[ jQuery.camelCase( name ) ]; - } - } else { - ret = thisCache; - } - - return ret; - }, - - removeData: function( elem, name, pvt /* Internal Use Only */ ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var thisCache, i, l, - - // Reference to internal data cache key - internalKey = jQuery.expando, - - isNode = elem.nodeType, - - // See jQuery.data for more information - cache = isNode ? jQuery.cache : elem, - - // See jQuery.data for more information - id = isNode ? elem[ internalKey ] : internalKey; - - // If there is already no cache entry for this object, there is no - // purpose in continuing - if ( !cache[ id ] ) { - return; - } - - if ( name ) { - - thisCache = pvt ? cache[ id ] : cache[ id ].data; - - if ( thisCache ) { - - // Support array or space separated string names for data keys - if ( !jQuery.isArray( name ) ) { - - // try the string as a key before any manipulation - if ( name in thisCache ) { - name = [ name ]; - } else { - - // split the camel cased version by spaces unless a key with the spaces exists - name = jQuery.camelCase( name ); - if ( name in thisCache ) { - name = [ name ]; - } else { - name = name.split( " " ); - } - } - } - - for ( i = 0, l = name.length; i < l; i++ ) { - delete thisCache[ name[i] ]; - } - - // If there is no data left in the cache, we want to continue - // and let the cache object itself get destroyed - if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) { - return; - } - } - } - - // See jQuery.data for more information - if ( !pvt ) { - delete cache[ id ].data; - - // Don't destroy the parent cache unless the internal data object - // had been the only thing left in it - if ( !isEmptyDataObject(cache[ id ]) ) { - return; - } - } - - // Browsers that fail expando deletion also refuse to delete expandos on - // the window, but it will allow it on all other JS objects; other browsers - // don't care - // Ensure that `cache` is not a window object #10080 - if ( jQuery.support.deleteExpando || !cache.setInterval ) { - delete cache[ id ]; - } else { - cache[ id ] = null; - } - - // We destroyed the cache and need to eliminate the expando on the node to avoid - // false lookups in the cache for entries that no longer exist - if ( isNode ) { - // IE does not allow us to delete expando properties from nodes, - // nor does it have a removeAttribute function on Document nodes; - // we must handle all of these cases - if ( jQuery.support.deleteExpando ) { - delete elem[ internalKey ]; - } else if ( elem.removeAttribute ) { - elem.removeAttribute( internalKey ); - } else { - elem[ internalKey ] = null; - } - } - }, - - // For internal use only. - _data: function( elem, name, data ) { - return jQuery.data( elem, name, data, true ); - }, - - // A method for determining if a DOM node can handle the data expando - acceptData: function( elem ) { - if ( elem.nodeName ) { - var match = jQuery.noData[ elem.nodeName.toLowerCase() ]; - - if ( match ) { - return !(match === true || elem.getAttribute("classid") !== match); - } - } - - return true; - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - var parts, part, attr, name, l, - elem = this[0], - i = 0, - data = null; - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = jQuery.data( elem ); - - if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { - attr = elem.attributes; - for ( l = attr.length; i < l; i++ ) { - name = attr[i].name; - - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.substring(5) ); - - dataAttr( elem, name, data[ name ] ); - } - } - jQuery._data( elem, "parsedAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); - }); - } - - parts = key.split( ".", 2 ); - parts[1] = parts[1] ? "." + parts[1] : ""; - part = parts[1] + "!"; - - return jQuery.access( this, function( value ) { - - if ( value === undefined ) { - data = this.triggerHandler( "getData" + part, [ parts[0] ] ); - - // Try to fetch any internally stored data first - if ( data === undefined && elem ) { - data = jQuery.data( elem, key ); - data = dataAttr( elem, key, data ); - } - - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; - } - - parts[1] = value; - this.each(function() { - var self = jQuery( this ); - - self.triggerHandler( "setData" + part, parts ); - jQuery.data( this, key, value ); - self.triggerHandler( "changeData" + part, parts ); - }); - }, null, value, arguments.length > 1, null, false ); - }, - - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); - }); - } -}); - -function dataAttr( elem, key, data ) { - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - - var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - jQuery.isNumeric( data ) ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch( e ) {} - - // Make sure we set the data so it isn't changed later - jQuery.data( elem, key, data ); - - } else { - data = undefined; - } - } - - return data; -} - -// checks a cache object for emptiness -function isEmptyDataObject( obj ) { - for ( var name in obj ) { - - // if the public data object is empty, the private is still empty - if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { - continue; - } - if ( name !== "toJSON" ) { - return false; - } - } - - return true; -} - - - - -function handleQueueMarkDefer( elem, type, src ) { - var deferDataKey = type + "defer", - queueDataKey = type + "queue", - markDataKey = type + "mark", - defer = jQuery._data( elem, deferDataKey ); - if ( defer && - ( src === "queue" || !jQuery._data(elem, queueDataKey) ) && - ( src === "mark" || !jQuery._data(elem, markDataKey) ) ) { - // Give room for hard-coded callbacks to fire first - // and eventually mark/queue something else on the element - setTimeout( function() { - if ( !jQuery._data( elem, queueDataKey ) && - !jQuery._data( elem, markDataKey ) ) { - jQuery.removeData( elem, deferDataKey, true ); - defer.fire(); - } - }, 0 ); - } -} - -jQuery.extend({ - - _mark: function( elem, type ) { - if ( elem ) { - type = ( type || "fx" ) + "mark"; - jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 ); - } - }, - - _unmark: function( force, elem, type ) { - if ( force !== true ) { - type = elem; - elem = force; - force = false; - } - if ( elem ) { - type = type || "fx"; - var key = type + "mark", - count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 ); - if ( count ) { - jQuery._data( elem, key, count ); - } else { - jQuery.removeData( elem, key, true ); - handleQueueMarkDefer( elem, type, "mark" ); - } - } - }, - - queue: function( elem, type, data ) { - var q; - if ( elem ) { - type = ( type || "fx" ) + "queue"; - q = jQuery._data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !q || jQuery.isArray(data) ) { - q = jQuery._data( elem, type, jQuery.makeArray(data) ); - } else { - q.push( data ); - } - } - return q || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - fn = queue.shift(), - hooks = {}; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - } - - if ( fn ) { - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - jQuery._data( elem, type + ".run", hooks ); - fn.call( elem, function() { - jQuery.dequeue( elem, type ); - }, hooks ); - } - - if ( !queue.length ) { - jQuery.removeData( elem, type + "queue " + type + ".run", true ); - handleQueueMarkDefer( elem, type, "queue" ); - } - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[0], type ); - } - - return data === undefined ? - this : - this.each(function() { - var queue = jQuery.queue( this, type, data ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ - delay: function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; - type = type || "fx"; - - return this.queue( type, function( next, hooks ) { - var timeout = setTimeout( next, time ); - hooks.stop = function() { - clearTimeout( timeout ); - }; - }); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, object ) { - if ( typeof type !== "string" ) { - object = type; - type = undefined; - } - type = type || "fx"; - var defer = jQuery.Deferred(), - elements = this, - i = elements.length, - count = 1, - deferDataKey = type + "defer", - queueDataKey = type + "queue", - markDataKey = type + "mark", - tmp; - function resolve() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - } - while( i-- ) { - if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) || - ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) || - jQuery.data( elements[ i ], markDataKey, undefined, true ) ) && - jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) { - count++; - tmp.add( resolve ); - } - } - resolve(); - return defer.promise( object ); - } -}); - - - - -var rclass = /[\n\t\r]/g, - rspace = /\s+/, - rreturn = /\r/g, - rtype = /^(?:button|input)$/i, - rfocusable = /^(?:button|input|object|select|textarea)$/i, - rclickable = /^a(?:rea)?$/i, - rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - getSetAttribute = jQuery.support.getSetAttribute, - nodeHook, boolHook, fixSpecified; - -jQuery.fn.extend({ - attr: function( name, value ) { - return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 ); - }, - - removeAttr: function( name ) { - return this.each(function() { - jQuery.removeAttr( this, name ); - }); - }, - - prop: function( name, value ) { - return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 ); - }, - - removeProp: function( name ) { - name = jQuery.propFix[ name ] || name; - return this.each(function() { - // try/catch handles cases where IE balks (such as removing a property on window) - try { - this[ name ] = undefined; - delete this[ name ]; - } catch( e ) {} - }); - }, - - addClass: function( value ) { - var classNames, i, l, elem, - setClass, c, cl; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).addClass( value.call(this, j, this.className) ); - }); - } - - if ( value && typeof value === "string" ) { - classNames = value.split( rspace ); - - for ( i = 0, l = this.length; i < l; i++ ) { - elem = this[ i ]; - - if ( elem.nodeType === 1 ) { - if ( !elem.className && classNames.length === 1 ) { - elem.className = value; - - } else { - setClass = " " + elem.className + " "; - - for ( c = 0, cl = classNames.length; c < cl; c++ ) { - if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) { - setClass += classNames[ c ] + " "; - } - } - elem.className = jQuery.trim( setClass ); - } - } - } - } - - return this; - }, - - removeClass: function( value ) { - var classNames, i, l, elem, className, c, cl; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).removeClass( value.call(this, j, this.className) ); - }); - } - - if ( (value && typeof value === "string") || value === undefined ) { - classNames = ( value || "" ).split( rspace ); - - for ( i = 0, l = this.length; i < l; i++ ) { - elem = this[ i ]; - - if ( elem.nodeType === 1 && elem.className ) { - if ( value ) { - className = (" " + elem.className + " ").replace( rclass, " " ); - for ( c = 0, cl = classNames.length; c < cl; c++ ) { - className = className.replace(" " + classNames[ c ] + " ", " "); - } - elem.className = jQuery.trim( className ); - - } else { - elem.className = ""; - } - } - } - } - - return this; - }, - - toggleClass: function( value, stateVal ) { - var type = typeof value, - isBool = typeof stateVal === "boolean"; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( i ) { - jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); - }); - } - - return this.each(function() { - if ( type === "string" ) { - // toggle individual class names - var className, - i = 0, - self = jQuery( this ), - state = stateVal, - classNames = value.split( rspace ); - - while ( (className = classNames[ i++ ]) ) { - // check each className given, space seperated list - state = isBool ? state : !self.hasClass( className ); - self[ state ? "addClass" : "removeClass" ]( className ); - } - - } else if ( type === "undefined" || type === "boolean" ) { - if ( this.className ) { - // store className if set - jQuery._data( this, "__className__", this.className ); - } - - // toggle whole className - this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; - } - }); - }, - - hasClass: function( selector ) { - var className = " " + selector + " ", - i = 0, - l = this.length; - for ( ; i < l; i++ ) { - if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { - return true; - } - } - - return false; - }, - - val: function( value ) { - var hooks, ret, isFunction, - elem = this[0]; - - if ( !arguments.length ) { - if ( elem ) { - hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ]; - - if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { - return ret; - } - - ret = elem.value; - - return typeof ret === "string" ? - // handle most common string cases - ret.replace(rreturn, "") : - // handle cases where value is null/undef or number - ret == null ? "" : ret; - } - - return; - } - - isFunction = jQuery.isFunction( value ); - - return this.each(function( i ) { - var self = jQuery(this), val; - - if ( this.nodeType !== 1 ) { - return; - } - - if ( isFunction ) { - val = value.call( this, i, self.val() ); - } else { - val = value; - } - - // Treat null/undefined as ""; convert numbers to string - if ( val == null ) { - val = ""; - } else if ( typeof val === "number" ) { - val += ""; - } else if ( jQuery.isArray( val ) ) { - val = jQuery.map(val, function ( value ) { - return value == null ? "" : value + ""; - }); - } - - hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; - - // If set returns undefined, fall back to normal setting - if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { - this.value = val; - } - }); - } -}); - -jQuery.extend({ - valHooks: { - option: { - get: function( elem ) { - // attributes.value is undefined in Blackberry 4.7 but - // uses .value. See #6932 - var val = elem.attributes.value; - return !val || val.specified ? elem.value : elem.text; - } - }, - select: { - get: function( elem ) { - var value, i, max, option, - index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type === "select-one"; - - // Nothing was selected - if ( index < 0 ) { - return null; - } - - // Loop through all the selected options - i = one ? index : 0; - max = one ? index + 1 : options.length; - for ( ; i < max; i++ ) { - option = options[ i ]; - - // Don't return options that are disabled or in a disabled optgroup - if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && - (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) { - - // Get the specific value for the option - value = jQuery( option ).val(); - - // We don't need an array for one selects - if ( one ) { - return value; - } - - // Multi-Selects return an array - values.push( value ); - } - } - - // Fixes Bug #2551 -- select.val() broken in IE after form.reset() - if ( one && !values.length && options.length ) { - return jQuery( options[ index ] ).val(); - } - - return values; - }, - - set: function( elem, value ) { - var values = jQuery.makeArray( value ); - - jQuery(elem).find("option").each(function() { - this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; - }); - - if ( !values.length ) { - elem.selectedIndex = -1; - } - return values; - } - } - }, - - attrFn: { - val: true, - css: true, - html: true, - text: true, - data: true, - width: true, - height: true, - offset: true - }, - - attr: function( elem, name, value, pass ) { - var ret, hooks, notxml, - nType = elem.nodeType; - - // don't get/set attributes on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - if ( pass && name in jQuery.attrFn ) { - return jQuery( elem )[ name ]( value ); - } - - // Fallback to prop when attributes are not supported - if ( typeof elem.getAttribute === "undefined" ) { - return jQuery.prop( elem, name, value ); - } - - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - - // All attributes are lowercase - // Grab necessary hook if one is defined - if ( notxml ) { - name = name.toLowerCase(); - hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook ); - } - - if ( value !== undefined ) { - - if ( value === null ) { - jQuery.removeAttr( elem, name ); - return; - - } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; - - } else { - elem.setAttribute( name, "" + value ); - return value; - } - - } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) { - return ret; - - } else { - - ret = elem.getAttribute( name ); - - // Non-existent attributes return null, we normalize to undefined - return ret === null ? - undefined : - ret; - } - }, - - removeAttr: function( elem, value ) { - var propName, attrNames, name, l, isBool, - i = 0; - - if ( value && elem.nodeType === 1 ) { - attrNames = value.toLowerCase().split( rspace ); - l = attrNames.length; - - for ( ; i < l; i++ ) { - name = attrNames[ i ]; - - if ( name ) { - propName = jQuery.propFix[ name ] || name; - isBool = rboolean.test( name ); - - // See #9699 for explanation of this approach (setting first, then removal) - // Do not do this for boolean attributes (see #10870) - if ( !isBool ) { - jQuery.attr( elem, name, "" ); - } - elem.removeAttribute( getSetAttribute ? name : propName ); - - // Set corresponding property to false for boolean attributes - if ( isBool && propName in elem ) { - elem[ propName ] = false; - } - } - } - } - }, - - attrHooks: { - type: { - set: function( elem, value ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { - // Setting the type on a radio button after the value resets the value in IE6-9 - // Reset value to it's default in case type is set after value - // This is for element creation - var val = elem.value; - elem.setAttribute( "type", value ); - if ( val ) { - elem.value = val; - } - return value; - } - } - }, - // Use the value property for back compat - // Use the nodeHook for button elements in IE6/7 (#1954) - value: { - get: function( elem, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.get( elem, name ); - } - return name in elem ? - elem.value : - null; - }, - set: function( elem, value, name ) { - if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { - return nodeHook.set( elem, value, name ); - } - // Does not return so that setAttribute is also used - elem.value = value; - } - } - }, - - propFix: { - tabindex: "tabIndex", - readonly: "readOnly", - "for": "htmlFor", - "class": "className", - maxlength: "maxLength", - cellspacing: "cellSpacing", - cellpadding: "cellPadding", - rowspan: "rowSpan", - colspan: "colSpan", - usemap: "useMap", - frameborder: "frameBorder", - contenteditable: "contentEditable" - }, - - prop: function( elem, name, value ) { - var ret, hooks, notxml, - nType = elem.nodeType; - - // don't get/set properties on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - - if ( notxml ) { - // Fix name and attach hooks - name = jQuery.propFix[ name ] || name; - hooks = jQuery.propHooks[ name ]; - } - - if ( value !== undefined ) { - if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; - - } else { - return ( elem[ name ] = value ); - } - - } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { - return ret; - - } else { - return elem[ name ]; - } - } - }, - - propHooks: { - tabIndex: { - get: function( elem ) { - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - var attributeNode = elem.getAttributeNode("tabindex"); - - return attributeNode && attributeNode.specified ? - parseInt( attributeNode.value, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; - } - } - } -}); - -// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional) -jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex; - -// Hook for boolean attributes -boolHook = { - get: function( elem, name ) { - // Align boolean attributes with corresponding properties - // Fall back to attribute presence where some booleans are not supported - var attrNode, - property = jQuery.prop( elem, name ); - return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ? - name.toLowerCase() : - undefined; - }, - set: function( elem, value, name ) { - var propName; - if ( value === false ) { - // Remove boolean attributes when set to false - jQuery.removeAttr( elem, name ); - } else { - // value is true since we know at this point it's type boolean and not false - // Set boolean attributes to the same name and set the DOM property - propName = jQuery.propFix[ name ] || name; - if ( propName in elem ) { - // Only set the IDL specifically if it already exists on the element - elem[ propName ] = true; - } - - elem.setAttribute( name, name.toLowerCase() ); - } - return name; - } -}; - -// IE6/7 do not support getting/setting some attributes with get/setAttribute -if ( !getSetAttribute ) { - - fixSpecified = { - name: true, - id: true, - coords: true - }; - - // Use this for any attribute in IE6/7 - // This fixes almost every IE6/7 issue - nodeHook = jQuery.valHooks.button = { - get: function( elem, name ) { - var ret; - ret = elem.getAttributeNode( name ); - return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ? - ret.nodeValue : - undefined; - }, - set: function( elem, value, name ) { - // Set the existing or create a new attribute node - var ret = elem.getAttributeNode( name ); - if ( !ret ) { - ret = document.createAttribute( name ); - elem.setAttributeNode( ret ); - } - return ( ret.nodeValue = value + "" ); - } - }; - - // Apply the nodeHook to tabindex - jQuery.attrHooks.tabindex.set = nodeHook.set; - - // Set width and height to auto instead of 0 on empty string( Bug #8150 ) - // This is for removals - jQuery.each([ "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - set: function( elem, value ) { - if ( value === "" ) { - elem.setAttribute( name, "auto" ); - return value; - } - } - }); - }); - - // Set contenteditable to false on removals(#10429) - // Setting to empty string throws an error as an invalid value - jQuery.attrHooks.contenteditable = { - get: nodeHook.get, - set: function( elem, value, name ) { - if ( value === "" ) { - value = "false"; - } - nodeHook.set( elem, value, name ); - } - }; -} - - -// Some attributes require a special call on IE -if ( !jQuery.support.hrefNormalized ) { - jQuery.each([ "href", "src", "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], { - get: function( elem ) { - var ret = elem.getAttribute( name, 2 ); - return ret === null ? undefined : ret; - } - }); - }); -} - -if ( !jQuery.support.style ) { - jQuery.attrHooks.style = { - get: function( elem ) { - // Return undefined in the case of empty string - // Normalize to lowercase since IE uppercases css property names - return elem.style.cssText.toLowerCase() || undefined; - }, - set: function( elem, value ) { - return ( elem.style.cssText = "" + value ); - } - }; -} - -// Safari mis-reports the default selected property of an option -// Accessing the parent's selectedIndex property fixes it -if ( !jQuery.support.optSelected ) { - jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, { - get: function( elem ) { - var parent = elem.parentNode; - - if ( parent ) { - parent.selectedIndex; - - // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } - } - return null; - } - }); -} - -// IE6/7 call enctype encoding -if ( !jQuery.support.enctype ) { - jQuery.propFix.enctype = "encoding"; -} - -// Radios and checkboxes getter/setter -if ( !jQuery.support.checkOn ) { - jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = { - get: function( elem ) { - // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified - return elem.getAttribute("value") === null ? "on" : elem.value; - } - }; - }); -} -jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], { - set: function( elem, value ) { - if ( jQuery.isArray( value ) ) { - return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); - } - } - }); -}); - - - - -var rformElems = /^(?:textarea|input|select)$/i, - rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/, - rhoverHack = /(?:^|\s)hover(\.\S+)?\b/, - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/, - quickParse = function( selector ) { - var quick = rquickIs.exec( selector ); - if ( quick ) { - // 0 1 2 3 - // [ _, tag, id, class ] - quick[1] = ( quick[1] || "" ).toLowerCase(); - quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" ); - } - return quick; - }, - quickIs = function( elem, m ) { - var attrs = elem.attributes || {}; - return ( - (!m[1] || elem.nodeName.toLowerCase() === m[1]) && - (!m[2] || (attrs.id || {}).value === m[2]) && - (!m[3] || m[3].test( (attrs[ "class" ] || {}).value )) - ); - }, - hoverHack = function( events ) { - return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" ); - }; - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - add: function( elem, types, handler, data, selector ) { - - var elemData, eventHandle, events, - t, tns, type, namespaces, handleObj, - handleObjIn, quick, handlers, special; - - // Don't attach events to noData or text/comment nodes (allow plain objects tho) - if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - events = elemData.events; - if ( !events ) { - elemData.events = events = {}; - } - eventHandle = elemData.handle; - if ( !eventHandle ) { - elemData.handle = eventHandle = function( e ) { - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : - undefined; - }; - // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events - eventHandle.elem = elem; - } - - // Handle multiple events separated by a space - // jQuery(...).bind("mouseover mouseout", fn); - types = jQuery.trim( hoverHack(types) ).split( " " ); - for ( t = 0; t < types.length; t++ ) { - - tns = rtypenamespace.exec( types[t] ) || []; - type = tns[1]; - namespaces = ( tns[2] || "" ).split( "." ).sort(); - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: tns[1], - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - quick: selector && quickParse( selector ), - namespace: namespaces.join(".") - }, handleObjIn ); - - // Init the event handler queue if we're the first - handlers = events[ type ]; - if ( !handlers ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener/attachEvent if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - global: {}, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - - var elemData = jQuery.hasData( elem ) && jQuery._data( elem ), - t, tns, type, origType, namespaces, origCount, - j, events, special, handle, eventType, handleObj; - - if ( !elemData || !(events = elemData.events) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = jQuery.trim( hoverHack( types || "" ) ).split(" "); - for ( t = 0; t < types.length; t++ ) { - tns = rtypenamespace.exec( types[t] ) || []; - type = origType = tns[1]; - namespaces = tns[2]; - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector? special.delegateType : special.bindType ) || type; - eventType = events[ type ] || []; - origCount = eventType.length; - namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null; - - // Remove matching events - for ( j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !namespaces || namespaces.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - eventType.splice( j--, 1 ); - - if ( handleObj.selector ) { - eventType.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( eventType.length === 0 && origCount !== eventType.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - handle = elemData.handle; - if ( handle ) { - handle.elem = null; - } - - // removeData also checks for emptiness and clears the expando if empty - // so use it instead of delete - jQuery.removeData( elem, [ "events", "handle" ], true ); - } - }, - - // Events that are safe to short-circuit if no handlers are attached. - // Native DOM events should not be added, they may have inline handlers. - customEvent: { - "getData": true, - "setData": true, - "changeData": true - }, - - trigger: function( event, data, elem, onlyHandlers ) { - // Don't do events on text and comment nodes - if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) { - return; - } - - // Event object or event type - var type = event.type || event, - namespaces = [], - cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType; - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf( "!" ) >= 0 ) { - // Exclusive events trigger only for the exact event (no namespaces) - type = type.slice(0, -1); - exclusive = true; - } - - if ( type.indexOf( "." ) >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } - - if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) { - // No jQuery handlers for this event type, and it can't have inline handlers - return; - } - - // Caller can pass in an Event, Object, or just an event type string - event = typeof event === "object" ? - // jQuery.Event object - event[ jQuery.expando ] ? event : - // Object literal - new jQuery.Event( type, event ) : - // Just the event type (string) - new jQuery.Event( type ); - - event.type = type; - event.isTrigger = true; - event.exclusive = exclusive; - event.namespace = namespaces.join( "." ); - event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null; - ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; - - // Handle a global trigger - if ( !elem ) { - - // TODO: Stop taunting the data cache; remove global events and always attach to document - cache = jQuery.cache; - for ( i in cache ) { - if ( cache[ i ].events && cache[ i ].events[ type ] ) { - jQuery.event.trigger( event, data, cache[ i ].handle.elem, true ); - } - } - return; - } - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data != null ? jQuery.makeArray( data ) : []; - data.unshift( event ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - eventPath = [[ elem, special.bindType || type ]]; - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode; - old = null; - for ( ; cur; cur = cur.parentNode ) { - eventPath.push([ cur, bubbleType ]); - old = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( old && old === elem.ownerDocument ) { - eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]); - } - } - - // Fire handlers on the event path - for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) { - - cur = eventPath[i][0]; - event.type = eventPath[i][1]; - - handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - // Note that this is a bare JS function and not a jQuery handler - handle = ontype && cur[ ontype ]; - if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) { - event.preventDefault(); - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && - !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name name as the event. - // Can't use an .isFunction() check here because IE6/7 fails that test. - // Don't do default actions on window, that's where global variables be (#6170) - // IE<9 dies on focus/blur to hidden element (#1486) - if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - old = elem[ ontype ]; - - if ( old ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - elem[ type ](); - jQuery.event.triggered = undefined; - - if ( old ) { - elem[ ontype ] = old; - } - } - } - } - - return event.result; - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event || window.event ); - - var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []), - delegateCount = handlers.delegateCount, - args = [].slice.call( arguments, 0 ), - run_all = !event.exclusive && !event.namespace, - special = jQuery.event.special[ event.type ] || {}, - handlerQueue = [], - i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers that should run if there are delegated events - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && !(event.button && event.type === "click") ) { - - // Pregenerate a single jQuery object for reuse with .is() - jqcur = jQuery(this); - jqcur.context = this.ownerDocument || this; - - for ( cur = event.target; cur != this; cur = cur.parentNode || this ) { - - // Don't process events on disabled elements (#6911, #8165) - if ( cur.disabled !== true ) { - selMatch = {}; - matches = []; - jqcur[0] = cur; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - sel = handleObj.selector; - - if ( selMatch[ sel ] === undefined ) { - selMatch[ sel ] = ( - handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel ) - ); - } - if ( selMatch[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, matches: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( handlers.length > delegateCount ) { - handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) }); - } - - // Run delegates first; they may want to stop propagation beneath us - for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { - matched = handlerQueue[ i ]; - event.currentTarget = matched.elem; - - for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) { - handleObj = matched.matches[ j ]; - - // Triggered event must either 1) be non-exclusive and have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) { - - event.data = handleObj.data; - event.handleObj = handleObj; - - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); - - if ( ret !== undefined ) { - event.result = ret; - if ( ret === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** - props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var eventDoc, doc, body, - button = original.button, - fromElement = original.fromElement; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && fromElement ) { - event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, - originalEvent = event, - fixHook = jQuery.event.fixHooks[ event.type ] || {}, - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = jQuery.Event( originalEvent ); - - for ( i = copy.length; i; ) { - prop = copy[ --i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2) - if ( !event.target ) { - event.target = originalEvent.srcElement || document; - } - - // Target should not be a text node (#504, Safari) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8) - if ( event.metaKey === undefined ) { - event.metaKey = event.ctrlKey; - } - - return fixHook.filter? fixHook.filter( event, originalEvent ) : event; - }, - - special: { - ready: { - // Make sure the ready event is setup - setup: jQuery.bindReady - }, - - load: { - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - - focus: { - delegateType: "focusin" - }, - blur: { - delegateType: "focusout" - }, - - beforeunload: { - setup: function( data, namespaces, eventHandle ) { - // We only want to do this special case on windows - if ( jQuery.isWindow( this ) ) { - this.onbeforeunload = eventHandle; - } - }, - - teardown: function( namespaces, eventHandle ) { - if ( this.onbeforeunload === eventHandle ) { - this.onbeforeunload = null; - } - } - } - }, - - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -// Some plugins are using, but it's undocumented/deprecated and will be removed. -// The 1.7 special event interface should provide all the hooks needed now. -jQuery.event.handle = jQuery.event.dispatch; - -jQuery.removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } - } : - function( elem, type, handle ) { - if ( elem.detachEvent ) { - elem.detachEvent( "on" + type, handle ); - } - }; - -jQuery.Event = function( src, props ) { - // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || - src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -function returnFalse() { - return false; -} -function returnTrue() { - return true; -} - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - preventDefault: function() { - this.isDefaultPrevented = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - - // if preventDefault exists run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - - // otherwise set the returnValue property of the original event to false (IE) - } else { - e.returnValue = false; - } - }, - stopPropagation: function() { - this.isPropagationStopped = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - // if stopPropagation exists run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - // otherwise set the cancelBubble property of the original event to true (IE) - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - this.isImmediatePropagationStopped = returnTrue; - this.stopPropagation(); - }, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var target = this, - related = event.relatedTarget, - handleObj = event.handleObj, - selector = handleObj.selector, - ret; - - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -}); - -// IE submit delegation -if ( !jQuery.support.submitBubbles ) { - - jQuery.event.special.submit = { - setup: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Lazy-add a submit handler when a descendant form may potentially be submitted - jQuery.event.add( this, "click._submit keypress._submit", function( e ) { - // Node name check avoids a VML-related crash in IE (#9807) - var elem = e.target, - form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; - if ( form && !form._submit_attached ) { - jQuery.event.add( form, "submit._submit", function( event ) { - event._submit_bubble = true; - }); - form._submit_attached = true; - } - }); - // return undefined since we don't need an event listener - }, - - postDispatch: function( event ) { - // If form was submitted by the user, bubble the event up the tree - if ( event._submit_bubble ) { - delete event._submit_bubble; - if ( this.parentNode && !event.isTrigger ) { - jQuery.event.simulate( "submit", this.parentNode, event, true ); - } - } - }, - - teardown: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Remove delegated handlers; cleanData eventually reaps submit handlers attached above - jQuery.event.remove( this, "._submit" ); - } - }; -} - -// IE change delegation and checkbox/radio fix -if ( !jQuery.support.changeBubbles ) { - - jQuery.event.special.change = { - - setup: function() { - - if ( rformElems.test( this.nodeName ) ) { - // IE doesn't fire change on a check/radio until blur; trigger it on click - // after a propertychange. Eat the blur-change in special.change.handle. - // This still fires onchange a second time for check/radio after blur. - if ( this.type === "checkbox" || this.type === "radio" ) { - jQuery.event.add( this, "propertychange._change", function( event ) { - if ( event.originalEvent.propertyName === "checked" ) { - this._just_changed = true; - } - }); - jQuery.event.add( this, "click._change", function( event ) { - if ( this._just_changed && !event.isTrigger ) { - this._just_changed = false; - jQuery.event.simulate( "change", this, event, true ); - } - }); - } - return false; - } - // Delegated event; lazy-add a change handler on descendant inputs - jQuery.event.add( this, "beforeactivate._change", function( e ) { - var elem = e.target; - - if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) { - jQuery.event.add( elem, "change._change", function( event ) { - if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { - jQuery.event.simulate( "change", this.parentNode, event, true ); - } - }); - elem._change_attached = true; - } - }); - }, - - handle: function( event ) { - var elem = event.target; - - // Swallow native change events from checkbox/radio, we already triggered them above - if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { - return event.handleObj.handler.apply( this, arguments ); - } - }, - - teardown: function() { - jQuery.event.remove( this, "._change" ); - - return rformElems.test( this.nodeName ); - } - }; -} - -// Create "bubbling" focus and blur events -if ( !jQuery.support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler while someone wants focusin/focusout - var attaches = 0, - handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - if ( attaches++ === 0 ) { - document.addEventListener( orig, handler, true ); - } - }, - teardown: function() { - if ( --attaches === 0 ) { - document.removeEventListener( orig, handler, true ); - } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { // && selector != null - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - }); - }, - one: function( types, selector, data, fn ) { - return this.on( types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - if ( types && types.preventDefault && types.handleObj ) { - // ( event ) dispatched jQuery.Event - var handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - // ( types-object [, selector] ) - for ( var type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each(function() { - jQuery.event.remove( this, types, fn, selector ); - }); - }, - - bind: function( types, data, fn ) { - return this.on( types, null, data, fn ); - }, - unbind: function( types, fn ) { - return this.off( types, null, fn ); - }, - - live: function( types, data, fn ) { - jQuery( this.context ).on( types, this.selector, data, fn ); - return this; - }, - die: function( types, fn ) { - jQuery( this.context ).off( types, this.selector || "**", fn ); - return this; - }, - - delegate: function( selector, types, data, fn ) { - return this.on( types, selector, data, fn ); - }, - undelegate: function( selector, types, fn ) { - // ( namespace ) or ( selector, types [, fn] ) - return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn ); - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - triggerHandler: function( type, data ) { - if ( this[0] ) { - return jQuery.event.trigger( type, data, this[0], true ); - } - }, - - toggle: function( fn ) { - // Save reference to arguments for access in closure - var args = arguments, - guid = fn.guid || jQuery.guid++, - i = 0, - toggler = function( event ) { - // Figure out which function to execute - var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); - - // Make sure that clicks stop - event.preventDefault(); - - // and execute the function - return args[ lastToggle ].apply( this, arguments ) || false; - }; - - // link all the functions, so any of them can unbind this click handler - toggler.guid = guid; - while ( i < args.length ) { - args[ i++ ].guid = guid; - } - - return this.click( toggler ); - }, - - hover: function( fnOver, fnOut ) { - return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); - } -}); - -jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + - "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) { - - // Handle event binding - jQuery.fn[ name ] = function( data, fn ) { - if ( fn == null ) { - fn = data; - data = null; - } - - return arguments.length > 0 ? - this.on( name, null, data, fn ) : - this.trigger( name ); - }; - - if ( jQuery.attrFn ) { - jQuery.attrFn[ name ] = true; - } - - if ( rkeyEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; - } - - if ( rmouseEvent.test( name ) ) { - jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; - } -}); - - - -/*! - * Sizzle CSS Selector Engine - * Copyright 2011, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){ - -var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, - expando = "sizcache" + (Math.random() + '').replace('.', ''), - done = 0, - toString = Object.prototype.toString, - hasDuplicate = false, - baseHasDuplicate = true, - rBackslash = /\\/g, - rReturn = /\r\n/g, - rNonWord = /\W/; - -// Here we check if the JavaScript engine is using some sort of -// optimization where it does not always call our comparision -// function. If that is the case, discard the hasDuplicate value. -// Thus far that includes Google Chrome. -[0, 0].sort(function() { - baseHasDuplicate = false; - return 0; -}); - -var Sizzle = function( selector, context, results, seed ) { - results = results || []; - context = context || document; - - var origContext = context; - - if ( context.nodeType !== 1 && context.nodeType !== 9 ) { - return []; - } - - if ( !selector || typeof selector !== "string" ) { - return results; - } - - var m, set, checkSet, extra, ret, cur, pop, i, - prune = true, - contextXML = Sizzle.isXML( context ), - parts = [], - soFar = selector; - - // Reset the position of the chunker regexp (start from head) - do { - chunker.exec( "" ); - m = chunker.exec( soFar ); - - if ( m ) { - soFar = m[3]; - - parts.push( m[1] ); - - if ( m[2] ) { - extra = m[3]; - break; - } - } - } while ( m ); - - if ( parts.length > 1 && origPOS.exec( selector ) ) { - - if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context, seed ); - - } else { - set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle( parts.shift(), context ); - - while ( parts.length ) { - selector = parts.shift(); - - if ( Expr.relative[ selector ] ) { - selector += parts.shift(); - } - - set = posProcess( selector, set, seed ); - } - } - - - } else { - // Take a shortcut and set the context if the root selector is an ID - // (but not if it'll be faster if the inner selector is an ID) - if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { - - ret = Sizzle.find( parts.shift(), context, contextXML ); - context = ret.expr ? - Sizzle.filter( ret.expr, ret.set )[0] : - ret.set[0]; - } - - if ( context ) { - ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); - - set = ret.expr ? - Sizzle.filter( ret.expr, ret.set ) : - ret.set; - - if ( parts.length > 0 ) { - checkSet = makeArray( set ); - - } else { - prune = false; - } - - while ( parts.length ) { - cur = parts.pop(); - pop = cur; - - if ( !Expr.relative[ cur ] ) { - cur = ""; - } else { - pop = parts.pop(); - } - - if ( pop == null ) { - pop = context; - } - - Expr.relative[ cur ]( checkSet, pop, contextXML ); - } - - } else { - checkSet = parts = []; - } - } - - if ( !checkSet ) { - checkSet = set; - } - - if ( !checkSet ) { - Sizzle.error( cur || selector ); - } - - if ( toString.call(checkSet) === "[object Array]" ) { - if ( !prune ) { - results.push.apply( results, checkSet ); - - } else if ( context && context.nodeType === 1 ) { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) { - results.push( set[i] ); - } - } - - } else { - for ( i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && checkSet[i].nodeType === 1 ) { - results.push( set[i] ); - } - } - } - - } else { - makeArray( checkSet, results ); - } - - if ( extra ) { - Sizzle( extra, origContext, results, seed ); - Sizzle.uniqueSort( results ); - } - - return results; -}; - -Sizzle.uniqueSort = function( results ) { - if ( sortOrder ) { - hasDuplicate = baseHasDuplicate; - results.sort( sortOrder ); - - if ( hasDuplicate ) { - for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[ i - 1 ] ) { - results.splice( i--, 1 ); - } - } - } - } - - return results; -}; - -Sizzle.matches = function( expr, set ) { - return Sizzle( expr, null, null, set ); -}; - -Sizzle.matchesSelector = function( node, expr ) { - return Sizzle( expr, null, null, [node] ).length > 0; -}; - -Sizzle.find = function( expr, context, isXML ) { - var set, i, len, match, type, left; - - if ( !expr ) { - return []; - } - - for ( i = 0, len = Expr.order.length; i < len; i++ ) { - type = Expr.order[i]; - - if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { - left = match[1]; - match.splice( 1, 1 ); - - if ( left.substr( left.length - 1 ) !== "\\" ) { - match[1] = (match[1] || "").replace( rBackslash, "" ); - set = Expr.find[ type ]( match, context, isXML ); - - if ( set != null ) { - expr = expr.replace( Expr.match[ type ], "" ); - break; - } - } - } - } - - if ( !set ) { - set = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName( "*" ) : - []; - } - - return { set: set, expr: expr }; -}; - -Sizzle.filter = function( expr, set, inplace, not ) { - var match, anyFound, - type, found, item, filter, left, - i, pass, - old = expr, - result = [], - curLoop = set, - isXMLFilter = set && set[0] && Sizzle.isXML( set[0] ); - - while ( expr && set.length ) { - for ( type in Expr.filter ) { - if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { - filter = Expr.filter[ type ]; - left = match[1]; - - anyFound = false; - - match.splice(1,1); - - if ( left.substr( left.length - 1 ) === "\\" ) { - continue; - } - - if ( curLoop === result ) { - result = []; - } - - if ( Expr.preFilter[ type ] ) { - match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); - - if ( !match ) { - anyFound = found = true; - - } else if ( match === true ) { - continue; - } - } - - if ( match ) { - for ( i = 0; (item = curLoop[i]) != null; i++ ) { - if ( item ) { - found = filter( item, match, i, curLoop ); - pass = not ^ found; - - if ( inplace && found != null ) { - if ( pass ) { - anyFound = true; - - } else { - curLoop[i] = false; - } - - } else if ( pass ) { - result.push( item ); - anyFound = true; - } - } - } - } - - if ( found !== undefined ) { - if ( !inplace ) { - curLoop = result; - } - - expr = expr.replace( Expr.match[ type ], "" ); - - if ( !anyFound ) { - return []; - } - - break; - } - } - } - - // Improper expression - if ( expr === old ) { - if ( anyFound == null ) { - Sizzle.error( expr ); - - } else { - break; - } - } - - old = expr; - } - - return curLoop; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Utility function for retreiving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -var getText = Sizzle.getText = function( elem ) { - var i, node, - nodeType = elem.nodeType, - ret = ""; - - if ( nodeType ) { - if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent || innerText for elements - if ( typeof elem.textContent === 'string' ) { - return elem.textContent; - } else if ( typeof elem.innerText === 'string' ) { - // Replace IE's carriage returns - return elem.innerText.replace( rReturn, '' ); - } else { - // Traverse it's children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - } else { - - // If no nodeType, this is expected to be an array - for ( i = 0; (node = elem[i]); i++ ) { - // Do not traverse comment nodes - if ( node.nodeType !== 8 ) { - ret += getText( node ); - } - } - } - return ret; -}; - -var Expr = Sizzle.selectors = { - order: [ "ID", "NAME", "TAG" ], - - match: { - ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, - CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/, - NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/, - ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/, - TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/, - CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/, - POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/, - PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/ - }, - - leftMatch: {}, - - attrMap: { - "class": "className", - "for": "htmlFor" - }, - - attrHandle: { - href: function( elem ) { - return elem.getAttribute( "href" ); - }, - type: function( elem ) { - return elem.getAttribute( "type" ); - } - }, - - relative: { - "+": function(checkSet, part){ - var isPartStr = typeof part === "string", - isTag = isPartStr && !rNonWord.test( part ), - isPartStrNotTag = isPartStr && !isTag; - - if ( isTag ) { - part = part.toLowerCase(); - } - - for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { - if ( (elem = checkSet[i]) ) { - while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} - - checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? - elem || false : - elem === part; - } - } - - if ( isPartStrNotTag ) { - Sizzle.filter( part, checkSet, true ); - } - }, - - ">": function( checkSet, part ) { - var elem, - isPartStr = typeof part === "string", - i = 0, - l = checkSet.length; - - if ( isPartStr && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - - for ( ; i < l; i++ ) { - elem = checkSet[i]; - - if ( elem ) { - var parent = elem.parentNode; - checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; - } - } - - } else { - for ( ; i < l; i++ ) { - elem = checkSet[i]; - - if ( elem ) { - checkSet[i] = isPartStr ? - elem.parentNode : - elem.parentNode === part; - } - } - - if ( isPartStr ) { - Sizzle.filter( part, checkSet, true ); - } - } - }, - - "": function(checkSet, part, isXML){ - var nodeCheck, - doneName = done++, - checkFn = dirCheck; - - if ( typeof part === "string" && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - nodeCheck = part; - checkFn = dirNodeCheck; - } - - checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML ); - }, - - "~": function( checkSet, part, isXML ) { - var nodeCheck, - doneName = done++, - checkFn = dirCheck; - - if ( typeof part === "string" && !rNonWord.test( part ) ) { - part = part.toLowerCase(); - nodeCheck = part; - checkFn = dirNodeCheck; - } - - checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML ); - } - }, - - find: { - ID: function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [m] : []; - } - }, - - NAME: function( match, context ) { - if ( typeof context.getElementsByName !== "undefined" ) { - var ret = [], - results = context.getElementsByName( match[1] ); - - for ( var i = 0, l = results.length; i < l; i++ ) { - if ( results[i].getAttribute("name") === match[1] ) { - ret.push( results[i] ); - } - } - - return ret.length === 0 ? null : ret; - } - }, - - TAG: function( match, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( match[1] ); - } - } - }, - preFilter: { - CLASS: function( match, curLoop, inplace, result, not, isXML ) { - match = " " + match[1].replace( rBackslash, "" ) + " "; - - if ( isXML ) { - return match; - } - - for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { - if ( elem ) { - if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) { - if ( !inplace ) { - result.push( elem ); - } - - } else if ( inplace ) { - curLoop[i] = false; - } - } - } - - return false; - }, - - ID: function( match ) { - return match[1].replace( rBackslash, "" ); - }, - - TAG: function( match, curLoop ) { - return match[1].replace( rBackslash, "" ).toLowerCase(); - }, - - CHILD: function( match ) { - if ( match[1] === "nth" ) { - if ( !match[2] ) { - Sizzle.error( match[0] ); - } - - match[2] = match[2].replace(/^\+|\s*/g, ''); - - // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' - var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec( - match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || - !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); - - // calculate the numbers (first)n+(last) including if they are negative - match[2] = (test[1] + (test[2] || 1)) - 0; - match[3] = test[3] - 0; - } - else if ( match[2] ) { - Sizzle.error( match[0] ); - } - - // TODO: Move to normal caching system - match[0] = done++; - - return match; - }, - - ATTR: function( match, curLoop, inplace, result, not, isXML ) { - var name = match[1] = match[1].replace( rBackslash, "" ); - - if ( !isXML && Expr.attrMap[name] ) { - match[1] = Expr.attrMap[name]; - } - - // Handle if an un-quoted value was used - match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" ); - - if ( match[2] === "~=" ) { - match[4] = " " + match[4] + " "; - } - - return match; - }, - - PSEUDO: function( match, curLoop, inplace, result, not ) { - if ( match[1] === "not" ) { - // If we're dealing with a complex expression, or a simple one - if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { - match[3] = Sizzle(match[3], null, null, curLoop); - - } else { - var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); - - if ( !inplace ) { - result.push.apply( result, ret ); - } - - return false; - } - - } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { - return true; - } - - return match; - }, - - POS: function( match ) { - match.unshift( true ); - - return match; - } - }, - - filters: { - enabled: function( elem ) { - return elem.disabled === false && elem.type !== "hidden"; - }, - - disabled: function( elem ) { - return elem.disabled === true; - }, - - checked: function( elem ) { - return elem.checked === true; - }, - - selected: function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - parent: function( elem ) { - return !!elem.firstChild; - }, - - empty: function( elem ) { - return !elem.firstChild; - }, - - has: function( elem, i, match ) { - return !!Sizzle( match[3], elem ).length; - }, - - header: function( elem ) { - return (/h\d/i).test( elem.nodeName ); - }, - - text: function( elem ) { - var attr = elem.getAttribute( "type" ), type = elem.type; - // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) - // use getAttribute instead to test this case - return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null ); - }, - - radio: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type; - }, - - checkbox: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type; - }, - - file: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "file" === elem.type; - }, - - password: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "password" === elem.type; - }, - - submit: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && "submit" === elem.type; - }, - - image: function( elem ) { - return elem.nodeName.toLowerCase() === "input" && "image" === elem.type; - }, - - reset: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && "reset" === elem.type; - }, - - button: function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && "button" === elem.type || name === "button"; - }, - - input: function( elem ) { - return (/input|select|textarea|button/i).test( elem.nodeName ); - }, - - focus: function( elem ) { - return elem === elem.ownerDocument.activeElement; - } - }, - setFilters: { - first: function( elem, i ) { - return i === 0; - }, - - last: function( elem, i, match, array ) { - return i === array.length - 1; - }, - - even: function( elem, i ) { - return i % 2 === 0; - }, - - odd: function( elem, i ) { - return i % 2 === 1; - }, - - lt: function( elem, i, match ) { - return i < match[3] - 0; - }, - - gt: function( elem, i, match ) { - return i > match[3] - 0; - }, - - nth: function( elem, i, match ) { - return match[3] - 0 === i; - }, - - eq: function( elem, i, match ) { - return match[3] - 0 === i; - } - }, - filter: { - PSEUDO: function( elem, match, i, array ) { - var name = match[1], - filter = Expr.filters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - - } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; - - } else if ( name === "not" ) { - var not = match[3]; - - for ( var j = 0, l = not.length; j < l; j++ ) { - if ( not[j] === elem ) { - return false; - } - } - - return true; - - } else { - Sizzle.error( name ); - } - }, - - CHILD: function( elem, match ) { - var first, last, - doneName, parent, cache, - count, diff, - type = match[1], - node = elem; - - switch ( type ) { - case "only": - case "first": - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - - if ( type === "first" ) { - return true; - } - - node = elem; - - /* falls through */ - case "last": - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - - return true; - - case "nth": - first = match[2]; - last = match[3]; - - if ( first === 1 && last === 0 ) { - return true; - } - - doneName = match[0]; - parent = elem.parentNode; - - if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) { - count = 0; - - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { - node.nodeIndex = ++count; - } - } - - parent[ expando ] = doneName; - } - - diff = elem.nodeIndex - last; - - if ( first === 0 ) { - return diff === 0; - - } else { - return ( diff % first === 0 && diff / first >= 0 ); - } - } - }, - - ID: function( elem, match ) { - return elem.nodeType === 1 && elem.getAttribute("id") === match; - }, - - TAG: function( elem, match ) { - return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match; - }, - - CLASS: function( elem, match ) { - return (" " + (elem.className || elem.getAttribute("class")) + " ") - .indexOf( match ) > -1; - }, - - ATTR: function( elem, match ) { - var name = match[1], - result = Sizzle.attr ? - Sizzle.attr( elem, name ) : - Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ]( elem ) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute( name ), - value = result + "", - type = match[2], - check = match[4]; - - return result == null ? - type === "!=" : - !type && Sizzle.attr ? - result != null : - type === "=" ? - value === check : - type === "*=" ? - value.indexOf(check) >= 0 : - type === "~=" ? - (" " + value + " ").indexOf(check) >= 0 : - !check ? - value && result !== false : - type === "!=" ? - value !== check : - type === "^=" ? - value.indexOf(check) === 0 : - type === "$=" ? - value.substr(value.length - check.length) === check : - type === "|=" ? - value === check || value.substr(0, check.length + 1) === check + "-" : - false; - }, - - POS: function( elem, match, i, array ) { - var name = match[2], - filter = Expr.setFilters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } - } - } -}; - -var origPOS = Expr.match.POS, - fescape = function(all, num){ - return "\\" + (num - 0 + 1); - }; - -for ( var type in Expr.match ) { - Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) ); - Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) ); -} -// Expose origPOS -// "global" as in regardless of relation to brackets/parens -Expr.match.globalPOS = origPOS; - -var makeArray = function( array, results ) { - array = Array.prototype.slice.call( array, 0 ); - - if ( results ) { - results.push.apply( results, array ); - return results; - } - - return array; -}; - -// Perform a simple check to determine if the browser is capable of -// converting a NodeList to an array using builtin methods. -// Also verifies that the returned array holds DOM nodes -// (which is not the case in the Blackberry browser) -try { - Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; - -// Provide a fallback method if it does not work -} catch( e ) { - makeArray = function( array, results ) { - var i = 0, - ret = results || []; - - if ( toString.call(array) === "[object Array]" ) { - Array.prototype.push.apply( ret, array ); - - } else { - if ( typeof array.length === "number" ) { - for ( var l = array.length; i < l; i++ ) { - ret.push( array[i] ); - } - - } else { - for ( ; array[i]; i++ ) { - ret.push( array[i] ); - } - } - } - - return ret; - }; -} - -var sortOrder, siblingCheck; - -if ( document.documentElement.compareDocumentPosition ) { - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { - return a.compareDocumentPosition ? -1 : 1; - } - - return a.compareDocumentPosition(b) & 4 ? -1 : 1; - }; - -} else { - sortOrder = function( a, b ) { - // The nodes are identical, we can exit early - if ( a === b ) { - hasDuplicate = true; - return 0; - - // Fallback to using sourceIndex (in IE) if it's available on both nodes - } else if ( a.sourceIndex && b.sourceIndex ) { - return a.sourceIndex - b.sourceIndex; - } - - var al, bl, - ap = [], - bp = [], - aup = a.parentNode, - bup = b.parentNode, - cur = aup; - - // If the nodes are siblings (or identical) we can do a quick check - if ( aup === bup ) { - return siblingCheck( a, b ); - - // If no parents were found then the nodes are disconnected - } else if ( !aup ) { - return -1; - - } else if ( !bup ) { - return 1; - } - - // Otherwise they're somewhere else in the tree so we need - // to build up a full list of the parentNodes for comparison - while ( cur ) { - ap.unshift( cur ); - cur = cur.parentNode; - } - - cur = bup; - - while ( cur ) { - bp.unshift( cur ); - cur = cur.parentNode; - } - - al = ap.length; - bl = bp.length; - - // Start walking down the tree looking for a discrepancy - for ( var i = 0; i < al && i < bl; i++ ) { - if ( ap[i] !== bp[i] ) { - return siblingCheck( ap[i], bp[i] ); - } - } - - // We ended someplace up the tree so do a sibling check - return i === al ? - siblingCheck( a, bp[i], -1 ) : - siblingCheck( ap[i], b, 1 ); - }; - - siblingCheck = function( a, b, ret ) { - if ( a === b ) { - return ret; - } - - var cur = a.nextSibling; - - while ( cur ) { - if ( cur === b ) { - return -1; - } - - cur = cur.nextSibling; - } - - return 1; - }; -} - -// Check to see if the browser returns elements by name when -// querying by getElementById (and provide a workaround) -(function(){ - // We're going to inject a fake input element with a specified name - var form = document.createElement("div"), - id = "script" + (new Date()).getTime(), - root = document.documentElement; - - form.innerHTML = ""; - - // Inject it into the root element, check its status, and remove it quickly - root.insertBefore( form, root.firstChild ); - - // The workaround has to do additional checks after a getElementById - // Which slows things down for other browsers (hence the branching) - if ( document.getElementById( id ) ) { - Expr.find.ID = function( match, context, isXML ) { - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - - return m ? - m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? - [m] : - undefined : - []; - } - }; - - Expr.filter.ID = function( elem, match ) { - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); - - return elem.nodeType === 1 && node && node.nodeValue === match; - }; - } - - root.removeChild( form ); - - // release memory in IE - root = form = null; -})(); - -(function(){ - // Check to see if the browser returns only elements - // when doing getElementsByTagName("*") - - // Create a fake element - var div = document.createElement("div"); - div.appendChild( document.createComment("") ); - - // Make sure no comments are found - if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function( match, context ) { - var results = context.getElementsByTagName( match[1] ); - - // Filter out possible comments - if ( match[1] === "*" ) { - var tmp = []; - - for ( var i = 0; results[i]; i++ ) { - if ( results[i].nodeType === 1 ) { - tmp.push( results[i] ); - } - } - - results = tmp; - } - - return results; - }; - } - - // Check to see if an attribute returns normalized href attributes - div.innerHTML = ""; - - if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#" ) { - - Expr.attrHandle.href = function( elem ) { - return elem.getAttribute( "href", 2 ); - }; - } - - // release memory in IE - div = null; -})(); - -if ( document.querySelectorAll ) { - (function(){ - var oldSizzle = Sizzle, - div = document.createElement("div"), - id = "__sizzle__"; - - div.innerHTML = "

    "; - - // Safari can't handle uppercase or unicode characters when - // in quirks mode. - if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { - return; - } - - Sizzle = function( query, context, extra, seed ) { - context = context || document; - - // Only use querySelectorAll on non-XML documents - // (ID selectors don't work in non-HTML documents) - if ( !seed && !Sizzle.isXML(context) ) { - // See if we find a selector to speed up - var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query ); - - if ( match && (context.nodeType === 1 || context.nodeType === 9) ) { - // Speed-up: Sizzle("TAG") - if ( match[1] ) { - return makeArray( context.getElementsByTagName( query ), extra ); - - // Speed-up: Sizzle(".CLASS") - } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) { - return makeArray( context.getElementsByClassName( match[2] ), extra ); - } - } - - if ( context.nodeType === 9 ) { - // Speed-up: Sizzle("body") - // The body element only exists once, optimize finding it - if ( query === "body" && context.body ) { - return makeArray( [ context.body ], extra ); - - // Speed-up: Sizzle("#ID") - } else if ( match && match[3] ) { - var elem = context.getElementById( match[3] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id === match[3] ) { - return makeArray( [ elem ], extra ); - } - - } else { - return makeArray( [], extra ); - } - } - - try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(qsaError) {} - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - var oldContext = context, - old = context.getAttribute( "id" ), - nid = old || id, - hasParent = context.parentNode, - relativeHierarchySelector = /^\s*[+~]/.test( query ); - - if ( !old ) { - context.setAttribute( "id", nid ); - } else { - nid = nid.replace( /'/g, "\\$&" ); - } - if ( relativeHierarchySelector && hasParent ) { - context = context.parentNode; - } - - try { - if ( !relativeHierarchySelector || hasParent ) { - return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra ); - } - - } catch(pseudoError) { - } finally { - if ( !old ) { - oldContext.removeAttribute( "id" ); - } - } - } - } - - return oldSizzle(query, context, extra, seed); - }; - - for ( var prop in oldSizzle ) { - Sizzle[ prop ] = oldSizzle[ prop ]; - } - - // release memory in IE - div = null; - })(); -} - -(function(){ - var html = document.documentElement, - matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector; - - if ( matches ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9 fails this) - var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ), - pseudoWorks = false; - - try { - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( document.documentElement, "[test!='']:sizzle" ); - - } catch( pseudoError ) { - pseudoWorks = true; - } - - Sizzle.matchesSelector = function( node, expr ) { - // Make sure that attribute selectors are quoted - expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']"); - - if ( !Sizzle.isXML( node ) ) { - try { - if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) { - var ret = matches.call( node, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || !disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9, so check for that - node.document && node.document.nodeType !== 11 ) { - return ret; - } - } - } catch(e) {} - } - - return Sizzle(expr, null, null, [node]).length > 0; - }; - } -})(); - -(function(){ - var div = document.createElement("div"); - - div.innerHTML = "
    "; - - // Opera can't find a second classname (in 9.6) - // Also, make sure that getElementsByClassName actually exists - if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { - return; - } - - // Safari caches class attributes, doesn't catch changes (in 3.2) - div.lastChild.className = "e"; - - if ( div.getElementsByClassName("e").length === 1 ) { - return; - } - - Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function( match, context, isXML ) { - if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { - return context.getElementsByClassName(match[1]); - } - }; - - // release memory in IE - div = null; -})(); - -function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - - if ( elem ) { - var match = false; - - elem = elem[dir]; - - while ( elem ) { - if ( elem[ expando ] === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 && !isXML ){ - elem[ expando ] = doneName; - elem.sizset = i; - } - - if ( elem.nodeName.toLowerCase() === cur ) { - match = elem; - break; - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - - if ( elem ) { - var match = false; - - elem = elem[dir]; - - while ( elem ) { - if ( elem[ expando ] === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 ) { - if ( !isXML ) { - elem[ expando ] = doneName; - elem.sizset = i; - } - - if ( typeof cur !== "string" ) { - if ( elem === cur ) { - match = true; - break; - } - - } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { - match = elem; - break; - } - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -if ( document.documentElement.contains ) { - Sizzle.contains = function( a, b ) { - return a !== b && (a.contains ? a.contains(b) : true); - }; - -} else if ( document.documentElement.compareDocumentPosition ) { - Sizzle.contains = function( a, b ) { - return !!(a.compareDocumentPosition(b) & 16); - }; - -} else { - Sizzle.contains = function() { - return false; - }; -} - -Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; - - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -var posProcess = function( selector, context, seed ) { - var match, - tmpSet = [], - later = "", - root = context.nodeType ? [context] : context; - - // Position selectors must be done after the filter - // And so must :not(positional) so we move all PSEUDOs to the end - while ( (match = Expr.match.PSEUDO.exec( selector )) ) { - later += match[0]; - selector = selector.replace( Expr.match.PSEUDO, "" ); - } - - selector = Expr.relative[selector] ? selector + "*" : selector; - - for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet, seed ); - } - - return Sizzle.filter( later, tmpSet ); -}; - -// EXPOSE -// Override sizzle attribute retrieval -Sizzle.attr = jQuery.attr; -Sizzle.selectors.attrMap = {}; -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.filters; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - -})(); - - -var runtil = /Until$/, - rparentsprev = /^(?:parents|prevUntil|prevAll)/, - // Note: This RegExp should be improved, or likely pulled from Sizzle - rmultiselector = /,/, - isSimple = /^.[^:#\[\.,]*$/, - slice = Array.prototype.slice, - POS = jQuery.expr.match.globalPOS, - // methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.fn.extend({ - find: function( selector ) { - var self = this, - i, l; - - if ( typeof selector !== "string" ) { - return jQuery( selector ).filter(function() { - for ( i = 0, l = self.length; i < l; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - }); - } - - var ret = this.pushStack( "", "find", selector ), - length, n, r; - - for ( i = 0, l = this.length; i < l; i++ ) { - length = ret.length; - jQuery.find( selector, this[i], ret ); - - if ( i > 0 ) { - // Make sure that the results are unique - for ( n = length; n < ret.length; n++ ) { - for ( r = 0; r < length; r++ ) { - if ( ret[r] === ret[n] ) { - ret.splice(n--, 1); - break; - } - } - } - } - } - - return ret; - }, - - has: function( target ) { - var targets = jQuery( target ); - return this.filter(function() { - for ( var i = 0, l = targets.length; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - not: function( selector ) { - return this.pushStack( winnow(this, selector, false), "not", selector); - }, - - filter: function( selector ) { - return this.pushStack( winnow(this, selector, true), "filter", selector ); - }, - - is: function( selector ) { - return !!selector && ( - typeof selector === "string" ? - // If this is a positional selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - POS.test( selector ) ? - jQuery( selector, this.context ).index( this[0] ) >= 0 : - jQuery.filter( selector, this ).length > 0 : - this.filter( selector ).length > 0 ); - }, - - closest: function( selectors, context ) { - var ret = [], i, l, cur = this[0]; - - // Array (deprecated as of jQuery 1.7) - if ( jQuery.isArray( selectors ) ) { - var level = 1; - - while ( cur && cur.ownerDocument && cur !== context ) { - for ( i = 0; i < selectors.length; i++ ) { - - if ( jQuery( cur ).is( selectors[ i ] ) ) { - ret.push({ selector: selectors[ i ], elem: cur, level: level }); - } - } - - cur = cur.parentNode; - level++; - } - - return ret; - } - - // String - var pos = POS.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( i = 0, l = this.length; i < l; i++ ) { - cur = this[i]; - - while ( cur ) { - if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { - ret.push( cur ); - break; - - } else { - cur = cur.parentNode; - if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) { - break; - } - } - } - } - - ret = ret.length > 1 ? jQuery.unique( ret ) : ret; - - return this.pushStack( ret, "closest", selectors ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; - } - - // index in selector - if ( typeof elem === "string" ) { - return jQuery.inArray( this[0], jQuery( elem ) ); - } - - // Locate the position of the desired element - return jQuery.inArray( - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem, this ); - }, - - add: function( selector, context ) { - var set = typeof selector === "string" ? - jQuery( selector, context ) : - jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), - all = jQuery.merge( this.get(), set ); - - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? - all : - jQuery.unique( all ) ); - }, - - andSelf: function() { - return this.add( this.prevObject ); - } -}); - -// A painfully simple check to see if an element is disconnected -// from a document (should be improved, where feasible). -function isDisconnected( node ) { - return !node || !node.parentNode || node.parentNode.nodeType === 11; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return jQuery.nth( elem, 2, "nextSibling" ); - }, - prev: function( elem ) { - return jQuery.nth( elem, 2, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? - elem.contentDocument || elem.contentWindow.document : - jQuery.makeArray( elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ); - - if ( !runtil.test( name ) ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); - } - - ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret; - - if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { - ret = ret.reverse(); - } - - return this.pushStack( ret, name, slice.call( arguments ).join(",") ); - }; -}); - -jQuery.extend({ - filter: function( expr, elems, not ) { - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 ? - jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : - jQuery.find.matches(expr, elems); - }, - - dir: function( elem, dir, until ) { - var matched = [], - cur = elem[ dir ]; - - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { - if ( cur.nodeType === 1 ) { - matched.push( cur ); - } - cur = cur[dir]; - } - return matched; - }, - - nth: function( cur, result, dir, elem ) { - result = result || 1; - var num = 0; - - for ( ; cur; cur = cur[dir] ) { - if ( cur.nodeType === 1 && ++num === result ) { - break; - } - } - - return cur; - }, - - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - r.push( n ); - } - } - - return r; - } -}); - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, keep ) { - - // Can't pass null or undefined to indexOf in Firefox 4 - // Set to 0 to skip string check - qualifier = qualifier || 0; - - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - var retVal = !!qualifier.call( elem, i, elem ); - return retVal === keep; - }); - - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { - return ( elem === qualifier ) === keep; - }); - - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { - return elem.nodeType === 1; - }); - - if ( isSimple.test( qualifier ) ) { - return jQuery.filter(qualifier, filtered, !keep); - } else { - qualifier = jQuery.filter( qualifier, filtered ); - } - } - - return jQuery.grep(elements, function( elem, i ) { - return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep; - }); -} - - - - -function createSafeFragment( document ) { - var list = nodeNames.split( "|" ), - safeFrag = document.createDocumentFragment(); - - if ( safeFrag.createElement ) { - while ( list.length ) { - safeFrag.createElement( - list.pop() - ); - } - } - return safeFrag; -} - -var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + - "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", - rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, - rleadingWhitespace = /^\s+/, - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, - rtagName = /<([\w:]+)/, - rtbody = /]", "i"), - // checked="checked" or checked - rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, - rscriptType = /\/(java|ecma)script/i, - rcleanScript = /^\s*", "" ], - legend: [ 1, "
    ", "
    " ], - thead: [ 1, "", "
    " ], - tr: [ 2, "", "
    " ], - td: [ 3, "", "
    " ], - col: [ 2, "", "
    " ], - area: [ 1, "", "" ], - _default: [ 0, "", "" ] - }, - safeFragment = createSafeFragment( document ); - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// IE can't serialize and - - - - - @Model.CurrentPage.MetaTitle - @if (Model.CurrentPage.MetaKeywords != null && Model.CurrentPage.MetaKeywords.Length > 0) - { - - } - @if (!string.IsNullOrWhiteSpace(Model.CurrentPage.MetaDescription)) - { - - } - - @Html.CanonicalLink() - @Html.AlternateLinks() - @Styles.Render("~/bundles/css") - @Scripts.Render("~/bundles/js") - @Html.RequiredClientResources("Header") @*Enable components to require resources. For an example, see the view for VideoBlock.*@ - @Html.RenderEPiServerQuickNavigator() - - - - - @if (Model.Layout.IsInReadonlyMode) - { - Html.RenderPartial("Readonly", Model); - } - @Html.FullRefreshPropertiesMetaData() -
    - @if(!Model.Layout.HideHeader) - { - Html.RenderPartial("Header", Model); - } - @RenderBody() - @if(!Model.Layout.HideFooter) - { - Html.RenderPartial("Footer", Model); - } -
    - @Html.RequiredClientResources("Footer") - - diff --git a/src/DemoSite461/Views/Shared/Layouts/_TwoPlusOne.cshtml b/src/DemoSite461/Views/Shared/Layouts/_TwoPlusOne.cshtml deleted file mode 100644 index 842b6b4..0000000 --- a/src/DemoSite461/Views/Shared/Layouts/_TwoPlusOne.cshtml +++ /dev/null @@ -1,23 +0,0 @@ -@using DemoSite -@model IPageViewModel -@{ Layout = "~/Views/Shared/Layouts/_Root.cshtml"; } - -@{Html.RenderPartial("Breadcrumbs");} - -
    - -
    - @RenderBody() -
    - -
    - @if (IsSectionDefined("RelatedContent")) - { - @RenderSection("RelatedContent") - } - else if (Model.CurrentPage is IHasRelatedContent) - { - @Html.PropertyFor(x => ((IHasRelatedContent)x.CurrentPage).RelatedContentArea, new { CssClass = "row", Tag = Global.ContentAreaTags.OneThirdWidth }) - } -
    -
    diff --git a/src/DemoSite461/Views/Shared/PagePartials/ContactPage.cshtml b/src/DemoSite461/Views/Shared/PagePartials/ContactPage.cshtml deleted file mode 100644 index 965a30f..0000000 --- a/src/DemoSite461/Views/Shared/PagePartials/ContactPage.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@model ContactPage - -
    - -

    @Model.PageName

    -

    @Model.TeaserText

    -

    - @Html.Translate("/contact/email"): @Html.DisplayFor(x => x.Email)
    - @Html.Translate("/contact/phone"): @Model.Phone -

    -
    diff --git a/src/DemoSite461/Views/Shared/PagePartials/ContactPageWide.cshtml b/src/DemoSite461/Views/Shared/PagePartials/ContactPageWide.cshtml deleted file mode 100644 index 1e02640..0000000 --- a/src/DemoSite461/Views/Shared/PagePartials/ContactPageWide.cshtml +++ /dev/null @@ -1,14 +0,0 @@ -@model ContactPage -
    -
    -
    - -
    -

    @Model.PageName

    -

    @Model.TeaserText

    -

    - @Html.Translate("/contact/email"): @Html.DisplayFor(x => x.Email)
    - @Html.Translate("/contact/phone"): @Model.Phone -

    -
    -
    diff --git a/src/DemoSite461/Views/Shared/PagePartials/Page.cshtml b/src/DemoSite461/Views/Shared/PagePartials/Page.cshtml deleted file mode 100644 index 24c3e48..0000000 --- a/src/DemoSite461/Views/Shared/PagePartials/Page.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@using EPiServer.Core -@model SitePageData - -
    - @using(Html.BeginConditionalLink(Model.HasTemplate(), Url.PageLinkUrl(Model), Model.PageName)) - { -

    @Model.PageName

    -

    @Model.TeaserText

    - @Html.DisplayFor(m => m.PageImage) - } -
    diff --git a/src/DemoSite461/Views/Shared/PagePartials/PageWide.cshtml b/src/DemoSite461/Views/Shared/PagePartials/PageWide.cshtml deleted file mode 100644 index da8b3e7..0000000 --- a/src/DemoSite461/Views/Shared/PagePartials/PageWide.cshtml +++ /dev/null @@ -1,14 +0,0 @@ -@using EPiServer.Core -@model SitePageData -
    - @using(Html.BeginConditionalLink(Model.HasTemplate(), Url.PageLinkUrl(Model), Model.PageName)) - { -
    -
    - @Html.DisplayFor(m => m.PageImage) -
    -

    @Model.PageName

    -

    @Model.TeaserText

    -
    - } -
    diff --git a/src/DemoSite461/Views/Shared/Readonly.cshtml b/src/DemoSite461/Views/Shared/Readonly.cshtml deleted file mode 100644 index 776681d..0000000 --- a/src/DemoSite461/Views/Shared/Readonly.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@model IPageViewModel - -
    diff --git a/src/DemoSite461/Views/Shared/SubNavigation.cshtml b/src/DemoSite461/Views/Shared/SubNavigation.cshtml deleted file mode 100644 index 29cebb2..0000000 --- a/src/DemoSite461/Views/Shared/SubNavigation.cshtml +++ /dev/null @@ -1,30 +0,0 @@ -@model IPageViewModel - -@helper ItemTemplate(HtmlHelpers.MenuItem firstLevelItem) { -
    - - @firstLevelItem.Page.PageName - - -
    -
    -
      - @Html.MenuList(firstLevelItem.Page.ContentLink, SubLevelItemTemplate) -
    -
    -} - -@helper SubLevelItemTemplate(HtmlHelpers.MenuItem subLevelItem) { -
  • - @Html.PageLink(subLevelItem.Page) - @*To show more levels call Html.MenuList recursively here if subLevelItem.Selected == true*@ -
    • -} - -
    -
    - @if(Model.Section != null) { - @Html.MenuList(Model.Section.ContentLink, ItemTemplate) - } -
    -
    diff --git a/src/DemoSite461/Views/Shared/TemplateError.cshtml b/src/DemoSite461/Views/Shared/TemplateError.cshtml deleted file mode 100644 index 2ba1cb8..0000000 --- a/src/DemoSite461/Views/Shared/TemplateError.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@model ContentRenderingErrorModel -
    -

    @string.Format(Html.Translate("/renderingerror/heading"), Model.ContentTypeName, Model.ContentName)

    -

    - @Model.Exception.Message
    - @Model.Exception.StackTrace -

    -
    diff --git a/src/DemoSite461/Views/Shared/TemplateHint.cshtml b/src/DemoSite461/Views/Shared/TemplateHint.cshtml deleted file mode 100644 index 9c77c3e..0000000 --- a/src/DemoSite461/Views/Shared/TemplateHint.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@model string -

    @Model

    diff --git a/src/DemoSite461/Views/StandardPage/Index.cshtml b/src/DemoSite461/Views/StandardPage/Index.cshtml deleted file mode 100644 index b3a1951..0000000 --- a/src/DemoSite461/Views/StandardPage/Index.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@using DemoSite -@model PageViewModel - -@{ Layout = "~/Views/Shared/Layouts/_LeftNavigation.cshtml"; } - -

    x.CurrentPage.PageName)>@Model.CurrentPage.PageName

    -

    x.CurrentPage.MetaDescription)>@Model.CurrentPage.MetaDescription

    -
    -
    x.CurrentPage.MainBody)> - @Html.DisplayFor(m => m.CurrentPage.MainBody) -
    -
    -@Html.PropertyFor(x => x.CurrentPage.MainContentArea, new { CssClass = "row", Tag = Global.ContentAreaTags.TwoThirdsWidth }) diff --git a/src/DemoSite461/Views/StartPage/Index.cshtml b/src/DemoSite461/Views/StartPage/Index.cshtml deleted file mode 100644 index 105201e..0000000 --- a/src/DemoSite461/Views/StartPage/Index.cshtml +++ /dev/null @@ -1,4 +0,0 @@ -@using DemoSite -@model PageViewModel - -@Html.PropertyFor(x => x.CurrentPage.MainContentArea, new { CssClass = "row equal-height", tag = Global.ContentAreaTags.FullWidth }) diff --git a/src/DemoSite461/Views/VideoFile/Index.cshtml b/src/DemoSite461/Views/VideoFile/Index.cshtml deleted file mode 100644 index e1012e5..0000000 --- a/src/DemoSite461/Views/VideoFile/Index.cshtml +++ /dev/null @@ -1,30 +0,0 @@ -@using EPiServer.Framework.Web.Resources -@model VideoViewModel -@{ - ClientResources.RequireScript(Href("~/static/jwplayer/jwplayer.js")); - - //The video element's ID needs to be unique in order for several video blocks and possible the same video block, to work on the same page - var containerId = "video-container-" + Guid.NewGuid().GetHashCode(); -} -@Html.FullRefreshPropertiesMetaData(new []{"Url"}) -
    m.Url)> -
    -
    -
    - - -
    diff --git a/src/DemoSite461/Views/Web.config b/src/DemoSite461/Views/Web.config deleted file mode 100644 index 8a11630..0000000 --- a/src/DemoSite461/Views/Web.config +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/DemoSite461/Views/_viewstart.cshtml b/src/DemoSite461/Views/_viewstart.cshtml deleted file mode 100644 index b908ea4..0000000 --- a/src/DemoSite461/Views/_viewstart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "~/Views/Shared/Layouts/_Root.cshtml"; -} diff --git a/src/DemoSite461/Web.Debug.config b/src/DemoSite461/Web.Debug.config deleted file mode 100644 index fae9cfe..0000000 --- a/src/DemoSite461/Web.Debug.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/Web.Release.config b/src/DemoSite461/Web.Release.config deleted file mode 100644 index da6e960..0000000 --- a/src/DemoSite461/Web.Release.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/Web.config b/src/DemoSite461/Web.config deleted file mode 100644 index c0b102e..0000000 --- a/src/DemoSite461/Web.config +++ /dev/null @@ -1,472 +0,0 @@ - - - - -
    -
    -
    -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/favicon.ico b/src/DemoSite461/favicon.ico deleted file mode 100644 index 89081db..0000000 Binary files a/src/DemoSite461/favicon.ico and /dev/null differ diff --git a/src/DemoSite461/module.config b/src/DemoSite461/module.config deleted file mode 100644 index f0400eb..0000000 --- a/src/DemoSite461/module.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/DemoSite461/modules/_protected/CMS/CMS.zip b/src/DemoSite461/modules/_protected/CMS/CMS.zip deleted file mode 100644 index a3c16d5..0000000 Binary files a/src/DemoSite461/modules/_protected/CMS/CMS.zip and /dev/null differ diff --git a/src/DemoSite461/modules/_protected/CMS/web.config b/src/DemoSite461/modules/_protected/CMS/web.config deleted file mode 100644 index 93a9bf3..0000000 --- a/src/DemoSite461/modules/_protected/CMS/web.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/modules/_protected/EPiServer.Cms.TinyMce/EPiServer.Cms.TinyMce.zip b/src/DemoSite461/modules/_protected/EPiServer.Cms.TinyMce/EPiServer.Cms.TinyMce.zip deleted file mode 100644 index 12d9e03..0000000 Binary files a/src/DemoSite461/modules/_protected/EPiServer.Cms.TinyMce/EPiServer.Cms.TinyMce.zip and /dev/null differ diff --git a/src/DemoSite461/modules/_protected/EPiServer.Cms.TinyMce/web.config b/src/DemoSite461/modules/_protected/EPiServer.Cms.TinyMce/web.config deleted file mode 100644 index 2fd0803..0000000 --- a/src/DemoSite461/modules/_protected/EPiServer.Cms.TinyMce/web.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/DemoSite461/modules/_protected/EPiServer.Search.Cms/IndexContent.aspx b/src/DemoSite461/modules/_protected/EPiServer.Search.Cms/IndexContent.aspx deleted file mode 100644 index 00ca626..0000000 --- a/src/DemoSite461/modules/_protected/EPiServer.Search.Cms/IndexContent.aspx +++ /dev/null @@ -1,15 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="false" CodeBehind="IndexContent.aspx.cs" Inherits="EPiServer.UI.Admin.IndexContent" Title="Index Content" %> - - -
    -

    <%: Translate("/admin/indexcontent/latestindexing") %> - -

    - -
    - <%: Translate("/admin/indexcontent/resetinfo") %> -
    - -
    -
    -     diff --git a/src/DemoSite461/modules/_protected/EPiServer.Search.Cms/module.config b/src/DemoSite461/modules/_protected/EPiServer.Search.Cms/module.config deleted file mode 100644 index 7585a6c..0000000 --- a/src/DemoSite461/modules/_protected/EPiServer.Search.Cms/module.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/modules/_protected/Shell/Shell.zip b/src/DemoSite461/modules/_protected/Shell/Shell.zip deleted file mode 100644 index c01a830..0000000 Binary files a/src/DemoSite461/modules/_protected/Shell/Shell.zip and /dev/null differ diff --git a/src/DemoSite461/modules/_protected/Shell/web.config b/src/DemoSite461/modules/_protected/Shell/web.config deleted file mode 100644 index 93a9bf3..0000000 --- a/src/DemoSite461/modules/_protected/Shell/web.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/nuget.config b/src/DemoSite461/nuget.config deleted file mode 100644 index 3c5b809..0000000 --- a/src/DemoSite461/nuget.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/DemoSite461/packages.config b/src/DemoSite461/packages.config deleted file mode 100644 index fe731b6..0000000 --- a/src/DemoSite461/packages.config +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Configuration/OdpEndpoint.cs b/src/UNRVLD.ODP.VisitorGroups/Configuration/OdpEndpoint.cs new file mode 100644 index 0000000..2455947 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Configuration/OdpEndpoint.cs @@ -0,0 +1,21 @@ +namespace UNRVLD.ODP.VisitorGroups.Configuration +{ + public class OdpEndpoint + { + + public OdpEndpoint() + { + Name = "Default"; + BaseEndPoint = "https://api.zaius.com"; + PrivateApiKey = "key-lives-here"; + } + + public string Name { get; set; } + public string BaseEndPoint { get; set; } + public string PrivateApiKey { get; set; } + + public bool IsConfigured => !(string.IsNullOrEmpty(Name) || + string.IsNullOrEmpty(BaseEndPoint) || + string.IsNullOrEmpty(PrivateApiKey)); + } +} diff --git a/src/UNRVLD.ODP.VisitorGroups/OdpVisitorGroupOptions.cs b/src/UNRVLD.ODP.VisitorGroups/Configuration/OdpVisitorGroupOptions.cs similarity index 60% rename from src/UNRVLD.ODP.VisitorGroups/OdpVisitorGroupOptions.cs rename to src/UNRVLD.ODP.VisitorGroups/Configuration/OdpVisitorGroupOptions.cs index 85d8cc5..bf3dcef 100644 --- a/src/UNRVLD.ODP.VisitorGroups/OdpVisitorGroupOptions.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Configuration/OdpVisitorGroupOptions.cs @@ -1,6 +1,8 @@ -using EPiServer.ServiceLocation; +using System.Collections.Generic; +using System.Linq; +using EPiServer.ServiceLocation; -namespace UNRVLD.ODP +namespace UNRVLD.ODP.VisitorGroups.Configuration { /// /// Options class to set defaults but also allow these to be overridden in code/appsettings as needed. @@ -13,8 +15,19 @@ namespace UNRVLD.ODP /// "OdpVisitorGroupOptions": { /// "OdpCookieName": "vuid", /// "CacheTimeoutSeconds": 10, - /// "BaseEndPoint": "https:///api.zaius.com", - /// "PrivateApiKey": "key-lives-here" + /// "SchemaCacheTimeoutSeconds": 86400, + /// "PopulationEstimateCacheTimeoutSeconds": 4320, + /// "OdpEndpoints": [ + /// { + /// "Name": "US", + /// "BaseEndPoint": "https:///api.zaius.com", + /// "PrivateApiKey": "key-lives-here" + /// }, + /// { + /// "Name": "EU", + /// "BaseEndPoint": "https:///api.zaius.eu", + /// "PrivateApiKey": "key-lives-here" + /// }] /// } /// } ///} @@ -26,7 +39,7 @@ public OdpVisitorGroupOptions() { OdpCookieName = "vuid"; CacheTimeoutSeconds = 1; - BaseEndPoint = "https://api.zaius.com"; + OdpEndpoints = []; SchemaCacheTimeoutSeconds = 86400; PopulationEstimateCacheTimeoutSeconds = 4320; } @@ -41,11 +54,11 @@ public OdpVisitorGroupOptions() /// /// The private API key to access the ODP Api /// - public string PrivateApiKey { get; set; } + //public string PrivateApiKey { get; set; } /// /// API endpoint base, can vary by region ODP is deployed into /// - public string BaseEndPoint { get; set; } + //public string BaseEndPoint { get; set; } /// /// The length of time to cache schema responses for, can be relatively long lived and defaults to 24 hours /// @@ -55,8 +68,16 @@ public OdpVisitorGroupOptions() /// public int PopulationEstimateCacheTimeoutSeconds { get; set; } + public List OdpEndpoints { get; set; } + public bool IsConfigured => !(string.IsNullOrEmpty(OdpCookieName) || - string.IsNullOrEmpty(BaseEndPoint) || - string.IsNullOrEmpty(PrivateApiKey)); + (OdpEndpoints?.Any(x => !x.IsConfigured) ?? false)); + + public bool HasMultipleEndpoints => OdpEndpoints?.Count > 1; + + public OdpEndpoint? GetEndpoint(string? name) + { + return name is null ? OdpEndpoints.FirstOrDefault() : OdpEndpoints?.FirstOrDefault(x => x.Name == name); + } } } diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/AudienceCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/AudienceCriterion.cs deleted file mode 100644 index 0bc6862..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/AudienceCriterion.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System; -using EPiServer.Personalization.VisitorGroups; -using UNRVLD.ODP.VisitorGroups.GraphQL; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET472_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - -using System.Security.Principal; -using EPiServer.Framework.Cache; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; -using UNRVLD.ODP.VisitorGroups.GraphQL.Models; -using System.Linq; - -namespace UNRVLD.ODP.VisitorGroups.Criteria -{ - [VisitorGroupCriterion( - Category = "Data platform", - Description = "Matches the user to a specific segment", - DisplayName = "Is In Segment" - )] - public class AudienceCriterion : OdpCriterionBase - { - private readonly IGraphQLClient _graphQlClient; - private readonly OdpVisitorGroupOptions _optionValues; - private readonly ISynchronizedObjectInstanceCache _cache; - -#if NET5_0_OR_GREATER - public AudienceCriterion(IGraphQLClient graphQlClient, - OdpVisitorGroupOptions optionValues, - ISynchronizedObjectInstanceCache cache, - IODPUserProfile odpUserProfile) - : base(odpUserProfile) - { - _graphQlClient = graphQlClient; - _optionValues = optionValues; - _cache = cache; - } -#elif NET472_OR_GREATER - public AudienceCriterion() - { - _graphQlClient = ServiceLocator.Current.GetInstance(); - _optionValues = ServiceLocator.Current.GetInstance(); - _cache = ServiceLocator.Current.GetInstance(); - OdpUserProfile = ServiceLocator.Current.GetInstance(); - } -#endif - protected override bool IsMatchInner(IPrincipal principal, string vuidValue) - { - try - { - if (_optionValues.IsConfigured == false) - { - return false; - } - - if (!string.IsNullOrEmpty(vuidValue)) - { - return IsInAudience(vuidValue, Model.Audience); - } - } - catch - { - return false; - } - return false; - } - private bool IsInAudience(string vuidValue, string audience) - { - try - { - var cacheKey = $"odp_rts_{vuidValue}_{audience}"; - var cachedResult = _cache.Get(cacheKey); - if (cachedResult != null) - { - return (bool)cachedResult; - } - - var query = $@"query MyQuery {{ - customer(vuid: ""{vuidValue}"") {{ - audiences (subset: [""{audience}""]) {{ - edges {{ - node {{ - name - }} - }} - }} - }} - }}"; - - var result = _graphQlClient.Query(query).Result; - var isInAudience = result.Customer.Response.EdgeItems?.Any() ?? false; - - // Use a micro cache approach to improve performance if the same VG is used multiple times on a page - _cache.Insert( - cacheKey, - isInAudience, - new CacheEvictionPolicy(new TimeSpan(0, 0, 0, _optionValues.CacheTimeoutSeconds), CacheTimeoutType.Absolute)); - - return isInAudience; - } - catch - { - return false; - } - } - } -} diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienceSizeCachePopulator.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/AudienceSizeCachePopulator.cs similarity index 64% rename from src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienceSizeCachePopulator.cs rename to src/UNRVLD.ODP.VisitorGroups/Criteria/AudienceSizeCachePopulator.cs index 558ac1b..7c8aaf6 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienceSizeCachePopulator.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/AudienceSizeCachePopulator.cs @@ -1,45 +1,39 @@ using System; using System.Collections.Generic; using System.Linq; -using IGraphQLClient = UNRVLD.ODP.VisitorGroups.GraphQL.IGraphQLClient; using Newtonsoft.Json; using UNRVLD.ODP.VisitorGroups.GraphQL.Models; -using UNRVLD.ODP.VisitorGroups.GraphQL.Models.AudienceCount; using Audience = UNRVLD.ODP.VisitorGroups.GraphQL.Models.Audience; using EPiServer.Framework.Cache; using System.Threading.Tasks; +using UNRVLD.ODP.VisitorGroups.GraphQL; +using UNRVLD.ODP.VisitorGroups.Configuration; +using Microsoft.Extensions.Logging; -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models +namespace UNRVLD.ODP.VisitorGroups.Criteria { /// public class AudienceSizeCachePopulator : IAudienceSizeCachePopulator { - private readonly IGraphQLClient _client; + private readonly IGraphQLClientFactory _clientFactory; + private readonly ILogger _logger; private readonly ISynchronizedObjectInstanceCache _cache; private readonly OdpVisitorGroupOptions _options; private string cacheKey = "OdpVisitorGroups_AudienceList_"; - public AudienceSizeCachePopulator(IGraphQLClient client, ISynchronizedObjectInstanceCache cache, OdpVisitorGroupOptions options) + public AudienceSizeCachePopulator( + IGraphQLClientFactory clientFactory, + ILogger logger, + ISynchronizedObjectInstanceCache cache, + OdpVisitorGroupOptions options) { - _client = client; + _clientFactory = clientFactory; + _logger = logger; _cache = cache; _options = options; } - public void PopulateCacheItem(Audience Audience) - { - try - { - var countQuery = GetAllCountsQuery(new List { Audience }); - var countResult = _client.Query(countQuery).Result; - var countObject = JsonConvert.DeserializeObject(countResult[Audience.Name].ToString()); - - _cache.Insert(cacheKey + Audience.Name, countObject, new CacheEvictionPolicy(new TimeSpan(0, 0, _options.PopulationEstimateCacheTimeoutSeconds), CacheTimeoutType.Absolute)); - } - catch { } - } - - public async Task PopulateEntireCache(bool ForceRefresh) + public async Task PopulateEntireCache(OdpEndpoint endPoint, bool ForceRefresh) { var query = @"query MyQuery { audiences { @@ -54,11 +48,18 @@ public async Task PopulateEntireCache(bool ForceRefresh) try { - var result = await _client.Query(query); - var orderedResult = result.Items.OrderBy(x => x.Description); + var client = _clientFactory.Get(endPoint); + if (client == null) + { + return; + } + + var result = await client.Query(query); + var orderedResult = result?.Items.OrderBy(x => x.Description) ?? Enumerable.Empty(); var skip = 0; var pageSize = 10; + while (orderedResult.Skip(skip).Take(pageSize).ToList().Count > 0) { var currentPageOfAudiences = orderedResult.Skip(skip).Take(pageSize).ToList(); @@ -74,27 +75,19 @@ public async Task PopulateEntireCache(bool ForceRefresh) } var countQuery = GetAllCountsQuery(currentPageOfAudiences); - var countResult = _client.Query(countQuery).Result; + var countResult = client.Query(countQuery).Result; var loopCount = 0; - foreach (var audienceCount in countResult) + foreach (var audienceCount in countResult ?? Enumerable.Empty()) { var audience = orderedResult.Skip(skip + loopCount).Take(1).First(); - var countObject = JsonConvert.DeserializeObject((countResult[audience.Name].ToString())); + var countObject = JsonConvert.DeserializeObject(countResult?[audience.Name].ToString()); -#if NET5_0_OR_GREATER _cache.Insert( - cacheKey + audience.Name, + $"{cacheKey}-{endPoint.Name}-{audience.Name}", countObject, new CacheEvictionPolicy(new TimeSpan(0, 0, 0, _options.PopulationEstimateCacheTimeoutSeconds), CacheTimeoutType.Absolute)); -#elif NET461_OR_GREATER - // Strange behaviour in .net Framework, where it thinks the Insert method - // doesn't exist so accessing the ObjectInstanceCache directly to resolve - _cache.ObjectInstanceCache.Insert( - cacheKey + audience.Name, - countObject, - new CacheEvictionPolicy(new TimeSpan(0, 0, 0, _options.PopulationEstimateCacheTimeoutSeconds), CacheTimeoutType.Absolute)); -#endif + loopCount++; } @@ -102,7 +95,9 @@ public async Task PopulateEntireCache(bool ForceRefresh) skip += pageSize; } } - catch (Exception) { } + catch (Exception ex) { + _logger.LogError(ex, "Error populating audience size"); + } } private bool CheckCacheHit(IList CurrentPageOfAudiences, int PageSize) diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/AudienceCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/AudienceCriterion.cs new file mode 100644 index 0000000..7680e6f --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/AudienceCriterion.cs @@ -0,0 +1,50 @@ +using EPiServer.Personalization.VisitorGroups; +using UNRVLD.ODP.VisitorGroups.GraphQL; + +using System.Security.Principal; +using EPiServer.Framework.Cache; +using UNRVLD.ODP.VisitorGroups.Criteria.Models; +using UNRVLD.ODP.VisitorGroups.Configuration; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion +{ + [VisitorGroupCriterion( + Category = "Data platform", + Description = "Matches the user to a specific segment", + DisplayName = "Is In Segment" + )] + public class AudienceCriterion(IGraphQLClientFactory graphQLClientFactory, + OdpVisitorGroupOptions optionValues, + ISynchronizedObjectInstanceCache cache, + IODPUserProfile odpUserProfile, + ICustomerDataRetriever customerDataRetriever, + IPrefixer prefixer) : OdpCriterionBase(optionValues, odpUserProfile) + { + private readonly IGraphQLClientFactory _graphQLClientFactory = graphQLClientFactory; + private readonly ISynchronizedObjectInstanceCache _cache = cache; + private readonly ICustomerDataRetriever _customerDataRetriever = customerDataRetriever; + private readonly IPrefixer _prefixer = prefixer; + + protected override bool IsMatchInner(IPrincipal principal, string vuidValue) + { + try + { + if (OptionValues.HasMultipleEndpoints) + { + var splitPrefix = _prefixer.SplitPrefix(Model.Audience); + + return _customerDataRetriever.IsInAudience(vuidValue, splitPrefix.value, splitPrefix.prefix); + } + else + { + return _customerDataRetriever.IsInAudience(vuidValue, Model.Audience); + } + } + catch + { + return false; + } + } + + } +} diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerPropertyNumberCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/CustomerPropertyNumberCriterion.cs similarity index 52% rename from src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerPropertyNumberCriterion.cs rename to src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/CustomerPropertyNumberCriterion.cs index 64bbf9e..be86698 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerPropertyNumberCriterion.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/CustomerPropertyNumberCriterion.cs @@ -3,15 +3,9 @@ using System.Security.Principal; using Newtonsoft.Json.Linq; using UNRVLD.ODP.VisitorGroups.Criteria.Models; +using UNRVLD.ODP.VisitorGroups.Configuration; -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - -namespace UNRVLD.ODP.VisitorGroups.Criteria +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion { [VisitorGroupCriterion( Category = "Data platform", @@ -20,59 +14,44 @@ namespace UNRVLD.ODP.VisitorGroups.Criteria )] public class CustomerPropertyNumberCriterion : OdpCriterionBase { - private readonly OdpVisitorGroupOptions _optionValues; private readonly ICustomerDataRetriever _customerDataRetriever; + private readonly IPrefixer _prefixer; -#if NET5_0_OR_GREATER - public CustomerPropertyNumberCriterion(OdpVisitorGroupOptions optionValues, + public CustomerPropertyNumberCriterion(OdpVisitorGroupOptions optionValues, ICustomerDataRetriever customerDataRetriever, - IODPUserProfile odpUserProfile) - : base(odpUserProfile) + IODPUserProfile odpUserProfile, + IPrefixer prefixer) + : base(optionValues,odpUserProfile) { - _optionValues = optionValues; _customerDataRetriever = customerDataRetriever; + _prefixer = prefixer; } -#elif NET461_OR_GREATER - public CustomerPropertyNumberCriterion() - { - _optionValues = ServiceLocator.Current.GetInstance(); - _customerDataRetriever = ServiceLocator.Current.GetInstance(); - OdpUserProfile = ServiceLocator.Current.GetInstance(); - } -#endif protected override bool IsMatchInner(IPrincipal principal, string vuidValue) { try { - if (_optionValues.IsConfigured == false) + var splitPrefix = _prefixer.SplitPrefix(Model.PropertyName); + + var customer = _customerDataRetriever.GetCustomerInfo(vuidValue, splitPrefix.prefix); + if (customer == null) { return false; } - if (!string.IsNullOrEmpty(vuidValue)) + if (!customer.AdditionalFields.TryGetValue(splitPrefix.value, out var propertyToken)) { - var customer = _customerDataRetriever.GetCustomerInfo(vuidValue); - if (customer == null) - { - return false; - } - - if (!customer.AdditionalFields.TryGetValue(Model.PropertyName, out var propertyToken)) - { - return false; - } - - return decimal.TryParse(propertyToken?.Value(), out var propertyValue) && - CompareMe(propertyValue, Model.Comparison); + return false; } + + return decimal.TryParse(propertyToken?.Value(), out var propertyValue) && + CompareMe(propertyValue, Model.Comparison); + } catch { return false; } - - return false; } private bool CompareMe(decimal value, string comparison) @@ -83,6 +62,8 @@ private bool CompareMe(decimal value, string comparison) return value < Model.PropertyValue; case "EqualTo": return value == Model.PropertyValue; + case "NotEqualTo": + return value != Model.PropertyValue; case "GreaterThan": return value > Model.PropertyValue; default: diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/CustomerPropertyTextCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/CustomerPropertyTextCriterion.cs new file mode 100644 index 0000000..b649dc2 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/CustomerPropertyTextCriterion.cs @@ -0,0 +1,97 @@ +using System; +using EPiServer.Personalization.VisitorGroups; +using System.Security.Principal; +using Newtonsoft.Json.Linq; +using UNRVLD.ODP.VisitorGroups.Criteria.Models; +using UNRVLD.ODP.VisitorGroups.Configuration; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion +{ + [VisitorGroupCriterion( + Category = "Data platform", + Description = "Query customer text fields", + DisplayName = "Customer property (text)" + )] + public class CustomerPropertyTextCriterion : OdpCriterionBase + { + private readonly ICustomerDataRetriever _customerDataRetriever; + private readonly IPrefixer _prefixer; + + public CustomerPropertyTextCriterion(OdpVisitorGroupOptions optionValues, + ICustomerDataRetriever customerDataRetriever, + IODPUserProfile odpUserProfile, + IPrefixer prefixer) + : base(optionValues,odpUserProfile) + { + _customerDataRetriever = customerDataRetriever; + _prefixer = prefixer; + } + + protected override bool IsMatchInner(IPrincipal principal, string vuidValue) + { + try + { + var splitPrefix = _prefixer.SplitPrefix(Model.PropertyName); + + var customer = _customerDataRetriever.GetCustomerInfo(vuidValue, splitPrefix.prefix); + if (customer == null) + { + return false; + } + + if (!customer.AdditionalFields.TryGetValue(Model.PropertyName, out var propertyToken)) + { + return false; + } + + var propertyValue = propertyToken?.Value(); + + switch (Model.Comparison) + { + case "HasNoValue": + return string.IsNullOrEmpty(propertyValue); + case "HasValue": + return !string.IsNullOrEmpty(propertyValue); + case "Is": + if (propertyValue != null) + { + return propertyValue.Equals(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); + } + + break; + case "StartsWith": + if (propertyValue != null) + { + return propertyValue.StartsWith(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); + } + + break; + case "Contains": + if (propertyValue != null) + { +#if NET5_0_OR_GREATER + return propertyValue.Contains(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); +#else + return propertyValue.IndexOf(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase) >= 0; +#endif + } + + break; + case "EndsWith": + if (propertyValue != null) + { + return propertyValue.EndsWith(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); + } + + break; + } + } + catch + { + return false; + } + + return false; + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/EngagementRankCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/EngagementRankCriterion.cs similarity index 54% rename from src/UNRVLD.ODP.VisitorGroups/Criteria/EngagementRankCriterion.cs rename to src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/EngagementRankCriterion.cs index 18bf94f..8208de9 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/EngagementRankCriterion.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/EngagementRankCriterion.cs @@ -1,15 +1,9 @@ using EPiServer.Personalization.VisitorGroups; -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - using System.Security.Principal; +using UNRVLD.ODP.VisitorGroups.Configuration; -namespace UNRVLD.ODP.VisitorGroups.Criteria +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion { [VisitorGroupCriterion( Category = "Data platform", @@ -18,52 +12,28 @@ namespace UNRVLD.ODP.VisitorGroups.Criteria )] public class EngagementRankCriterion : OdpCriterionBase { - private readonly OdpVisitorGroupOptions _optionValues; private readonly ICustomerDataRetriever _customerDataRetriever; -#if NET5_0_OR_GREATER - public EngagementRankCriterion(OdpVisitorGroupOptions optionValues, + public EngagementRankCriterion(OdpVisitorGroupOptions optionValues, ICustomerDataRetriever customerDataRetriever, IODPUserProfile odpUserProfile) - : base(odpUserProfile) + : base(optionValues,odpUserProfile) { - _optionValues = optionValues; _customerDataRetriever = customerDataRetriever; } -#elif NET461_OR_GREATER - public EngagementRankCriterion() - { - _customerDataRetriever = ServiceLocator.Current.GetInstance(); - _optionValues = ServiceLocator.Current.GetInstance(); - OdpUserProfile = ServiceLocator.Current.GetInstance(); - } -#endif protected override bool IsMatchInner(IPrincipal principal, string vuidValue) { try { - if (_optionValues.IsConfigured == false) - { - return false; - } - - if (!string.IsNullOrEmpty(vuidValue)) - { - var customer = _customerDataRetriever.GetCustomerInfo(vuidValue); - if (customer == null) - { - return false; - } + var customer = _customerDataRetriever.GetCustomerInfo(vuidValue, Model.InstanceName); - return CompareMe(customer.Insights?.EngagementRank, Model.Comparison); - } + return CompareMe(customer?.Insights?.EngagementRank, Model.Comparison); } catch { return false; } - return false; } private bool CompareMe(decimal? value, string comparison) @@ -79,6 +49,8 @@ private bool CompareMe(decimal? value, string comparison) return value < Model.EngagementRank; case "EqualTo": return value == Model.EngagementRank; + case "NotEqualTo": + return value == Model.EngagementRank; case "GreaterThan": return value > Model.EngagementRank; default: diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/ObservationCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/ObservationCriterion.cs new file mode 100644 index 0000000..61acc92 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/ObservationCriterion.cs @@ -0,0 +1,79 @@ +using EPiServer.Personalization.VisitorGroups; + + +using System.Security.Principal; +using UNRVLD.ODP.VisitorGroups.Configuration; +using UNRVLD.ODP.VisitorGroups.Criteria.Models; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion +{ + [VisitorGroupCriterion( + Category = "Data platform", + Description = "Query specific observations about the current user (calculated every 24 hours)", + DisplayName = "Observation" + )] + public class ObservationCriterion : OdpCriterionBase + { + private readonly ICustomerDataRetriever _customerDataRetriever; + + + public ObservationCriterion(OdpVisitorGroupOptions optionValues, + ICustomerDataRetriever customerDataRetriever, + IODPUserProfile odpUserProfile) + : base(optionValues,odpUserProfile) + { + _customerDataRetriever = customerDataRetriever; + } + + protected override bool IsMatchInner(IPrincipal principal, string vuidValue) + { + try + { + var customer = _customerDataRetriever.GetCustomerInfo(vuidValue, Model.InstanceName); + + var isMatch = false; + switch (Model.Observation) + { + case "TotalRevenue": + isMatch = CompareMe(customer?.Observations?.TotalRevenue, Model.Comparison); + break; + case "OrderCount": + isMatch = CompareMe(customer?.Observations?.OrderCount, Model.Comparison); + break; + case "AverageOrderRevenue": + isMatch = CompareMe(customer?.Observations?.AverageOrderRevenue, Model.Comparison); + break; + } + + return isMatch; + + } + catch + { + return false; + } + } + + private bool CompareMe(decimal? value, string comparison) + { + if (value == null) + { + return false; + } + + switch (comparison) + { + case "LessThan": + return value < Model.ObservationValue; + case "EqualTo": + return value == Model.ObservationValue; + case "NotEqualTo": + return value != Model.ObservationValue; + case "GreaterThan": + return value > Model.ObservationValue; + default: + return false; + } + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/OdpCriterionBase.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/OdpCriterionBase.cs new file mode 100644 index 0000000..a8aa515 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/OdpCriterionBase.cs @@ -0,0 +1,36 @@ +using System.Security.Principal; +using EPiServer.Personalization.VisitorGroups; + +using Microsoft.AspNetCore.Http; +using UNRVLD.ODP.VisitorGroups.Configuration; + + + +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion +{ + /// + /// An abstract class for a visitor group criterion using strongly typed settings and automatically generated user interface + /// + /// The type of model/settings to operate on. + public abstract class OdpCriterionBase(OdpVisitorGroupOptions optionValues, IODPUserProfile odpUserProfile) : CriterionBase + where T : class, ICriterionModel, new() + { + protected readonly IODPUserProfile OdpUserProfile = odpUserProfile; + protected readonly OdpVisitorGroupOptions OptionValues = optionValues; + + public override bool IsMatch(IPrincipal principal, HttpContext httpContext) + { + if (OptionValues.IsConfigured == false) + { + return false; + } + + var vuidValue = OdpUserProfile.GetDeviceId(httpContext); + + return !string.IsNullOrEmpty(vuidValue) && IsMatchInner(principal, vuidValue); + } + + + protected abstract bool IsMatchInner(IPrincipal principal, string vuidValue); + } +} diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/OrderLikelihoodCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/OrderLikelihoodCriterion.cs new file mode 100644 index 0000000..7f546d2 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/OrderLikelihoodCriterion.cs @@ -0,0 +1,42 @@ +using EPiServer.Personalization.VisitorGroups; + + +using System.Security.Principal; +using UNRVLD.ODP.VisitorGroups.Configuration; +using UNRVLD.ODP.VisitorGroups.Criteria.Models; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion +{ + [VisitorGroupCriterion( + Category = "Data platform", + Description = "How likely is the user going to order (calculated every 24 hours)", + DisplayName = "Order Likelihood" + )] + public class OrderLikelihoodCriterion : OdpCriterionBase + { + private readonly ICustomerDataRetriever _customerDataRetriever; + + public OrderLikelihoodCriterion(OdpVisitorGroupOptions optionValues, + ICustomerDataRetriever customerDataRetriever, + IODPUserProfile odpUserProfile) + : base(optionValues,odpUserProfile) + { + _customerDataRetriever = customerDataRetriever; + } + + protected override bool IsMatchInner(IPrincipal principal, string vuidValue) + { + try + { + var customer = _customerDataRetriever.GetCustomerInfo(vuidValue, Model.InstanceName); + + return customer?.Insights?.OrderLikelihood == Model.OrderLikelihood; + + } + catch + { + return false; + } + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/WinbackZoneCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/WinbackZoneCriterion.cs new file mode 100644 index 0000000..c069099 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Criterion/WinbackZoneCriterion.cs @@ -0,0 +1,40 @@ +using EPiServer.Personalization.VisitorGroups; + + +using System.Security.Principal; +using UNRVLD.ODP.VisitorGroups.Configuration; +using UNRVLD.ODP.VisitorGroups.Criteria.Models; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.Criterion +{ + [VisitorGroupCriterion( + Category = "Data platform", + Description = "What winback state is the user in (calculated every 24 hours)", + DisplayName = "Winback zone" + )] + public class WinbackZoneCriterion : OdpCriterionBase + { + private readonly ICustomerDataRetriever _customerDataRetriever; + public WinbackZoneCriterion(OdpVisitorGroupOptions optionValues, + ICustomerDataRetriever customerDataRetriever, + IODPUserProfile odpUserProfile) + : base(optionValues,odpUserProfile) + { + _customerDataRetriever = customerDataRetriever; + } + + protected override bool IsMatchInner(IPrincipal principal, string vuidValue) + { + try + { + var customer = _customerDataRetriever.GetCustomerInfo(vuidValue, Model.InstanceName); + + return customer?.Insights?.WinbackZone == Model.WinbackZone; + } + catch + { + return false; + } + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerDataRetriever.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerDataRetriever.cs index 044c0b5..b8ef289 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerDataRetriever.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerDataRetriever.cs @@ -1,7 +1,8 @@ using System; using System.Linq; using EPiServer.Framework.Cache; -using Newtonsoft.Json; +using Microsoft.Extensions.Logging; +using UNRVLD.ODP.VisitorGroups.Configuration; using UNRVLD.ODP.VisitorGroups.GraphQL; using UNRVLD.ODP.VisitorGroups.GraphQL.Models; using UNRVLD.ODP.VisitorGroups.REST; @@ -11,24 +12,30 @@ namespace UNRVLD.ODP.VisitorGroups.Criteria { public class CustomerDataRetriever : ICustomerDataRetriever { - private readonly IGraphQLClient _graphQlClient; + private readonly IGraphQLClientFactory _graphQLClientFactory; + private readonly ILogger _logger; private readonly OdpVisitorGroupOptions _optionValues; private readonly ISynchronizedObjectInstanceCache _cache; private readonly ICustomerPropertyListRetriever _customerPropertyListRetriever; + private readonly IPrefixer _prefixer; - public CustomerDataRetriever(IGraphQLClient graphQlClient, + public CustomerDataRetriever(IGraphQLClientFactory graphQLClientFactory, + ILogger logger, OdpVisitorGroupOptions optionValues, ISynchronizedObjectInstanceCache cache, - ICustomerPropertyListRetriever customerPropertyListRetriever) + ICustomerPropertyListRetriever customerPropertyListRetriever, + IPrefixer prefixer) { - _graphQlClient = graphQlClient; + _graphQLClientFactory = graphQLClientFactory; + _logger = logger; _optionValues = optionValues; _cache = cache; _customerPropertyListRetriever = customerPropertyListRetriever; + _prefixer = prefixer; } - public Customer GetCustomerInfo(string vuidValue) + public Customer? GetCustomerInfo(string vuidValue, string? endpointKey = null) { try { @@ -37,7 +44,6 @@ public Customer GetCustomerInfo(string vuidValue) return null; } - var cacheKey = $"odp_rts_customer_{vuidValue}"; var cachedResult = _cache.Get(cacheKey); if (cachedResult != null) @@ -45,8 +51,9 @@ public Customer GetCustomerInfo(string vuidValue) return (Customer)cachedResult; } - var allFields = _customerPropertyListRetriever.GetCustomerProperties(); - var allFieldsString = String.Join(Environment.NewLine, allFields.Select(x => x.name)); + var allFields = _customerPropertyListRetriever.GetCustomerProperties(endpointKey); + + var allFieldsString = string.Join(Environment.NewLine, allFields.Select(x => _prefixer.SplitPrefix(x.Name).value)); var query = $@"query MyQuery {{ customer(vuid: ""{vuidValue}"") {{ @@ -64,8 +71,16 @@ public Customer GetCustomerInfo(string vuidValue) }} }}"; - var result = _graphQlClient.Query(query).Result; - var customer = result?.Customer; + Customer? customer = null; + var odpEndPoint = _optionValues.GetEndpoint(endpointKey); + + if (odpEndPoint != null) + { + var graphQlClient = _graphQLClientFactory.Get(odpEndPoint); + var result = graphQlClient.Query(query).Result; + + customer = result?.Customer; + } if (customer != null) { @@ -79,10 +94,60 @@ public Customer GetCustomerInfo(string vuidValue) return customer; } - catch + catch (Exception ex) { + _logger.LogError(ex, "Error retrieving customer info"); return null; } } + + public bool IsInAudience(string vuidValue, string audience, string? endpointKey = null) + { + try + { + var cacheKey = $"odp_rts_{vuidValue}_{audience}"; + var cachedResult = _cache.Get(cacheKey); + if (cachedResult != null) + { + return (bool)cachedResult; + } + + var query = $@"query MyQuery {{ + customer(vuid: ""{vuidValue}"") {{ + audiences (subset: [""{audience}""]) {{ + edges {{ + node {{ + name + }} + }} + }} + }} + }}"; + + var isInAudience = false; + + var odpEndPoint = _optionValues.GetEndpoint(endpointKey); + + if (odpEndPoint is not null) + { + var graphQlClient = _graphQLClientFactory.Get(odpEndPoint); + var result = graphQlClient.Query(query).Result; + + isInAudience = result?.Customer?.Response?.EdgeItems.Count == 0; + } + + // Use a micro cache approach to improve performance if the same VG is used multiple times on a page + _cache.Insert( + cacheKey, + isInAudience, + new CacheEvictionPolicy(new TimeSpan(0, 0, 0, _optionValues.CacheTimeoutSeconds), CacheTimeoutType.Absolute)); + + return isInAudience; + } + catch + { + return false; + } + } } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerPropertyTextCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerPropertyTextCriterion.cs deleted file mode 100644 index 7f959f7..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/CustomerPropertyTextCriterion.cs +++ /dev/null @@ -1,118 +0,0 @@ -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - -using System; -using System.Globalization; -using EPiServer.Personalization.VisitorGroups; -using System.Security.Principal; -using Newtonsoft.Json.Linq; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; - -namespace UNRVLD.ODP.VisitorGroups.Criteria -{ - [VisitorGroupCriterion( - Category = "Data platform", - Description = "Query customer text fields", - DisplayName = "Customer property (text)" - )] - public class CustomerPropertyTextCriterion : OdpCriterionBase - { - private readonly OdpVisitorGroupOptions _optionValues; - private readonly ICustomerDataRetriever _customerDataRetriever; - -#if NET5_0_OR_GREATER - public CustomerPropertyTextCriterion(OdpVisitorGroupOptions optionValues, - ICustomerDataRetriever customerDataRetriever, - IODPUserProfile odpUserProfile) - : base(odpUserProfile) - { - _optionValues = optionValues; - _customerDataRetriever = customerDataRetriever; - } -#elif NET461_OR_GREATER - public CustomerPropertyTextCriterion() - { - _optionValues = ServiceLocator.Current.GetInstance(); - _customerDataRetriever = ServiceLocator.Current.GetInstance(); - OdpUserProfile = ServiceLocator.Current.GetInstance(); - } -#endif - - protected override bool IsMatchInner(IPrincipal principal, string vuidValue) - { - try - { - if (_optionValues.IsConfigured == false) - { - return false; - } - - if (!string.IsNullOrEmpty(vuidValue)) - { - var customer = _customerDataRetriever.GetCustomerInfo(vuidValue); - if (customer == null) - { - return false; - } - - if (!customer.AdditionalFields.TryGetValue(Model.PropertyName, out var propertyToken)) - { - return false; - } - - var propertyValue = propertyToken?.Value(); - - switch (Model.Comparison) - { - case "HasNoValue": - return string.IsNullOrEmpty(propertyValue); - case "HasValue": - return !string.IsNullOrEmpty(propertyValue); - case "Is": - if (propertyValue != null) - { - return propertyValue.Equals(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); - } - - break; - case "StartsWith": - if (propertyValue != null) - { - return propertyValue.StartsWith(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); - } - - break; - case "Contains": - if (propertyValue != null) - { -#if NET5_0_OR_GREATER - return propertyValue.Contains(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); -#else - return propertyValue.IndexOf(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase) >= 0; -#endif - } - - break; - case "EndsWith": - if (propertyValue != null) - { - return propertyValue.EndsWith(Model.PropertyValue, StringComparison.CurrentCultureIgnoreCase); - } - - break; - } - } - } - catch - { - return false; - } - - return false; - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/IAudienceSizeCachePopulator.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/IAudienceSizeCachePopulator.cs new file mode 100644 index 0000000..88ffd76 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/IAudienceSizeCachePopulator.cs @@ -0,0 +1,14 @@ +using System.Threading.Tasks; +using UNRVLD.ODP.VisitorGroups.Configuration; + +namespace UNRVLD.ODP.VisitorGroups.Criteria +{ + /// + /// Used to populate the cache for audience size(s) and meant for background operations + /// + public interface IAudienceSizeCachePopulator + { + Task PopulateEntireCache(OdpEndpoint endPoint, bool ForceRefresh); + //void PopulateCacheItem(Audience Audience); + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/ICustomerDataRetriever.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/ICustomerDataRetriever.cs index 1930f25..de956d5 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/ICustomerDataRetriever.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/ICustomerDataRetriever.cs @@ -4,6 +4,8 @@ namespace UNRVLD.ODP.VisitorGroups.Criteria { public interface ICustomerDataRetriever { - Customer GetCustomerInfo(string vuidValue); + Customer? GetCustomerInfo(string vuidValue, string? endpointKey = null); + + bool IsInAudience(string vuidValue, string audience, string? endpointKey = null); } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/IPrefixer.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/IPrefixer.cs new file mode 100644 index 0000000..a10c82c --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/IPrefixer.cs @@ -0,0 +1,23 @@ +namespace UNRVLD.ODP.VisitorGroups.Criteria +{ + /// + /// Represents a prefixer that can be used to add or split prefixes from strings. + /// + public interface IPrefixer + { + /// + /// Adds the specified prefix to the given value. + /// + /// The value to add the prefix to. + /// The prefix to add. + /// The value with the prefix added. + public string Prefix(string value, string prefix); + + /// + /// Splits the prefix from the given value. + /// + /// The value to split the prefix from. + /// A tuple containing the value without the prefix and the prefix itself. + public (string? prefix, string value) SplitPrefix(string value); + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienceCriteriaModel.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienceCriteriaModel.cs index 524661a..2db9e25 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienceCriteriaModel.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienceCriteriaModel.cs @@ -1,10 +1,7 @@ using EPiServer.Personalization.VisitorGroups; -#if NET5_0_OR_GREATER -#elif NET461_OR_GREATER -#endif - using System.ComponentModel.DataAnnotations; +using UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory; namespace UNRVLD.ODP.VisitorGroups.Criteria.Models { @@ -12,20 +9,14 @@ public class AudienceCriterionModel : CriterionModelBase { public override ICriterionModel Copy() { return base.ShallowCopy(); } -#if NET5_0_OR_GREATER [CriterionPropertyEditor( AfterTextTranslationKey = "/path/to/xml", LabelTranslationKey = "", Order = 1, SelectionFactoryType = typeof(AudienciesSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(AudienciesSelectionFactory))] -#endif [Required] - public string Audience { get; set; } + public string Audience { get; set; } = string.Empty; } } diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienciesSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienciesSelectionFactory.cs deleted file mode 100644 index e66e34c..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/AudienciesSelectionFactory.cs +++ /dev/null @@ -1,143 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -using System.Web.Hosting; -#endif - -using System; -using System.Collections.Generic; -using System.Linq; -using IGraphQLClient = UNRVLD.ODP.VisitorGroups.GraphQL.IGraphQLClient; -using EPiServer.ServiceLocation; -using UNRVLD.ODP.VisitorGroups.GraphQL.Models; -using UNRVLD.ODP.VisitorGroups.GraphQL.Models.AudienceCount; -using EPiServer.Framework.Cache; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; - -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models -{ - public class AudienciesSelectionFactory : ISelectionFactory - { - private readonly IGraphQLClient client; - private readonly ISynchronizedObjectInstanceCache cache; - private string cacheKey = "OdpVisitorGroups_AudienceList_"; -#if NET5_0_OR_GREATER - private readonly IServiceScopeFactory serviceScopeFactory; -#endif - - public AudienciesSelectionFactory() - { - client = ServiceLocator.Current.GetInstance(); - cache = ServiceLocator.Current.GetInstance(); -#if NET5_0_OR_GREATER - serviceScopeFactory = ServiceLocator.Current.GetInstance(); -#endif - } - - public IEnumerable GetSelectListItems(Type propertyType) - { - var query = @"query MyQuery { - audiences { - edges { - node { - description - name - } - } - } - }"; - - var selectItems = new List(); - - try - { - var cachePopulationRequested = false; - var result = client.Query(query).Result; - var orderedResult = result.Items.OrderBy(x => x.Description); - - selectItems = new List(); - foreach (var audience in orderedResult) - { - var cacheResult = cache.Get(cacheKey + audience.Name); - if (cacheResult != null) - { - selectItems.Add(new SelectListItem() { Text = audience.Description + GetCountEstimateString((AudienceCount)cacheResult), Value = audience.Name }); - } - else - { - selectItems.Add(new SelectListItem() { Text = audience.Description + " (Calculating segment size...)", Value = audience.Name }); - if (cachePopulationRequested == false) - { - cachePopulationRequested = true; - -#if NET5_0_OR_GREATER - _ = Task.Run(async () => - { - try - { - using var scope = serviceScopeFactory.CreateScope(); - var cachePopulator = scope.ServiceProvider.GetRequiredService(); - await cachePopulator.PopulateEntireCache(false); - } - catch (Exception e) - { - Console.WriteLine(e); - } - }); -#elif NET461_OR_GREATER - try - { - var cachePopulator = ServiceLocator.Current.GetInstance(); - HostingEnvironment.QueueBackgroundWorkItem(c => cachePopulator.PopulateEntireCache(false)); - } - catch (Exception e) - { - Console.WriteLine(e); - } -#endif - } - } - } - - return selectItems; - } - catch - { - return new List(); - } - } - - private string GetCountEstimateString(AudienceCount audienceCount) - { - if (audienceCount == null || - audienceCount.PopulationEstimate == null) - { - return string.Empty; - } - - if (audienceCount.PopulationEstimate.EstimatedLowerBound == 0) - { - return " (close to 0 visitors)"; - } - - if (audienceCount.PopulationEstimate.EstimatedLowerBound == 1) - { - return " (more than 1 visitor)"; - } - - if (audienceCount.PopulationEstimate.EstimatedLowerBound < 100) - { - return $" (more than {audienceCount.PopulationEstimate.EstimatedLowerBound} visitors)"; - } - - int calc = (audienceCount.PopulationEstimate.EstimatedLowerBound + - audienceCount.PopulationEstimate.EstimatedUpperBound) / 2; - return $" (about {calc} visitors)"; - - } - } -} diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyNumberCriterionModel.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyNumberCriterionModel.cs index 366609e..e1f9698 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyNumberCriterionModel.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyNumberCriterionModel.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using EPiServer.Personalization.VisitorGroups; +using UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory; namespace UNRVLD.ODP.VisitorGroups.Criteria.Models { @@ -7,37 +8,23 @@ public class CustomerPropertyNumberCriterionModel : CriterionModelBase { public override ICriterionModel Copy() { return base.ShallowCopy(); } -#if NET5_0_OR_GREATER [CriterionPropertyEditor( Order = 10, SelectionFactoryType = typeof(CustomerPropertyNumberSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(CustomerPropertyNumberSelectionFactory))] -#endif [Required] [Display(Name = "Customer Property (number)")] - public string PropertyName { get; set; } + public string PropertyName { get; set; } = string.Empty; -#if NET5_0_OR_GREATER [CriterionPropertyEditor( Order = 20, SelectionFactoryType = typeof(NumberComparisonSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(NumberComparisonSelectionFactory))] -#endif [Required] - public string Comparison { get; set; } + public string Comparison { get; set; } = string.Empty; [Required] -#if NET5_0_OR_GREATER [CriterionPropertyEditor(Order = 30)] -#endif [Display(Name = "Value")] public int PropertyValue { get; set; } } diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyTextCriterionModel.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyTextCriterionModel.cs index 2ef0806..e8657f0 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyTextCriterionModel.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyTextCriterionModel.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using EPiServer.Personalization.VisitorGroups; +using UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory; namespace UNRVLD.ODP.VisitorGroups.Criteria.Models { @@ -7,38 +8,24 @@ public class CustomerPropertyTextCriterionModel : CriterionModelBase { public override ICriterionModel Copy() { return base.ShallowCopy(); } -#if NET5_0_OR_GREATER [CriterionPropertyEditor( Order = 10, SelectionFactoryType = typeof(CustomerPropertyTextSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(CustomerPropertyTextSelectionFactory))] -#endif [Required] [Display(Name = "Customer Property (number)")] - public string PropertyName { get; set; } + public string PropertyName { get; set; } = string.Empty; -#if NET5_0_OR_GREATER [CriterionPropertyEditor( Order = 20, SelectionFactoryType = typeof(TextComparisonSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(TextComparisonSelectionFactory))] -#endif [Required] - public string Comparison { get; set; } + public string Comparison { get; set; } = string.Empty; [Required] -#if NET5_0_OR_GREATER [CriterionPropertyEditor(Order = 30)] -#endif [Display(Name = "Value")] - public string PropertyValue { get; set; } + public string PropertyValue { get; set; } = string.Empty; } } diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/EngagementRankCriterionModel.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/EngagementRankCriterionModel.cs index ebd3fae..98a987c 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/EngagementRankCriterionModel.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/EngagementRankCriterionModel.cs @@ -1,29 +1,35 @@ using System.ComponentModel.DataAnnotations; +using EPiServer.Data.Dynamic; using EPiServer.Personalization.VisitorGroups; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; +using UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory; namespace UNRVLD.ODP.VisitorGroups.Criteria { + [EPiServerDataStore(AutomaticallyRemapStore = true)] public class EngagementRankCriterionModel : CriterionModelBase { public override ICriterionModel Copy() { return base.ShallowCopy(); } -#if NET5_0_OR_GREATER + [CriterionPropertyEditor( Order = 10, + SelectionFactoryType = typeof(OdpInstanceSelectionFactory) + )] + + [Required] + public string InstanceName { get; set; } = string.Empty; + + [CriterionPropertyEditor( + Order = 20, SelectionFactoryType = typeof(NumberComparisonSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(NumberComparisonSelectionFactory))] -#endif + [Required] - public string Comparison { get; set; } + public string Comparison { get; set; } = string.Empty; + + + [CriterionPropertyEditor(Order = 30)] -#if NET5_0_OR_GREATER - [CriterionPropertyEditor(Order = 20)] -#endif [Required] public int EngagementRank { get; set; } } diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/IAudienceSizeCachePopulator.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/IAudienceSizeCachePopulator.cs deleted file mode 100644 index ae22444..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/IAudienceSizeCachePopulator.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Audience = UNRVLD.ODP.VisitorGroups.GraphQL.Models.Audience; -using System.Threading.Tasks; -using EPiServer.Framework.Cache; - -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models -{ - /// - /// Used to populate the cache for audience size(s) and meant for background operations - /// - public interface IAudienceSizeCachePopulator - { - Task PopulateEntireCache(bool ForceRefresh); - void PopulateCacheItem(Audience Audience); - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/NumberComparisonSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/NumberComparisonSelectionFactory.cs deleted file mode 100644 index bea80e9..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/NumberComparisonSelectionFactory.cs +++ /dev/null @@ -1,25 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -#endif - -using System; -using System.Collections.Generic; - -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models -{ - public class NumberComparisonSelectionFactory : ISelectionFactory - { - public IEnumerable GetSelectListItems(Type propertyType) - { - IList items = new List(); - items.Add(new SelectListItem() { Text = "Less Than", Value = "LessThan" }); - items.Add(new SelectListItem() { Text = "Equal To", Value = "EqualTo" }); - items.Add(new SelectListItem() { Text = "Greater Than", Value = "GreaterThan" }); - return items; - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/ObservationCriterionModel.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/ObservationCriterionModel.cs index 88990bf..9467e51 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/ObservationCriterionModel.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/ObservationCriterionModel.cs @@ -1,48 +1,44 @@ using System.ComponentModel.DataAnnotations; +using EPiServer.Data.Dynamic; using EPiServer.Personalization.VisitorGroups; -#if NET5_0_OR_GREATER - -#elif NET461_OR_GREATER -//using EPiServer.Personalization.VisitorGroups; -//using EPiServer.Web.Mvc.VisitorGroups; -#endif +using UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory; namespace UNRVLD.ODP.VisitorGroups.Criteria.Models { + [EPiServerDataStore(AutomaticallyRemapStore = true)] public class ObservationCriterionModel : CriterionModelBase { public override ICriterionModel Copy() { return base.ShallowCopy(); } -#if NET5_0_OR_GREATER + [CriterionPropertyEditor( Order = 10, - SelectionFactoryType = typeof(ObservationTypeSelectionFactory) + SelectionFactoryType = typeof(OdpInstanceSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(ObservationTypeSelectionFactory))] -#endif + [Required] - public string Observation { get; set; } + public string InstanceName { get; set; } = string.Empty; -#if NET5_0_OR_GREATER [CriterionPropertyEditor( Order = 20, + SelectionFactoryType = typeof(ObservationTypeSelectionFactory) + )] + [Required] + public string Observation { get; set; } = string.Empty; + + + [CriterionPropertyEditor( + Order = 30, SelectionFactoryType = typeof(NumberComparisonSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(NumberComparisonSelectionFactory))] -#endif + [Required] - public string Comparison { get; set; } + public string Comparison { get; set; } = string.Empty; [Required] -#if NET5_0_OR_GREATER + [CriterionPropertyEditor(Order = 30)] -#endif + [Display(Name = "Value")] public int ObservationValue { get; set; } } diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/OrderLikelihoodCriterionModel.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/OrderLikelihoodCriterionModel.cs index f3f12ea..16da172 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/OrderLikelihoodCriterionModel.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/OrderLikelihoodCriterionModel.cs @@ -1,24 +1,28 @@ using System.ComponentModel.DataAnnotations; +using EPiServer.Data.Dynamic; using EPiServer.Personalization.VisitorGroups; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; +using UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory; -namespace UNRVLD.ODP.VisitorGroups.Criteria +namespace UNRVLD.ODP.VisitorGroups.Criteria.Models { + [EPiServerDataStore(AutomaticallyRemapStore = true)] public class OrderLikelihoodCriterionModel : CriterionModelBase { - public override ICriterionModel Copy() { return base.ShallowCopy(); } + public override ICriterionModel Copy() { return ShallowCopy(); } -#if NET5_0_OR_GREATER [CriterionPropertyEditor( Order = 10, + SelectionFactoryType = typeof(OdpInstanceSelectionFactory) + )] + + [Required] + public string InstanceName { get; set; } = string.Empty; + [CriterionPropertyEditor( + Order = 20, SelectionFactoryType = typeof(OrderLikelihoodSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(OrderLikelihoodSelectionFactory))] -#endif + [Required] - public string OrderLikelihood { get; set; } + public string OrderLikelihood { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/OrderLikelihoodSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/OrderLikelihoodSelectionFactory.cs deleted file mode 100644 index 76d9b5f..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/OrderLikelihoodSelectionFactory.cs +++ /dev/null @@ -1,27 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -#endif - -using System; -using System.Collections.Generic; - -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models -{ - public class OrderLikelihoodSelectionFactory : ISelectionFactory - { - public IEnumerable GetSelectListItems(Type propertyType) - { - IList items = new List(); - items.Add(new SelectListItem() { Text = "Unlikely", Value = "Unlikely" }); - items.Add(new SelectListItem() { Text = "Likely", Value = "Likely" }); - items.Add(new SelectListItem() { Text = "Very Likely", Value = "VeryLikely" }); - items.Add(new SelectListItem() { Text = "Extremely Likely", Value = "ExtremelyLikely" }); - - return items; - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/TextComparisonSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/TextComparisonSelectionFactory.cs deleted file mode 100644 index d528ebe..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/TextComparisonSelectionFactory.cs +++ /dev/null @@ -1,28 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -#endif - -using System; -using System.Collections.Generic; - -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models -{ - public class TextComparisonSelectionFactory : ISelectionFactory - { - public IEnumerable GetSelectListItems(Type propertyType) - { - IList items = new List(); - items.Add(new SelectListItem() { Text = "Is", Value = "Is" }); - items.Add(new SelectListItem() { Text = "Starts with", Value = "StartsWith" }); - items.Add(new SelectListItem() { Text = "Contains", Value = "Contains" }); - items.Add(new SelectListItem() { Text = "Ends with", Value = "EndsWith" }); - items.Add(new SelectListItem() { Text = "Has a value", Value = "HasValue" }); - items.Add(new SelectListItem() { Text = "Has no value", Value = "HasNoValue" }); - return items; - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/WinbackZoneCriterionModel.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/WinbackZoneCriterionModel.cs index 73c76ef..afc4439 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/WinbackZoneCriterionModel.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/WinbackZoneCriterionModel.cs @@ -1,25 +1,30 @@ using System.ComponentModel.DataAnnotations; +using EPiServer.Data.Dynamic; using EPiServer.Personalization.VisitorGroups; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; +using UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory; -namespace UNRVLD.ODP.VisitorGroups.Criteria +namespace UNRVLD.ODP.VisitorGroups.Criteria.Models { + [EPiServerDataStore(AutomaticallyRemapStore = true)] public class WinbackZoneCriterionModel : CriterionModelBase { - public override ICriterionModel Copy() { return base.ShallowCopy(); } + public override ICriterionModel Copy() { return ShallowCopy(); } -#if NET5_0_OR_GREATER [CriterionPropertyEditor( Order = 10, + SelectionFactoryType = typeof(OdpInstanceSelectionFactory) + )] + + [Required] + public string InstanceName { get; set; } = string.Empty; + + [CriterionPropertyEditor( + Order = 20, SelectionFactoryType = typeof(WinbackZoneSelectionFactory) )] -#elif NET461_OR_GREATER - [DojoWidget( - WidgetType = "dijit.form.FilteringSelect", - SelectionFactoryType = typeof(WinbackZoneSelectionFactory))] -#endif + [Required] - public string WinbackZone { get; set; } + public string WinbackZone { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/WinbackZoneSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/WinbackZoneSelectionFactory.cs deleted file mode 100644 index 75ad1fb..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/WinbackZoneSelectionFactory.cs +++ /dev/null @@ -1,25 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -#endif - -using System; -using System.Collections.Generic; - -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models -{ - public class WinbackZoneSelectionFactory : ISelectionFactory - { - public IEnumerable GetSelectListItems(Type propertyType) - { - IList items = new List(); - items.Add(new SelectListItem() { Text = "Engaged", Value = "Engaged" }); - items.Add(new SelectListItem() { Text = "Winback", Value = "Winback" }); - items.Add(new SelectListItem() { Text = "Churned", Value = "Churned" }); - return items; - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/ObservationCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/ObservationCriterion.cs deleted file mode 100644 index ccc0e5c..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/ObservationCriterion.cs +++ /dev/null @@ -1,118 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - -using System.Security.Principal; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; - -namespace UNRVLD.ODP.VisitorGroups.Criteria -{ - [VisitorGroupCriterion( - Category = "Data platform", - Description = "Query specific observations about the current user (calculated every 24 hours)", - DisplayName = "Observation" - )] - public class ObservationCriterion : OdpCriterionBase - { - private readonly OdpVisitorGroupOptions _optionValues; - private readonly ICustomerDataRetriever _customerDataRetriever; - - -#if NET5_0_OR_GREATER - public ObservationCriterion(OdpVisitorGroupOptions optionValues, - ICustomerDataRetriever customerDataRetriever, - IODPUserProfile odpUserProfile) - : base(odpUserProfile) - { - _optionValues = optionValues; - _customerDataRetriever = customerDataRetriever; - } - - public override bool IsMatch(IPrincipal principal, HttpContext httpContext) - { - var vuidValue = OdpUserProfile.GetDeviceId(httpContext); - return this.IsMatchInner(principal, vuidValue); - } - -#elif NET461_OR_GREATER - public ObservationCriterion() - { - _customerDataRetriever = ServiceLocator.Current.GetInstance(); - _optionValues = ServiceLocator.Current.GetInstance(); - OdpUserProfile = ServiceLocator.Current.GetInstance(); - } - - public override bool IsMatch(IPrincipal principal, HttpContextBase httpContext) - { - var vuidValue = OdpUserProfile.GetDeviceId(httpContext); - return this.IsMatchInner(principal, vuidValue); - } -#endif - - protected override bool IsMatchInner(IPrincipal principal, string vuidValue) - { - try - { - if (_optionValues.IsConfigured == false) - { - return false; - } - - if (!string.IsNullOrEmpty(vuidValue)) - { - var customer = _customerDataRetriever.GetCustomerInfo(vuidValue); - if (customer == null) - { - return false; - } - - var isMatch = false; - switch (Model.Observation) - { - case "TotalRevenue": - isMatch = CompareMe(customer.Observations?.TotalRevenue, Model.Comparison); - break; - case "OrderCount": - isMatch = CompareMe(customer.Observations?.OrderCount, Model.Comparison); - break; - case "AverageOrderRevenue": - isMatch = CompareMe(customer.Observations?.AverageOrderRevenue, Model.Comparison); - break; - } - - return isMatch; - } - } - catch - { - return false; - } - return false; - } - - private bool CompareMe(decimal? value, string comparison) - { - if (value == null) - { - return false; - } - - switch (comparison) - { - case "LessThan": - return value < Model.ObservationValue; - case "EqualTo": - return value == Model.ObservationValue; - case "GreaterThan": - return value > Model.ObservationValue; - default: - return false; - } - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/OdpCriterionBase.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/OdpCriterionBase.cs deleted file mode 100644 index c4c0dd1..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/OdpCriterionBase.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Security.Principal; -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - - -namespace UNRVLD.ODP.VisitorGroups.Criteria -{ - /// - /// An abstract class for a visitor group criterion using strongly typed settings and automatically generated user interface - /// - /// The type of model/settings to operate on. - public abstract class OdpCriterionBase : CriterionBase - where T : class, ICriterionModel, new() - { - protected IODPUserProfile OdpUserProfile; - -#if NET5_0_OR_GREATER - - protected OdpCriterionBase(IODPUserProfile odpUserProfile) - { - OdpUserProfile = odpUserProfile; - } - public override bool IsMatch(IPrincipal principal, HttpContext httpContext) - { - var vuidValue = OdpUserProfile.GetDeviceId(httpContext); - return this.IsMatchInner(principal, vuidValue); - } -#elif NET461_OR_GREATER - public override bool IsMatch(IPrincipal principal, HttpContextBase httpContext) - { - var vuidValue = OdpUserProfile.GetDeviceId(httpContext); - return this.IsMatchInner(principal, vuidValue); - } -#endif - - protected abstract bool IsMatchInner(IPrincipal principal, string vuidValue); - } -} diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/OrderLikelihoodCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/OrderLikelihoodCriterion.cs deleted file mode 100644 index 0bbdc6e..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/OrderLikelihoodCriterion.cs +++ /dev/null @@ -1,70 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - -using System.Security.Principal; - -namespace UNRVLD.ODP.VisitorGroups.Criteria -{ - [VisitorGroupCriterion( - Category = "Data platform", - Description = "How likely is the user going to order (calculated every 24 hours)", - DisplayName = "Order Likelihood" - )] - public class OrderLikelihoodCriterion : OdpCriterionBase - { - private readonly OdpVisitorGroupOptions _optionValues; - private readonly ICustomerDataRetriever _customerDataRetriever; - - -#if NET5_0_OR_GREATER - public OrderLikelihoodCriterion(OdpVisitorGroupOptions optionValues, - ICustomerDataRetriever customerDataRetriever, - IODPUserProfile odpUserProfile) - : base(odpUserProfile) - { - _optionValues = optionValues; - _customerDataRetriever = customerDataRetriever; - } -#elif NET461_OR_GREATER - public OrderLikelihoodCriterion() - { - _customerDataRetriever = ServiceLocator.Current.GetInstance(); - _optionValues = ServiceLocator.Current.GetInstance(); - OdpUserProfile = ServiceLocator.Current.GetInstance(); - } -#endif - - protected override bool IsMatchInner(IPrincipal principal, string vuidValue) - { - try - { - if (_optionValues.IsConfigured == false) - { - return false; - } - - if (!string.IsNullOrEmpty(vuidValue)) - { - var customer = _customerDataRetriever.GetCustomerInfo(vuidValue); - if (customer == null) - { - return false; - } - - return customer.Insights?.OrderLikelihood == Model.OrderLikelihood; - } - } - catch - { - return false; - } - return false; - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/AudienciesSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/AudienciesSelectionFactory.cs new file mode 100644 index 0000000..8657c9f --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/AudienciesSelectionFactory.cs @@ -0,0 +1,156 @@ +using EPiServer.Personalization.VisitorGroups; + +using Microsoft.AspNetCore.Mvc.Rendering; + +using System; +using System.Collections.Generic; +using System.Linq; +using EPiServer.ServiceLocation; +using UNRVLD.ODP.VisitorGroups.GraphQL.Models; +using EPiServer.Framework.Cache; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using UNRVLD.ODP.VisitorGroups.GraphQL; +using Microsoft.Extensions.Options; +using UNRVLD.ODP.VisitorGroups.Configuration; +using Microsoft.Extensions.Logging; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory +{ + public class AudienciesSelectionFactory : ISelectionFactory + { + private readonly IGraphQLClientFactory clientFactory; + private readonly ISynchronizedObjectInstanceCache cache; + private string cacheKey = "OdpVisitorGroups_AudienceList_"; + + private readonly IServiceScopeFactory serviceScopeFactory; + private readonly OdpVisitorGroupOptions options; + + private readonly IPrefixer prefexer; + private readonly ILogger _logger; + + public AudienciesSelectionFactory() + { + clientFactory = ServiceLocator.Current.GetInstance(); + + options = ServiceLocator.Current.GetInstance>().Value; + cache = ServiceLocator.Current.GetInstance(); + serviceScopeFactory = ServiceLocator.Current.GetInstance(); + prefexer = ServiceLocator.Current.GetInstance(); + + _logger = ServiceLocator.Current.GetInstance().CreateLogger(); + + } + + public IEnumerable GetSelectListItems(Type propertyType) + { + var query = @"query MyQuery { + audiences { + edges { + node { + description + name + } + } + } + }"; + + var selectItems = new List(); + + try + { + foreach (var endPoint in options.OdpEndpoints) + { + var client = clientFactory.Get(endPoint); + var result = client.Query(query).Result; + + if (result is not null) + selectItems.AddRange(GetAudienceDetails(options.HasMultipleEndpoints, endPoint, result)); + } + + return selectItems; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error while fetching audience details"); + return []; + } + } + + private List GetAudienceDetails(bool hasMultipleEndpoints, OdpEndpoint endPoint, AudiencesResponse result) + { + var selectItems = new List(); + + var cachePopulationRequested = false; + + var orderedResult = result.Items.OrderBy(x => x.Description); + + selectItems = []; + + foreach (var audience in orderedResult) + { + var cacheResult = cache.Get($"{cacheKey}-{endPoint.Name}-{audience.Name}"); + + var textPrefix = hasMultipleEndpoints ? prefexer.Prefix(audience.Description, endPoint.Name) : audience.Description; + + if (cacheResult != null) + { + selectItems.Add(new SelectListItem() { Text = $"{textPrefix} {GetCountEstimateString((AudienceCount)cacheResult)}", Value = audience.Name }); + } + else + { + selectItems.Add(new SelectListItem() { Text = $"{textPrefix} (Calculating segment size...)", Value = audience.Name }); + if (cachePopulationRequested == false) + { + cachePopulationRequested = true; + + _ = Task.Run(async () => + { + try + { + using var scope = serviceScopeFactory.CreateScope(); + var cachePopulator = scope.ServiceProvider.GetRequiredService(); + await cachePopulator.PopulateEntireCache(endPoint, false); + } + catch (Exception e) + { + Console.WriteLine(e); + } + }); + } + } + } + + return selectItems; + } + + private string GetCountEstimateString(AudienceCount audienceCount) + { + if (audienceCount == null || + audienceCount.PopulationEstimate == null) + { + return string.Empty; + } + + if (audienceCount.PopulationEstimate.EstimatedLowerBound == 0) + { + return " (close to 0 visitors)"; + } + + if (audienceCount.PopulationEstimate.EstimatedLowerBound == 1) + { + return " (more than 1 visitor)"; + } + + if (audienceCount.PopulationEstimate.EstimatedLowerBound < 100) + { + return $" (more than {audienceCount.PopulationEstimate.EstimatedLowerBound} visitors)"; + } + + int calc = (audienceCount.PopulationEstimate.EstimatedLowerBound + + audienceCount.PopulationEstimate.EstimatedUpperBound) / 2; + return $" (about {calc} visitors)"; + + } + } +} diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyNumberSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/CustomerPropertyNumberSelectionFactory.cs similarity index 55% rename from src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyNumberSelectionFactory.cs rename to src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/CustomerPropertyNumberSelectionFactory.cs index 2a9e458..fb36f4c 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyNumberSelectionFactory.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/CustomerPropertyNumberSelectionFactory.cs @@ -6,37 +6,42 @@ using UNRVLD.ODP.VisitorGroups.REST; using UNRVLD.ODP.VisitorGroups.REST.Models; -#if NET5_0_OR_GREATER using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -#endif +using UNRVLD.ODP.VisitorGroups.Configuration; +using Microsoft.Extensions.Options; -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory { public class CustomerPropertyNumberSelectionFactory : ISelectionFactory { private readonly ICustomerPropertyListRetriever _customerPropertyListRetriever; + private readonly OdpVisitorGroupOptions _options; public CustomerPropertyNumberSelectionFactory() { _customerPropertyListRetriever = ServiceLocator.Current.GetInstance(); + _options = ServiceLocator.Current.GetInstance>().Value; } public IEnumerable GetSelectListItems(Type propertyType) { - IList items = new List(); + IList items = []; + List customerFields = []; + + foreach (var endpoint in _options.OdpEndpoints) + { + customerFields.AddRange(_customerPropertyListRetriever.GetCustomerProperties(endpoint.Name) ?? []); + } - var customerFields = _customerPropertyListRetriever.GetCustomerProperties() ?? Enumerable.Empty(); foreach (var customerField in customerFields) { - if (customerField.type == "number") + if (customerField.Type == "number") { - items.Add(new SelectListItem() { Text = customerField.display_name, Value = customerField.name }); + items.Add(new SelectListItem() { Text = customerField.DisplayName, Value = customerField.Name }); } } - return items.OrderBy(x => x.Text).ToList(); + return [.. items.OrderBy(x => x.Text)]; } } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyTextSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/CustomerPropertyTextSelectionFactory.cs similarity index 58% rename from src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyTextSelectionFactory.cs rename to src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/CustomerPropertyTextSelectionFactory.cs index 8096ba3..02cd243 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/CustomerPropertyTextSelectionFactory.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/CustomerPropertyTextSelectionFactory.cs @@ -7,37 +7,43 @@ using UNRVLD.ODP.VisitorGroups.REST; using UNRVLD.ODP.VisitorGroups.REST.Models; -#if NET5_0_OR_GREATER using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -#endif +using UNRVLD.ODP.VisitorGroups.Configuration; +using Microsoft.Extensions.Options; -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models + +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory { public class CustomerPropertyTextSelectionFactory : ISelectionFactory { private readonly ICustomerPropertyListRetriever _customerPropertyListRetriever; + private readonly OdpVisitorGroupOptions _options; public CustomerPropertyTextSelectionFactory() { _customerPropertyListRetriever = ServiceLocator.Current.GetInstance(); + _options = ServiceLocator.Current.GetInstance>().Value; } public IEnumerable GetSelectListItems(Type propertyType) { IList items = new List(); + List customerFields = []; + + foreach (var endpoint in _options.OdpEndpoints) + { + customerFields.AddRange(_customerPropertyListRetriever.GetCustomerProperties(endpoint.Name) ?? []); + } - var customerFields = _customerPropertyListRetriever.GetCustomerProperties() ?? Enumerable.Empty(); foreach (var customerField in customerFields) { - if (customerField.type == "string") + if (customerField.Type == "string") { - items.Add(new SelectListItem() { Text = customerField.display_name, Value = customerField.name }); + items.Add(new SelectListItem() { Text = customerField.DisplayName, Value = customerField.Name }); } } - return items.OrderBy(x => x.Text).ToList(); + return [.. items.OrderBy(x => x.Text)]; } } } diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/NumberComparisonSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/NumberComparisonSelectionFactory.cs new file mode 100644 index 0000000..9ccbb44 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/NumberComparisonSelectionFactory.cs @@ -0,0 +1,26 @@ +using EPiServer.Personalization.VisitorGroups; + +using Microsoft.AspNetCore.Mvc.Rendering; + + +using System; +using System.Collections.Generic; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory +{ + public class NumberComparisonSelectionFactory : ISelectionFactory + { + public IEnumerable GetSelectListItems(Type propertyType) + { + IList items = + [ + new SelectListItem() { Text = "Less Than", Value = "LessThan" }, + new SelectListItem() { Text = "Equal To", Value = "EqualTo" }, + new SelectListItem() { Text = "Not Equal To", Value = "NotEqualTo" }, + new SelectListItem() { Text = "Greater Than", Value = "GreaterThan" }, + ]; + + return items; + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/ObservationTypeSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/ObservationTypeSelectionFactory.cs similarity index 85% rename from src/UNRVLD.ODP.VisitorGroups/Criteria/Models/ObservationTypeSelectionFactory.cs rename to src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/ObservationTypeSelectionFactory.cs index 52e2f9e..d09bb18 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/Models/ObservationTypeSelectionFactory.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/ObservationTypeSelectionFactory.cs @@ -1,15 +1,12 @@ using EPiServer.Personalization.VisitorGroups; -#if NET5_0_OR_GREATER using Microsoft.AspNetCore.Mvc.Rendering; -#elif NET461_OR_GREATER -using System.Web.Mvc; -#endif + using System; using System.Collections.Generic; -namespace UNRVLD.ODP.VisitorGroups.Criteria.Models +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory { public class ObservationTypeSelectionFactory : ISelectionFactory { diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/OdpInstanceSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/OdpInstanceSelectionFactory.cs new file mode 100644 index 0000000..14b8b68 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/OdpInstanceSelectionFactory.cs @@ -0,0 +1,42 @@ +using EPiServer.Personalization.VisitorGroups; + +using Microsoft.AspNetCore.Mvc.Rendering; + + +using System; +using System.Collections.Generic; +using EPiServer.ServiceLocation; +using Microsoft.Extensions.Options; +using UNRVLD.ODP.VisitorGroups.Configuration; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory +{ + public class OdpInstanceSelectionFactory : ISelectionFactory + { + private readonly OdpVisitorGroupOptions options; + public OdpInstanceSelectionFactory() + { + + options = ServiceLocator.Current.GetInstance>().Value; + } + + public IEnumerable GetSelectListItems(Type propertyType) + { + var selectItems = new List(); + + try + { + foreach (var endPoint in options.OdpEndpoints) + { + selectItems.Add(new SelectListItem() { Text = endPoint.Name, Value = endPoint.Name }); + } + + return selectItems; + } + catch + { + return []; + } + } + } +} diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/OrderLikelihoodSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/OrderLikelihoodSelectionFactory.cs new file mode 100644 index 0000000..e706fc1 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/OrderLikelihoodSelectionFactory.cs @@ -0,0 +1,25 @@ +using EPiServer.Personalization.VisitorGroups; + +using Microsoft.AspNetCore.Mvc.Rendering; + +using System; +using System.Collections.Generic; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory +{ + public class OrderLikelihoodSelectionFactory : ISelectionFactory + { + public IEnumerable GetSelectListItems(Type propertyType) + { + IList items = + [ + new SelectListItem() { Text = "Unlikely", Value = "Unlikely" }, + new SelectListItem() { Text = "Likely", Value = "Likely" }, + new SelectListItem() { Text = "Very Likely", Value = "VeryLikely" }, + new SelectListItem() { Text = "Extremely Likely", Value = "ExtremelyLikely" }, + ]; + + return items; + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/TextComparisonSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/TextComparisonSelectionFactory.cs new file mode 100644 index 0000000..5c20436 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/TextComparisonSelectionFactory.cs @@ -0,0 +1,26 @@ +using EPiServer.Personalization.VisitorGroups; + +using Microsoft.AspNetCore.Mvc.Rendering; + +using System; +using System.Collections.Generic; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory +{ + public class TextComparisonSelectionFactory : ISelectionFactory + { + public IEnumerable GetSelectListItems(Type propertyType) + { + IList items = + [ + new SelectListItem() { Text = "Is", Value = "Is" }, + new SelectListItem() { Text = "Starts with", Value = "StartsWith" }, + new SelectListItem() { Text = "Contains", Value = "Contains" }, + new SelectListItem() { Text = "Ends with", Value = "EndsWith" }, + new SelectListItem() { Text = "Has a value", Value = "HasValue" }, + new SelectListItem() { Text = "Has no value", Value = "HasNoValue" }, + ]; + return items; + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/WinbackZoneSelectionFactory.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/WinbackZoneSelectionFactory.cs new file mode 100644 index 0000000..a36eda1 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/SelectionFactory/WinbackZoneSelectionFactory.cs @@ -0,0 +1,24 @@ +using EPiServer.Personalization.VisitorGroups; + +using Microsoft.AspNetCore.Mvc.Rendering; + + +using System; +using System.Collections.Generic; + +namespace UNRVLD.ODP.VisitorGroups.Criteria.SelectionFactory +{ + public class WinbackZoneSelectionFactory : ISelectionFactory + { + public IEnumerable GetSelectListItems(Type propertyType) + { + IList items = + [ + new SelectListItem() { Text = "Engaged", Value = "Engaged" }, + new SelectListItem() { Text = "Winback", Value = "Winback" }, + new SelectListItem() { Text = "Churned", Value = "Churned" }, + ]; + return items; + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/StandardPrefixer.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/StandardPrefixer.cs new file mode 100644 index 0000000..2fe3aa7 --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/Criteria/StandardPrefixer.cs @@ -0,0 +1,27 @@ +using System.Text.RegularExpressions; + + +namespace UNRVLD.ODP.VisitorGroups.Criteria +{ + public class StandardPrefixer : IPrefixer + { + private readonly Regex prefixRegex; + + public StandardPrefixer() + { + prefixRegex = new Regex(@"^\[(.+)\] - (.+)$", RegexOptions.Compiled); + } + + public string Prefix(string value, string prefix) + { + return $"[{prefix}] - {value}"; + } + + public (string? prefix, string value) SplitPrefix(string value) + { + var match = prefixRegex.Match(value); + + return match.Success ? (match.Groups[1].Value, match.Groups[2].Value) : (string.Empty, value); + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Criteria/WinbackZoneCriterion.cs b/src/UNRVLD.ODP.VisitorGroups/Criteria/WinbackZoneCriterion.cs deleted file mode 100644 index 71b3e71..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Criteria/WinbackZoneCriterion.cs +++ /dev/null @@ -1,70 +0,0 @@ -using EPiServer.Personalization.VisitorGroups; - -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif - -using System.Security.Principal; - -namespace UNRVLD.ODP.VisitorGroups.Criteria -{ - [VisitorGroupCriterion( - Category = "Data platform", - Description = "What winback state is the user in (calculated every 24 hours)", - DisplayName = "Winback zone" - )] - public class WinbackZoneCriterion : OdpCriterionBase - { - private readonly OdpVisitorGroupOptions _optionValues; - private readonly ICustomerDataRetriever _customerDataRetriever; - - -#if NET5_0_OR_GREATER - public WinbackZoneCriterion(OdpVisitorGroupOptions optionValues, - ICustomerDataRetriever customerDataRetriever, - IODPUserProfile odpUserProfile) - : base(odpUserProfile) - { - _optionValues = optionValues; - _customerDataRetriever = customerDataRetriever; - } -#elif NET461_OR_GREATER - public WinbackZoneCriterion() - { - _customerDataRetriever = ServiceLocator.Current.GetInstance(); - _optionValues = ServiceLocator.Current.GetInstance(); - OdpUserProfile = ServiceLocator.Current.GetInstance(); - } -#endif - - protected override bool IsMatchInner(IPrincipal principal, string vuidValue) - { - try - { - if (_optionValues.IsConfigured == false) - { - return false; - } - - if (!string.IsNullOrEmpty(vuidValue)) - { - var customer = _customerDataRetriever.GetCustomerInfo(vuidValue); - if (customer == null) - { - return false; - } - - return customer.Insights?.WinbackZone == Model.WinbackZone; - } - } - catch - { - return false; - } - return false; - } - } -} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Deploy/web.config.install.xdt b/src/UNRVLD.ODP.VisitorGroups/Deploy/web.config.install.xdt deleted file mode 100644 index 350af2b..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Deploy/web.config.install.xdt +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Deploy/web.config.uninstall.xdt b/src/UNRVLD.ODP.VisitorGroups/Deploy/web.config.uninstall.xdt deleted file mode 100644 index 49ddf64..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Deploy/web.config.uninstall.xdt +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Edge.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Edge.cs deleted file mode 100644 index 9ac9263..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Edge.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace UNRVLD.ODP.VisitorGroups.GraphQL -{ - public class Edge - { - public T Node { get;set;} - public string Cursor { get;set;} - } -} diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Edges.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Edges.cs deleted file mode 100644 index fb8f00f..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Edges.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Newtonsoft.Json; -using System.Collections.Generic; - -namespace UNRVLD.ODP.VisitorGroups.GraphQL -{ - public class Edges - { - [JsonProperty("edges")] - public List> EdgeItems { get; set; } - } - - -} diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/GraphQLClient.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/GraphQLClient.cs index 0d4b744..8d97fa9 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/GraphQLClient.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/GraphQLClient.cs @@ -1,7 +1,9 @@ using GraphQL.Client.Http; using GraphQL.Client.Serializer.Newtonsoft; +using Microsoft.Extensions.Logging; using System; using System.Threading.Tasks; +using UNRVLD.ODP.VisitorGroups.Configuration; namespace UNRVLD.ODP.VisitorGroups.GraphQL { @@ -9,38 +11,37 @@ public class GraphQLClient : IGraphQLClient, IDisposable { private readonly string _apiKey; private readonly GraphQLHttpClient _graphQlClient; - private readonly OdpVisitorGroupOptions _options; + private readonly bool _isConfigured; + private readonly ILogger _logger; private bool disposedValue; - public GraphQLClient(OdpVisitorGroupOptions options) + public GraphQLClient(OdpEndpoint endPoint, ILogger logger) { - _apiKey = options.PrivateApiKey; - _options = options; - _graphQlClient = new GraphQLHttpClient(options.BaseEndPoint + "/v3/graphql", new NewtonsoftJsonSerializer()); + _apiKey = endPoint.PrivateApiKey.Trim(); + _isConfigured = endPoint.IsConfigured; + _graphQlClient = new GraphQLHttpClient(endPoint.BaseEndPoint.Trim() + "/v3/graphql", new NewtonsoftJsonSerializer()); + _logger = logger; } - public async Task Query(string query) where T : class + public async Task Query(string query) where T : class { - if (!_options.IsConfigured) + if (!_isConfigured) { return default; } - var request = new AuthencatedGraphQLHttpRequest(this._apiKey) - { - Query = query - }; - -#if NET461_OR_GREATER - /* This is needed as the alternate code fails to complete, without an error.*/ - var response461 = _graphQlClient.SendQueryAsync(request); - Task.WaitAll(response461); + try { + var request = new AuthencatedGraphQLHttpRequest(this._apiKey) + { + Query = query + }; - return response461.Result.Data; -#elif NET5_0_OR_GREATER - var response = await _graphQlClient.SendQueryAsync(request); - return response.Data; -#endif + var response = await _graphQlClient.SendQueryAsync(request); + return response.Data; + } catch (Exception ex) { + _logger.LogError(ex, "Error querying GraphQL"); + throw; + } } protected virtual void Dispose(bool disposing) diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/GraphQLClientFactory.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/GraphQLClientFactory.cs new file mode 100644 index 0000000..e46e64d --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/GraphQLClientFactory.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Concurrent; +using Microsoft.Extensions.Logging; +using UNRVLD.ODP.VisitorGroups.Configuration; + +namespace UNRVLD.ODP.VisitorGroups.GraphQL +{ + public class GraphQLClientFactory : IGraphQLClientFactory, IDisposable + { + protected ConcurrentDictionary Clients = new(); + private bool disposedValue; + private readonly ILoggerFactory _loggerFactory; + + public GraphQLClientFactory(ILoggerFactory loggerFactory) + { + _loggerFactory = loggerFactory; + } + + public IGraphQLClient Get(OdpEndpoint endPoint) + { + if (Clients.TryGetValue(endPoint.Name, out var client)) + { + return client; + } + + var newClient = new GraphQLClient(endPoint, _loggerFactory.CreateLogger()); + Clients.TryAdd(endPoint.Name, newClient); + + return newClient; + } + + protected virtual void Dispose(bool disposing) + { + if (!disposedValue) + { + if (disposing) + { + foreach (var client in Clients) + { + client.Value.Dispose(); + } + } + + disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + GC.SuppressFinalize(this); + } + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/IGraphQLClient.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/IGraphQLClient.cs index f82afbf..dec53f8 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/IGraphQLClient.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/IGraphQLClient.cs @@ -1,10 +1,19 @@ -using System.Collections.Generic; +using System; using System.Threading.Tasks; namespace UNRVLD.ODP.VisitorGroups.GraphQL { - public interface IGraphQLClient + /// + /// Represents a GraphQL client that can be used to send queries and receive responses. + /// + public interface IGraphQLClient : IDisposable { - Task Query(string query) where T : class; + /// + /// Sends a GraphQL query and returns the response of type T. + /// + /// The type of the response object. + /// The GraphQL query string. + /// The response object of type T. + Task Query(string query) where T : class; } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/IGraphQLClientFactory.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/IGraphQLClientFactory.cs new file mode 100644 index 0000000..d47b8bf --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/IGraphQLClientFactory.cs @@ -0,0 +1,17 @@ +using UNRVLD.ODP.VisitorGroups.Configuration; + +namespace UNRVLD.ODP.VisitorGroups.GraphQL +{ + /// + /// Represents a factory for creating instances of . + /// + public interface IGraphQLClientFactory + { + /// + /// Gets an instance of for the specified OdpEndpoint. + /// + /// The OdpEndpoint to create the client for. + /// An instance of . + IGraphQLClient Get(OdpEndpoint endPoint); + } +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Audience.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Audience.cs index 1e40dc9..c7b22d8 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Audience.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Audience.cs @@ -2,7 +2,7 @@ { public class Audience { - public string Name { get; set; } - public string Description { get; set; } + public string Name { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount.cs new file mode 100644 index 0000000..025313e --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount.cs @@ -0,0 +1,10 @@ +using Newtonsoft.Json; + +namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models +{ + public class AudienceCount + { + [JsonProperty("population_estimate")] + public PopulationEstimate? PopulationEstimate { get; set; } + } +} diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount/AudienceCount.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount/AudienceCount.cs deleted file mode 100644 index f98b277..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount/AudienceCount.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Newtonsoft.Json; - -namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models.AudienceCount -{ - public class AudienceCount - { - [JsonProperty("population_estimate")] - public PopulationEstimate PopulationEstimate { get; set; } - } -} diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudiencesResponse.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudiencesResponse.cs index a05c2ca..26b95fe 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudiencesResponse.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudiencesResponse.cs @@ -2,9 +2,9 @@ namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models { - public class AudiencesResponse : GraphQL.ResponseType + public class AudiencesResponse : ResponseType { [JsonProperty("audiences")] - public override GraphQL.Edges Response { get;set;} + public override Edges? Response { get; set;} } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Customer.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Customer.cs index ffcdcf8..012ca36 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Customer.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Customer.cs @@ -7,36 +7,16 @@ namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models public class Customer { [JsonProperty("observations")] - public Observations Observations { get; set; } + public Observations? Observations { get; set; } [JsonProperty("insights")] - public Insights Insights { get; set; } + public Insights? Insights { get; set; } [JsonProperty("audiences")] - public GraphQL.Edges Response { get; set; } + public Edges? Response { get; set; } [JsonExtensionData] public IDictionary AdditionalFields { get; set; } = new Dictionary(); } - public class Insights - { - [JsonProperty("engagement_rank")] - public decimal? EngagementRank { get; set; } - [JsonProperty("winback_zone")] - public string WinbackZone { get; set; } - [JsonProperty("order_likelihood")] - public string OrderLikelihood { get; set; } - } - - public class Observations - { - [JsonProperty("total_revenue")] - public decimal? TotalRevenue { get; set; } - [JsonProperty("order_count")] - public int? OrderCount { get; set; } - [JsonProperty("AverageOrderRevenue")] - public decimal? AverageOrderRevenue { get; set; } - } - } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/CustomerResponse.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/CustomerResponse.cs index 5f3c8e2..28af1e6 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/CustomerResponse.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/CustomerResponse.cs @@ -2,10 +2,9 @@ namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models { - public class CustomerResponse //: GraphQL.ResponseType + public class CustomerResponse { [JsonProperty("customer")] - public Customer Customer { get; set; } - //public override GraphQL.Edges Response { get; set; } + public Customer? Customer { get; set; } } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edge.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edge.cs index 7dd3f52..66c35b0 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edge.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edge.cs @@ -2,7 +2,7 @@ { public class Edge { - public T Node { get;set;} - public string Cursor { get;set;} + public T Node { get;set;} = default!; + public string Cursor { get;set;} = string.Empty; } } diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edges.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edges.cs index 79d68aa..b94d54d 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edges.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Edges.cs @@ -1,13 +1,11 @@ -using System.Collections.Generic; -using Newtonsoft.Json; +using Newtonsoft.Json; +using System.Collections.Generic; namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models { public class Edges { [JsonProperty("edges")] - public List> EdgeItems { get; set; } + public List> EdgeItems { get; set; } = []; } - - } diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Insights.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Insights.cs new file mode 100644 index 0000000..9143c0c --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Insights.cs @@ -0,0 +1,15 @@ +using Newtonsoft.Json; + +namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models +{ + public class Insights + { + [JsonProperty("engagement_rank")] + public decimal? EngagementRank { get; set; } + [JsonProperty("winback_zone")] + public string WinbackZone { get; set; } = string.Empty; + [JsonProperty("order_likelihood")] + public string OrderLikelihood { get; set; } = string.Empty; + } + +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Observations.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Observations.cs new file mode 100644 index 0000000..48b354a --- /dev/null +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/Observations.cs @@ -0,0 +1,15 @@ +using Newtonsoft.Json; + +namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models +{ + public class Observations + { + [JsonProperty("total_revenue")] + public decimal? TotalRevenue { get; set; } + [JsonProperty("order_count")] + public int? OrderCount { get; set; } + [JsonProperty("AverageOrderRevenue")] + public decimal? AverageOrderRevenue { get; set; } + } + +} \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount/PopulationEstimate.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/PopulationEstimate.cs similarity index 81% rename from src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount/PopulationEstimate.cs rename to src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/PopulationEstimate.cs index 60c8cec..d813259 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/AudienceCount/PopulationEstimate.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/PopulationEstimate.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models.AudienceCount +namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models { public class PopulationEstimate { diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/ResponseType.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/ResponseType.cs index 79d363c..b8b6de3 100644 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/ResponseType.cs +++ b/src/UNRVLD.ODP.VisitorGroups/GraphQL/Models/ResponseType.cs @@ -1,9 +1,12 @@ -namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models +using System.Collections.Generic; +using System.Linq; + +namespace UNRVLD.ODP.VisitorGroups.GraphQL.Models { - public abstract class ResponseType + public abstract class ResponseType { - public abstract Edges Response { get; set; } - } - + public abstract Edges? Response { get; set; } + public virtual IEnumerable Items => this.Response?.EdgeItems?.Select(e => e.Node) ?? []; + } } diff --git a/src/UNRVLD.ODP.VisitorGroups/GraphQL/ResponseType.cs b/src/UNRVLD.ODP.VisitorGroups/GraphQL/ResponseType.cs deleted file mode 100644 index e612a93..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/GraphQL/ResponseType.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace UNRVLD.ODP.VisitorGroups.GraphQL -{ - public abstract class ResponseType - { - public abstract Edges Response { get; set; } - - public virtual IEnumerable Items => this.Response?.EdgeItems?.Select(e => e.Node) ?? Enumerable.Empty(); - } -} diff --git a/src/UNRVLD.ODP.VisitorGroups/IODPUserProfile.cs b/src/UNRVLD.ODP.VisitorGroups/IODPUserProfile.cs index 40a1392..0f42cad 100644 --- a/src/UNRVLD.ODP.VisitorGroups/IODPUserProfile.cs +++ b/src/UNRVLD.ODP.VisitorGroups/IODPUserProfile.cs @@ -1,17 +1,11 @@ -#if NET5_0_OR_GREATER + using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -#endif + namespace UNRVLD.ODP.VisitorGroups { public interface IODPUserProfile { -#if NET5_0_OR_GREATER - string GetDeviceId(HttpContext httpContext); -#elif NET461_OR_GREATER - string GetDeviceId(HttpContextBase httpContext); -#endif + string? GetDeviceId(HttpContext httpContext); } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/Initilization/ServiceCollectionExtensions.cs b/src/UNRVLD.ODP.VisitorGroups/Initilization/ServiceCollectionExtensions.cs index 94aae27..94d2deb 100644 --- a/src/UNRVLD.ODP.VisitorGroups/Initilization/ServiceCollectionExtensions.cs +++ b/src/UNRVLD.ODP.VisitorGroups/Initilization/ServiceCollectionExtensions.cs @@ -1,8 +1,6 @@ -#if NET5_0_OR_GREATER -using EPiServer.ServiceLocation; +using EPiServer.ServiceLocation; using Microsoft.Extensions.DependencyInjection; using UNRVLD.ODP.VisitorGroups.Criteria; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; using UNRVLD.ODP.VisitorGroups.GraphQL; using UNRVLD.ODP.VisitorGroups.REST; @@ -13,7 +11,9 @@ public static class ServiceCollectionExtensions public static void AddODPVisitorGroups(this IServiceCollection services) { services.AddHttpClient(); - services.AddScoped(); + + services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddHttpContextOrThreadScoped(); @@ -21,4 +21,4 @@ public static void AddODPVisitorGroups(this IServiceCollection services) } } } -#endif + diff --git a/src/UNRVLD.ODP.VisitorGroups/Initilization/VisitorGroupInitilizationModule.cs b/src/UNRVLD.ODP.VisitorGroups/Initilization/VisitorGroupInitilizationModule.cs deleted file mode 100644 index 71a85d6..0000000 --- a/src/UNRVLD.ODP.VisitorGroups/Initilization/VisitorGroupInitilizationModule.cs +++ /dev/null @@ -1,46 +0,0 @@ -#if NET461_OR_GREATER - -using EPiServer.Framework; -using EPiServer.Framework.Initialization; -using EPiServer.ServiceLocation; -using UNRVLD.ODP.VisitorGroups.GraphQL; -using UNRVLD.ODP.VisitorGroups.Criteria; -using UNRVLD.ODP.VisitorGroups.REST; -using Microsoft.Extensions.DependencyInjection; -using UNRVLD.ODP.VisitorGroups.Criteria.Models; - -namespace UNRVLD.ODP.VisitorGroups.Initilization -{ - [InitializableModule] - [ModuleDependency(typeof(FrameworkInitialization))] - public class VisitorGroupInitilizationModule : IConfigurableModule - { - public void ConfigureContainer(ServiceConfigurationContext context) - { - var services = context.Services; - - services.AddScoped(); - - // No need to configure OdpVisitorGroupOptions as any classes attributed with [Options] are taken care of by the CMS - // init on CMS v11.17 and above. Values for the those settings can in appSettings as follows: - // - // Full information here: https://world.optimizely.com/documentation/Release-Notes/ReleaseNote/?releaseNoteId=CMS-15875 - - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddHttpContextOrThreadScoped(); - services.AddTransient(); - } - - public void Initialize(InitializationEngine context) - { - - } - - public void Uninitialize(InitializationEngine context) - { - } - } -} -#endif diff --git a/src/UNRVLD.ODP.VisitorGroups/ODPUserProfile.cs b/src/UNRVLD.ODP.VisitorGroups/ODPUserProfile.cs index 22bcfc6..689ed31 100644 --- a/src/UNRVLD.ODP.VisitorGroups/ODPUserProfile.cs +++ b/src/UNRVLD.ODP.VisitorGroups/ODPUserProfile.cs @@ -1,23 +1,14 @@ -using System; -#if NET5_0_OR_GREATER -using Microsoft.AspNetCore.Http; -#elif NET461_OR_GREATER -using System.Web; -using EPiServer.ServiceLocation; -#endif +using Microsoft.AspNetCore.Http; +using UNRVLD.ODP.VisitorGroups.Configuration; + namespace UNRVLD.ODP.VisitorGroups { - public class ODPUserProfile : IODPUserProfile + public class ODPUserProfile(OdpVisitorGroupOptions optionValues) : IODPUserProfile { - private readonly OdpVisitorGroupOptions _optionValues; - public ODPUserProfile(OdpVisitorGroupOptions optionValues) - { - _optionValues = optionValues; - } + private readonly OdpVisitorGroupOptions _optionValues = optionValues; -#if NET5_0_OR_GREATER - public string GetDeviceId(HttpContext httpContext) + public string? GetDeviceId(HttpContext httpContext) { if (httpContext != null) { @@ -27,23 +18,12 @@ public string GetDeviceId(HttpContext httpContext) return null; } -#elif NET461_OR_GREATER - public string GetDeviceId(HttpContextBase httpContext) - { - if (httpContext != null) - { - var vuidValue = httpContext.Request.Cookies[_optionValues.OdpCookieName]?.Value; - return GetVuidValueInternal(vuidValue); - } - return null; - } -#endif - private string GetVuidValueInternal(string vuidValue) + private string? GetVuidValueInternal(string? vuidValue) { if (!string.IsNullOrWhiteSpace(vuidValue) && vuidValue.Length > 35) { - return vuidValue.Substring(0, 36).Replace("-", string.Empty); + return vuidValue[..36].Replace("-", string.Empty); } return null; diff --git a/src/UNRVLD.ODP.VisitorGroups/REST/CustomerPropertyListRetriever.cs b/src/UNRVLD.ODP.VisitorGroups/REST/CustomerPropertyListRetriever.cs index eb94546..29afc03 100644 --- a/src/UNRVLD.ODP.VisitorGroups/REST/CustomerPropertyListRetriever.cs +++ b/src/UNRVLD.ODP.VisitorGroups/REST/CustomerPropertyListRetriever.cs @@ -1,70 +1,99 @@ using System; using System.Collections.Generic; - -using System.Threading.Tasks; using EPiServer.Framework.Cache; using UNRVLD.ODP.VisitorGroups.REST.Models; using RestSharp; using System.Linq; -using System.Threading; +using UNRVLD.ODP.VisitorGroups.Configuration; +using UNRVLD.ODP.VisitorGroups.Criteria; +using Microsoft.Extensions.Logging; namespace UNRVLD.ODP.VisitorGroups.REST { public class CustomerPropertyListRetriever : ICustomerPropertyListRetriever, IDisposable { - private readonly RestClient _restClient; + private readonly ILogger _logger; private readonly OdpVisitorGroupOptions _options; private readonly ISynchronizedObjectInstanceCache _cache; + private readonly IPrefixer _prefixer; private bool disposedValue; - public CustomerPropertyListRetriever(//RestClient restClient, + public CustomerPropertyListRetriever( + ILogger logger, OdpVisitorGroupOptions options, - ISynchronizedObjectInstanceCache cache) + ISynchronizedObjectInstanceCache cache, + IPrefixer prefixer) { - _restClient = new RestClient(options.BaseEndPoint); + _logger = logger; _options = options; _cache = cache; + _prefixer = prefixer; } - public IEnumerable GetCustomerProperties() + public IEnumerable GetCustomerProperties(string? endpointName) { - var cacheKey = $"odp_rts_customer_schema"; - var cachedResult = _cache.Get(cacheKey); - if (cachedResult != null) - { - return (IEnumerable)cachedResult; - } + try { + var cacheKey = $"odp_rts_customer_schema_{endpointName}"; + var cachedResult = _cache.Get(cacheKey); + if (cachedResult != null) + { + return (IEnumerable)cachedResult; + } - var apiResult = GetCustomerPropertiesRequest(); + List apiResult = []; - if (apiResult == null || !apiResult.Any()) - { - return Enumerable.Empty(); - } + var endpoint = _options.GetEndpoint(endpointName); + + if (endpoint != null) + { + var results = GetCustomerPropertiesRequest(_options.HasMultipleEndpoints, endpoint); + + if (results != null && results.Count != 0) + { + apiResult.AddRange(results); + } + } - _cache.Insert( - cacheKey, - apiResult, - new CacheEvictionPolicy(new TimeSpan(0, 0, 0, _options.SchemaCacheTimeoutSeconds), - CacheTimeoutType.Absolute)); + if (apiResult == null || !apiResult.Any()) + { + return []; + } - return apiResult; + _cache.Insert( + cacheKey, + apiResult, + new CacheEvictionPolicy(new TimeSpan(0, 0, 0, _options.SchemaCacheTimeoutSeconds), + CacheTimeoutType.Absolute)); + + return apiResult; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error retrieving customer properties"); + return Array.Empty(); + } } - private ICollection GetCustomerPropertiesRequest() + private ICollection GetCustomerPropertiesRequest(bool hasMultipleEndpoints, OdpEndpoint odpEndpoint) { try { + using var _restClient = new RestClient(new Uri(odpEndpoint.BaseEndPoint), useClientFactory: true); + var request = new RestRequest("/v3/schema/objects/customers"); - request.AddHeader("x-api-key", _options.PrivateApiKey); + request.AddHeader("x-api-key", odpEndpoint.PrivateApiKey); var response = _restClient.GetAsync(request).Result; - return response?.fields ?? Array.Empty(); + response?.Fields.ToList().ForEach(x => x.DisplayName = hasMultipleEndpoints ? _prefixer.Prefix(x.DisplayName,odpEndpoint.Name ) : x.DisplayName); + response?.Fields.ToList().ForEach(x => x.Name = hasMultipleEndpoints ? _prefixer.Prefix(x.Name,odpEndpoint.Name ) : x.Name); + + return response?.Fields ?? Array.Empty(); } - catch + catch (Exception ex) { + _logger.LogError(ex, "Error retrieving customer properties"); return Array.Empty(); } } @@ -76,8 +105,6 @@ protected virtual void Dispose(bool disposing) if (disposing) { // TODO: dispose managed state (managed objects) - - _restClient.Dispose(); } // TODO: free unmanaged resources (unmanaged objects) and override finalizer diff --git a/src/UNRVLD.ODP.VisitorGroups/REST/ICustomerPropertyListRetriever.cs b/src/UNRVLD.ODP.VisitorGroups/REST/ICustomerPropertyListRetriever.cs index c4f3e94..3e6b27e 100644 --- a/src/UNRVLD.ODP.VisitorGroups/REST/ICustomerPropertyListRetriever.cs +++ b/src/UNRVLD.ODP.VisitorGroups/REST/ICustomerPropertyListRetriever.cs @@ -5,6 +5,6 @@ namespace UNRVLD.ODP.VisitorGroups.REST { public interface ICustomerPropertyListRetriever { - IEnumerable GetCustomerProperties(); + IEnumerable GetCustomerProperties(string? endpointName); } } diff --git a/src/UNRVLD.ODP.VisitorGroups/REST/Models/CustomerFieldsResponse.cs b/src/UNRVLD.ODP.VisitorGroups/REST/Models/CustomerFieldsResponse.cs index 1982453..6a49b9f 100644 --- a/src/UNRVLD.ODP.VisitorGroups/REST/Models/CustomerFieldsResponse.cs +++ b/src/UNRVLD.ODP.VisitorGroups/REST/Models/CustomerFieldsResponse.cs @@ -1,10 +1,16 @@ using System.Collections.Generic; -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace UNRVLD.ODP.VisitorGroups.REST.Models { public class CustomerFieldsResponse { - public ICollection fields { get; set; } + + public CustomerFieldsResponse() + { + this.Fields = []; + } + [JsonPropertyName("fields")] + public ICollection Fields { get; set; } } } \ No newline at end of file diff --git a/src/UNRVLD.ODP.VisitorGroups/REST/Models/Field.cs b/src/UNRVLD.ODP.VisitorGroups/REST/Models/Field.cs index ec75772..2a9a165 100644 --- a/src/UNRVLD.ODP.VisitorGroups/REST/Models/Field.cs +++ b/src/UNRVLD.ODP.VisitorGroups/REST/Models/Field.cs @@ -1,16 +1,20 @@ -using Newtonsoft.Json; + +using System.Text.Json.Serialization; namespace UNRVLD.ODP.VisitorGroups.REST.Models { public class Field { - [JsonProperty("name")] - public string name { get; set; } - [JsonProperty("display_name")] - public string display_name { get; set; } - [JsonProperty("description")] - public string description { get; set; } - [JsonProperty("type")] - public string type { get; set; } + [JsonPropertyName("name")] + public string Name { get; set; } = string.Empty; + + [JsonPropertyName("display_name")] + public string DisplayName { get; set; }= string.Empty; + + [JsonPropertyName("description")] + public string Description { get; set; }= string.Empty; + + [JsonPropertyName("type")] + public string Type { get; set; }= string.Empty; } } diff --git a/src/UNRVLD.ODP.VisitorGroups/UNRVLD.ODP.VisitorGroups.csproj b/src/UNRVLD.ODP.VisitorGroups/UNRVLD.ODP.VisitorGroups.csproj index a7a41c1..174b5bc 100644 --- a/src/UNRVLD.ODP.VisitorGroups/UNRVLD.ODP.VisitorGroups.csproj +++ b/src/UNRVLD.ODP.VisitorGroups/UNRVLD.ODP.VisitorGroups.csproj @@ -1,10 +1,10 @@  - net472;net6.0;net7.0 + net6.0;net7.0;net8.0 UNRVLD.ODP.VisitorGroups https://github.com/made-to-engage/ODP.VisitorGroups - 1.4.0 + 2.0.0 Andrew Markham; David Knipe Made to Engage;UNRVLD UNRVLD - Optimizely Visitor Groups @@ -19,10 +19,14 @@ - Moved minimum .net framework requirements to v4.7.1 - Added support for .net7 - Updated minimum version of RestSharp as this caused issues when later versions of optimizely and visitor groups. + 2.0.0 - Added support for multiple ODP instances + - Added support for .net8 true true true + latest + Enable $(RestoreSources); https://api.nuget.org/v3/index.json; @@ -30,18 +34,7 @@ https://github.com/made-to-engage/ODP.VisitorGroups - - - - - - - - - - - - +